Skip to content

Commit

Permalink
Fix default paths in macOS for Redis 4.0.1 (#5173)
Browse files Browse the repository at this point in the history
  • Loading branch information
monicasarbu authored and ruflin committed Sep 20, 2017
1 parent c0de062 commit 23f6efe
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 8 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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*

Expand Down
5 changes: 3 additions & 2 deletions filebeat/docs/modules/redis.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion filebeat/filebeat.reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion filebeat/module/redis/_meta/config.reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
2 changes: 1 addition & 1 deletion filebeat/module/redis/_meta/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
5 changes: 3 additions & 2 deletions filebeat/module/redis/_meta/docs.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions filebeat/module/redis/log/manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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*"

Expand Down
2 changes: 1 addition & 1 deletion filebeat/modules.d/redis.yml.disabled
Original file line number Diff line number Diff line change
Expand Up @@ -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:

0 comments on commit 23f6efe

Please sign in to comment.