Skip to content

Commit

Permalink
Remove incorrect mention of HTTP_PROXY in docs (elastic#7831)
Browse files Browse the repository at this point in the history
The proxy_url setting in the hearbeat monitors does not fallback to
HTTP_PROXY on purpose. This is, so the configuration/network of outputs
and monitors are kept mostly separate.
This change removes all incorrect mentions of HTTP_PROXY in the
heartbeat monitors documentation and reference config file.
  • Loading branch information
Steffen Siering authored Aug 29, 2018
1 parent 43ee7d7 commit 56b96d8
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion heartbeat/_meta/beat.reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ heartbeat.monitors:
# Interval between file file changed checks.
#interval: 5s

# Optional HTTP proxy url. If not set HTTP_PROXY environment variable will be used.
# Optional HTTP proxy url.
#proxy_url: ''

# Total test connection and data exchange timeout
Expand Down
3 changes: 1 addition & 2 deletions heartbeat/docs/heartbeat-options.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -390,8 +390,7 @@ Example configuration:
[[monitor-http-proxy-url]]
==== `proxy_url`

The HTTP proxy URL. This setting is optional. If not set, the HTTP_PROXY
environment variable is used.
The HTTP proxy URL. This setting is optional.

[float]
[[monitor-http-username]]
Expand Down
2 changes: 1 addition & 1 deletion heartbeat/heartbeat.reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ heartbeat.monitors:
# Interval between file file changed checks.
#interval: 5s

# Optional HTTP proxy url. If not set HTTP_PROXY environment variable will be used.
# Optional HTTP proxy url.
#proxy_url: ''

# Total test connection and data exchange timeout
Expand Down

0 comments on commit 56b96d8

Please sign in to comment.