Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix default paths in macOS for Redis 4.0.1 #5173

Merged
merged 1 commit into from
Sep 20, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,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:
* 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:
* 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"]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch 👍


# Optional, the password to use when connecting to Redis.
#var.password: