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

[7.x](backport #26642) [fix][metricbeat] Change default value for server_status_path in nginx module #27193

Merged
merged 1 commit into from
Aug 3, 2021
Merged

[7.x](backport #26642) [fix][metricbeat] Change default value for server_status_path in nginx module #27193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 @@ -402,6 +402,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Fix aws metric tags with resourcegroupstaggingapi paginator. {issue}26385[26385] {pull}26443[26443]
- Fix quoting in GCP billing table name {issue}26855[26855] {pull}26870[26870]
- Allow metric prefix override per service in gcp module. {pull}26960[26960]
- Change `server_status_path` default setting to `nginx_status` for the `nginx` module. {pull}26642[26642]

*Packetbeat*

Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/nginx/_meta/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ ARG NGINX_VERSION
FROM nginx:${NGINX_VERSION}
RUN sed -i "/jessie-updates/d" /etc/apt/sources.list
RUN apt-get update && apt-get install -y curl
HEALTHCHECK --interval=1s --retries=90 CMD curl -f http://localhost/server-status
HEALTHCHECK --interval=1s --retries=90 CMD curl -f http://localhost/nginx_status
COPY ./nginx.conf /etc/nginx/
4 changes: 2 additions & 2 deletions metricbeat/module/nginx/_meta/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,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"
2 changes: 1 addition & 1 deletion metricbeat/module/nginx/_meta/nginx.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ http {
listen 80;
server_name localhost;

location /server-status {
location /nginx_status {
stub_status on;
}
}
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/nginx/stubstatus/stubstatus.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const (
defaultScheme = "http"

// defaultPath is the default path to the ngx_http_stub_status_module endpoint on Nginx.
defaultPath = "/server-status"
defaultPath = "/nginx_status"
)

var (
Expand Down
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"