From 23f6efeb2ac1749b7abd77ddadc30ffbf6b649d6 Mon Sep 17 00:00:00 2001 From: Monica Sarbu Date: Wed, 20 Sep 2017 08:10:04 +0200 Subject: [PATCH] Fix default paths in macOS for Redis 4.0.1 (#5173) --- CHANGELOG.asciidoc | 1 + filebeat/docs/modules/redis.asciidoc | 5 +++-- filebeat/filebeat.reference.yml | 2 +- filebeat/module/redis/_meta/config.reference.yml | 2 +- filebeat/module/redis/_meta/config.yml | 2 +- filebeat/module/redis/_meta/docs.asciidoc | 5 +++-- filebeat/module/redis/log/manifest.yml | 1 + filebeat/modules.d/redis.yml.disabled | 2 +- 8 files changed, 12 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 4405dc482f8b..44f533a9270c 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -43,6 +43,7 @@ https://github.com/elastic/beats/compare/v6.0.0-beta2...master[Check the HEAD di *Auditbeat* *Filebeat* +- Fix default paths for redis 4.0.1 logs on macOS {pull}5173[5173] *Heartbeat* diff --git a/filebeat/docs/modules/redis.asciidoc b/filebeat/docs/modules/redis.asciidoc index b1c101136286..7634db1ac64c 100644 --- a/filebeat/docs/modules/redis.asciidoc +++ b/filebeat/docs/modules/redis.asciidoc @@ -13,8 +13,9 @@ This module has two filesets: * The `slowlog` fileset connects to Redis via the network and retrieves the slow logs by using the `SLOWLOG` command. -For the `log` fileset, make sure the `logfile` option is set in the Redis configuration file. For -the `slowlog` fileset, make sure the `slowlog-log-slower-than` is set. +For the `log` fileset, make sure the `logfile` option, from the Redis configuration file, is set to `redis-server.log`. + +For the `slowlog` fileset, make sure the `slowlog-log-slower-than` option, from the Redis configuration file, is set to a lower value than the default one. [float] === Compatibility diff --git a/filebeat/filebeat.reference.yml b/filebeat/filebeat.reference.yml index 95cbdcb530d8..6c9f03a3ace3 100644 --- a/filebeat/filebeat.reference.yml +++ b/filebeat/filebeat.reference.yml @@ -210,7 +210,7 @@ filebeat.modules: #enabled: true # The Redis hosts to connect to. - #var.hosts: ["localhost:6378"] + #var.hosts: ["localhost:6379"] # Optional, the password to use when connecting to Redis. #var.password: diff --git a/filebeat/module/redis/_meta/config.reference.yml b/filebeat/module/redis/_meta/config.reference.yml index 1bf9495f67ac..cf8acdb62a91 100644 --- a/filebeat/module/redis/_meta/config.reference.yml +++ b/filebeat/module/redis/_meta/config.reference.yml @@ -12,7 +12,7 @@ #enabled: true # The Redis hosts to connect to. - #var.hosts: ["localhost:6378"] + #var.hosts: ["localhost:6379"] # Optional, the password to use when connecting to Redis. #var.password: diff --git a/filebeat/module/redis/_meta/config.yml b/filebeat/module/redis/_meta/config.yml index cc1912a44de1..4aa2f1eacf0f 100644 --- a/filebeat/module/redis/_meta/config.yml +++ b/filebeat/module/redis/_meta/config.yml @@ -12,7 +12,7 @@ enabled: true # The Redis hosts to connect to. - #var.hosts: ["localhost:6378"] + #var.hosts: ["localhost:6379"] # Optional, the password to use when connecting to Redis. #var.password: diff --git a/filebeat/module/redis/_meta/docs.asciidoc b/filebeat/module/redis/_meta/docs.asciidoc index fda925d0ff6a..6bb3d6136755 100644 --- a/filebeat/module/redis/_meta/docs.asciidoc +++ b/filebeat/module/redis/_meta/docs.asciidoc @@ -8,8 +8,9 @@ This module has two filesets: * The `slowlog` fileset connects to Redis via the network and retrieves the slow logs by using the `SLOWLOG` command. -For the `log` fileset, make sure the `logfile` option is set in the Redis configuration file. For -the `slowlog` fileset, make sure the `slowlog-log-slower-than` is set. +For the `log` fileset, make sure the `logfile` option, from the Redis configuration file, is set to `redis-server.log`. + +For the `slowlog` fileset, make sure the `slowlog-log-slower-than` option, from the Redis configuration file, is set to a lower value than the default one. [float] === Compatibility diff --git a/filebeat/module/redis/log/manifest.yml b/filebeat/module/redis/log/manifest.yml index 4aed1d84d4e1..98351f145499 100644 --- a/filebeat/module/redis/log/manifest.yml +++ b/filebeat/module/redis/log/manifest.yml @@ -6,6 +6,7 @@ var: - /var/log/redis/redis-server.log* os.darwin: - /usr/local/var/log/redis/redis-server.log* + - /usr/local/var/db/redis/redis-server.log* os.windows: - "c:/program files/Redis/logs/redis.log*" diff --git a/filebeat/modules.d/redis.yml.disabled b/filebeat/modules.d/redis.yml.disabled index cc1912a44de1..4aa2f1eacf0f 100644 --- a/filebeat/modules.d/redis.yml.disabled +++ b/filebeat/modules.d/redis.yml.disabled @@ -12,7 +12,7 @@ enabled: true # The Redis hosts to connect to. - #var.hosts: ["localhost:6378"] + #var.hosts: ["localhost:6379"] # Optional, the password to use when connecting to Redis. #var.password: