Skip to content

Commit

Permalink
Remove double password and username in the Redis input config opt… (
Browse files Browse the repository at this point in the history
#6662)

- Remove a double password in the yml file.
- Remove mention of username in the configuration, nothing in the input
code uses thats.
- Remove space
  • Loading branch information
ph authored and ruflin committed Mar 27, 2018
1 parent b6cd1c3 commit 1f8d072
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 15 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ https://github.com/elastic/beats/compare/v6.0.0-beta2...master[Check the HEAD di
- Refactor the usage of prospector to input in the YAML reference and
the system test. {pull}6121[6121]
- Add IIS module to parse access log and error log. {pull}6127[6127]
- Remove the undefined `username` option from the Redis input and clarify the documentation. {pull}6662[6662]

*Heartbeat*

Expand Down
8 changes: 5 additions & 3 deletions filebeat/_meta/common.reference.p2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -213,10 +213,12 @@ filebeat.inputs:
#------------------------- Redis slowlog input ---------------------------
# Experimental: Config options for the redis slow log input
#- type: redis
#hosts: ["localhost:6379"]
#username:
#password:
#enabled: false

# List of hosts to pool to retrieve the slow log information.
#hosts: ["localhost:6379"]

# How often the input checks for redis slow log.
#scan_frequency: 10s

# Timeout after which time the input should return an error
Expand Down
9 changes: 1 addition & 8 deletions filebeat/docs/inputs/input-redis.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ Example configuration:
{beatname_lc}.inputs:
- type: redis
hosts: ["localhost:6379"]
username: "$\{redis_user\}"
password: "$\{redis_pwd\}"
----

Expand All @@ -34,12 +33,6 @@ The `redis` input supports the following configuration options plus the

The list of Redis hosts to connect to.

[float]
[[redis-username]]
===== `username`

The username to use when connecting to Redis.

[float]
[[redis-password]]
===== `password`
Expand All @@ -59,7 +52,7 @@ The default is `10s`.
IMPORTANT: Redis slowlogs are not permanent. To ensure that all slowlog entries
are collected, set `scan_frequency` to a value that allows {beatname_uc}
sufficient time to connect to Redis, query the logs, and buffer them to the
output within the specified interval.
output within the specified interval.

[float]
[[redis-timeout]]
Expand Down
8 changes: 5 additions & 3 deletions filebeat/filebeat.reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -508,10 +508,12 @@ filebeat.inputs:
#------------------------- Redis slowlog input ---------------------------
# Experimental: Config options for the redis slow log input
#- type: redis
#hosts: ["localhost:6379"]
#username:
#password:
#enabled: false

# List of hosts to pool to retrieve the slow log information.
#hosts: ["localhost:6379"]

# How often the input checks for redis slow log.
#scan_frequency: 10s

# Timeout after which time the input should return an error
Expand Down
1 change: 0 additions & 1 deletion filebeat/input/redis/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (
)

var defaultConfig = config{

ForwarderConfig: harvester.ForwarderConfig{
Type: "redis",
},
Expand Down

0 comments on commit 1f8d072

Please sign in to comment.