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.

Sign up for GitHub

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

Jump to bottom

[Metricbeat] change server_status_path default setting for nginx module #14099

Merged
merged 8 commits into from
Nov 24, 2019
Merged

[Metricbeat] change server_status_path default setting for nginx module #14099

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ad50919
changed default server_status_path to nginx_status
goku321 Oct 16, 2019
8382d8b
Merge branch 'master' into GH-13806
goku321 Oct 24, 2019
5f0c9eb
Added changelog entry
goku321 Oct 26, 2019
0d0c9e6
Moved changelog entry to bugfixes
goku321 Oct 26, 2019
9b3dfb7
Refactored code
goku321 Oct 26, 2019
b64baad
Ran mage udpate
goku321 Oct 26, 2019
7a11126
Refactored code.
goku321 Nov 24, 2019
e20bf4c
Merge branch 'master' into GH-13806
goku321 Nov 24, 2019
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.next.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- system/raid metricset now uses /sys/block instead of /proc/mdstat for data. {pull}11613[11613]
- kubernetes.container.cpu.limit.cores and kubernetes.container.cpu.requests.cores are now floats. {issue}11975[11975]
- Add statistic option into cloudwatch metricset. If there is no statistic method specified, default is to collect Average, Sum, Maximum, Minimum and SampleCount. {issue}12370[12370] {pull}12840[12840]
- Change `server_status_path` default setting for nginx module {issue}13806[13806], {pull}14099[14099]
kaiyan-sheng marked this conversation as resolved.
Show resolved Hide resolved

*Packetbeat*

Expand Down
4 changes: 2 additions & 2 deletions metricbeat/metricbeat.reference.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -622,8 +622,8 @@ metricbeat.modules:
# Nginx hosts
hosts: ["http://127.0.0.1"]

# Path to server status. Default server-status
server_status_path: "server-status"
# Path to server status. Default nginx_status
server_status_path: "nginx_status"

#------------------------------- PHP_FPM Module -------------------------------
- module: php_fpm
Expand Down
4 changes: 2 additions & 2 deletions metricbeat/module/nginx/_meta/config.reference.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
# Nginx hosts
hosts: ["http://127.0.0.1"]

# Path to server status. Default server-status
server_status_path: "server-status"
# Path to server status. Default nginx_status
server_status_path: "nginx_status"
4 changes: 2 additions & 2 deletions metricbeat/modules.d/nginx.yml.disabled
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
# Nginx hosts
hosts: ["http://127.0.0.1"]

# Path to server status. Default server-status
#server_status_path: "server-status"
# Path to server status. Default nginx_status
#server_status_path: "nginx_status"

#username: "user"
#password: "secret"
4 changes: 2 additions & 2 deletions x-pack/metricbeat/metricbeat.reference.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -728,8 +728,8 @@ metricbeat.modules:
# Nginx hosts
hosts: ["http://127.0.0.1"]

# Path to server status. Default server-status
server_status_path: "server-status"
# Path to server status. Default nginx_status
server_status_path: "nginx_status"

#-------------------------------- Oracle Module --------------------------------
- module: oracle
Expand Down