Skip to content

Commit

Permalink
Cherry-pick #16518 to 7.x: Update redis host settings docs (#16552)
Browse files Browse the repository at this point in the history
* Update redis host settings docs

The redis host setting accepts passwords and URL schemas by now.
This change update the reference config files and docs.

(cherry picked from commit c4671eb)
  • Loading branch information
Steffen Siering authored Feb 28, 2020
1 parent a87e00a commit 539a710
Show file tree
Hide file tree
Showing 13 changed files with 30 additions and 0 deletions.
2 changes: 2 additions & 0 deletions auditbeat/auditbeat.reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -788,6 +788,8 @@ output.elasticsearch:
# The list of Redis servers to connect to. If load-balancing is enabled, the
# events are distributed to the servers in the list. If one server becomes
# unreachable, the events are distributed to the reachable servers only.
# The hosts setting supports redis and rediss urls with custom password like
# redis://:password@localhost:6379.
#hosts: ["localhost:6379"]

# The name of the Redis list or channel the events are published to. The
Expand Down
2 changes: 2 additions & 0 deletions filebeat/filebeat.reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1493,6 +1493,8 @@ output.elasticsearch:
# The list of Redis servers to connect to. If load-balancing is enabled, the
# events are distributed to the servers in the list. If one server becomes
# unreachable, the events are distributed to the reachable servers only.
# The hosts setting supports redis and rediss urls with custom password like
# redis://:password@localhost:6379.
#hosts: ["localhost:6379"]

# The name of the Redis list or channel the events are published to. The
Expand Down
2 changes: 2 additions & 0 deletions heartbeat/heartbeat.reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -932,6 +932,8 @@ output.elasticsearch:
# The list of Redis servers to connect to. If load-balancing is enabled, the
# events are distributed to the servers in the list. If one server becomes
# unreachable, the events are distributed to the reachable servers only.
# The hosts setting supports redis and rediss urls with custom password like
# redis://:password@localhost:6379.
#hosts: ["localhost:6379"]

# The name of the Redis list or channel the events are published to. The
Expand Down
2 changes: 2 additions & 0 deletions journalbeat/journalbeat.reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -726,6 +726,8 @@ output.elasticsearch:
# The list of Redis servers to connect to. If load-balancing is enabled, the
# events are distributed to the servers in the list. If one server becomes
# unreachable, the events are distributed to the reachable servers only.
# The hosts setting supports redis and rediss urls with custom password like
# redis://:password@localhost:6379.
#hosts: ["localhost:6379"]

# The name of the Redis list or channel the events are published to. The
Expand Down
2 changes: 2 additions & 0 deletions libbeat/_meta/config.reference.yml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -669,6 +669,8 @@ output.elasticsearch:
# The list of Redis servers to connect to. If load-balancing is enabled, the
# events are distributed to the servers in the list. If one server becomes
# unreachable, the events are distributed to the reachable servers only.
# The hosts setting supports redis and rediss urls with custom password like
# redis://:password@localhost:6379.
#hosts: ["localhost:6379"]

# The name of the Redis list or channel the events are published to. The
Expand Down
6 changes: 6 additions & 0 deletions libbeat/outputs/redis/docs/redis.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,12 @@ distributed to the servers in the list. If one server becomes unreachable, the e
distributed to the reachable servers only. You can define each Redis server by specifying
`HOST` or `HOST:PORT`. For example: `"192.15.3.2"` or `"test.redis.io:12345"`. If you
don't specify a port number, the value configured by `port` is used.
Configure each Redis server with an `IP:PORT` pair or with a `URL`. For
example: `redis://localhost:6379` or `rediss://localhost:6379`.
URLs can include a server-specific password. For example: `redis://:password@localhost:6379`.
The `redis` scheme will disable the `ssl` settings for the host, while `rediss`
will enforce TLS. If `rediss` is specified and no `ssl` settings are
configured, the output uses the system certificate store.

===== `index`

Expand Down
2 changes: 2 additions & 0 deletions metricbeat/metricbeat.reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1480,6 +1480,8 @@ output.elasticsearch:
# The list of Redis servers to connect to. If load-balancing is enabled, the
# events are distributed to the servers in the list. If one server becomes
# unreachable, the events are distributed to the reachable servers only.
# The hosts setting supports redis and rediss urls with custom password like
# redis://:password@localhost:6379.
#hosts: ["localhost:6379"]

# The name of the Redis list or channel the events are published to. The
Expand Down
2 changes: 2 additions & 0 deletions packetbeat/packetbeat.reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1210,6 +1210,8 @@ output.elasticsearch:
# The list of Redis servers to connect to. If load-balancing is enabled, the
# events are distributed to the servers in the list. If one server becomes
# unreachable, the events are distributed to the reachable servers only.
# The hosts setting supports redis and rediss urls with custom password like
# redis://:password@localhost:6379.
#hosts: ["localhost:6379"]

# The name of the Redis list or channel the events are published to. The
Expand Down
2 changes: 2 additions & 0 deletions winlogbeat/winlogbeat.reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -711,6 +711,8 @@ output.elasticsearch:
# The list of Redis servers to connect to. If load-balancing is enabled, the
# events are distributed to the servers in the list. If one server becomes
# unreachable, the events are distributed to the reachable servers only.
# The hosts setting supports redis and rediss urls with custom password like
# redis://:password@localhost:6379.
#hosts: ["localhost:6379"]

# The name of the Redis list or channel the events are published to. The
Expand Down
2 changes: 2 additions & 0 deletions x-pack/auditbeat/auditbeat.reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -839,6 +839,8 @@ output.elasticsearch:
# The list of Redis servers to connect to. If load-balancing is enabled, the
# events are distributed to the servers in the list. If one server becomes
# unreachable, the events are distributed to the reachable servers only.
# The hosts setting supports redis and rediss urls with custom password like
# redis://:password@localhost:6379.
#hosts: ["localhost:6379"]

# The name of the Redis list or channel the events are published to. The
Expand Down
2 changes: 2 additions & 0 deletions x-pack/filebeat/filebeat.reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2039,6 +2039,8 @@ output.elasticsearch:
# The list of Redis servers to connect to. If load-balancing is enabled, the
# events are distributed to the servers in the list. If one server becomes
# unreachable, the events are distributed to the reachable servers only.
# The hosts setting supports redis and rediss urls with custom password like
# redis://:password@localhost:6379.
#hosts: ["localhost:6379"]

# The name of the Redis list or channel the events are published to. The
Expand Down
2 changes: 2 additions & 0 deletions x-pack/metricbeat/metricbeat.reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1724,6 +1724,8 @@ output.elasticsearch:
# The list of Redis servers to connect to. If load-balancing is enabled, the
# events are distributed to the servers in the list. If one server becomes
# unreachable, the events are distributed to the reachable servers only.
# The hosts setting supports redis and rediss urls with custom password like
# redis://:password@localhost:6379.
#hosts: ["localhost:6379"]

# The name of the Redis list or channel the events are published to. The
Expand Down
2 changes: 2 additions & 0 deletions x-pack/winlogbeat/winlogbeat.reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -714,6 +714,8 @@ output.elasticsearch:
# The list of Redis servers to connect to. If load-balancing is enabled, the
# events are distributed to the servers in the list. If one server becomes
# unreachable, the events are distributed to the reachable servers only.
# The hosts setting supports redis and rediss urls with custom password like
# redis://:password@localhost:6379.
#hosts: ["localhost:6379"]

# The name of the Redis list or channel the events are published to. The
Expand Down

0 comments on commit 539a710

Please sign in to comment.