From 59d003630d40774ac4fe39176d6d90fadb97d183 Mon Sep 17 00:00:00 2001 From: Tudor Golubenco Date: Mon, 6 Jun 2016 11:56:17 +0200 Subject: [PATCH] Remove trailing slash from apache/nginx configs The issue with the trailing slash is that the code considers that a "path", so the real path is ignored when configured. Fixes #1779. --- metricbeat/docs/modules/apache.asciidoc | 2 +- metricbeat/docs/modules/nginx.asciidoc | 2 +- metricbeat/etc/beat.full.yml | 4 ++-- metricbeat/metricbeat.full.yml | 4 ++-- metricbeat/module/apache/_beat/config.full.yml | 2 +- metricbeat/module/apache/_beat/config.yml | 2 +- metricbeat/module/nginx/_beat/config.full.yml | 2 +- metricbeat/module/nginx/_beat/config.yml | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/metricbeat/docs/modules/apache.asciidoc b/metricbeat/docs/modules/apache.asciidoc index 04b4f371e9b..891608665b1 100644 --- a/metricbeat/docs/modules/apache.asciidoc +++ b/metricbeat/docs/modules/apache.asciidoc @@ -30,7 +30,7 @@ metricbeat.modules: period: 10s # Apache hosts - hosts: ["http://127.0.0.1/"] + hosts: ["http://127.0.0.1"] ---- [float] diff --git a/metricbeat/docs/modules/nginx.asciidoc b/metricbeat/docs/modules/nginx.asciidoc index 4cdcb3d4720..7bf12caf010 100644 --- a/metricbeat/docs/modules/nginx.asciidoc +++ b/metricbeat/docs/modules/nginx.asciidoc @@ -30,7 +30,7 @@ metricbeat.modules: period: 10s # Nginx hosts - hosts: ["http://127.0.0.1/"] + hosts: ["http://127.0.0.1"] ---- [float] diff --git a/metricbeat/etc/beat.full.yml b/metricbeat/etc/beat.full.yml index 66fca650c10..e55edbb2852 100644 --- a/metricbeat/etc/beat.full.yml +++ b/metricbeat/etc/beat.full.yml @@ -50,7 +50,7 @@ metricbeat.modules: #period: 10s # Apache hosts - #hosts: ["http://127.0.0.1/"] + #hosts: ["http://127.0.0.1"] # Path to server status. Default server-status #server_status_path: "server-status" @@ -84,7 +84,7 @@ metricbeat.modules: #period: 10s # Nginx hosts - #hosts: ["http://127.0.0.1/"] + #hosts: ["http://127.0.0.1"] # Path to server status. Default server-status #server_status_path: "server-status" diff --git a/metricbeat/metricbeat.full.yml b/metricbeat/metricbeat.full.yml index 486a3e751b5..3031b23312c 100644 --- a/metricbeat/metricbeat.full.yml +++ b/metricbeat/metricbeat.full.yml @@ -50,7 +50,7 @@ metricbeat.modules: #period: 10s # Apache hosts - #hosts: ["http://127.0.0.1/"] + #hosts: ["http://127.0.0.1"] # Path to server status. Default server-status #server_status_path: "server-status" @@ -84,7 +84,7 @@ metricbeat.modules: #period: 10s # Nginx hosts - #hosts: ["http://127.0.0.1/"] + #hosts: ["http://127.0.0.1"] # Path to server status. Default server-status #server_status_path: "server-status" diff --git a/metricbeat/module/apache/_beat/config.full.yml b/metricbeat/module/apache/_beat/config.full.yml index b99688f3f41..843065a2924 100644 --- a/metricbeat/module/apache/_beat/config.full.yml +++ b/metricbeat/module/apache/_beat/config.full.yml @@ -4,7 +4,7 @@ #period: 10s # Apache hosts - #hosts: ["http://127.0.0.1/"] + #hosts: ["http://127.0.0.1"] # Path to server status. Default server-status #server_status_path: "server-status" diff --git a/metricbeat/module/apache/_beat/config.yml b/metricbeat/module/apache/_beat/config.yml index 37962715784..3fdfae58a55 100644 --- a/metricbeat/module/apache/_beat/config.yml +++ b/metricbeat/module/apache/_beat/config.yml @@ -4,4 +4,4 @@ period: 10s # Apache hosts - hosts: ["http://127.0.0.1/"] + hosts: ["http://127.0.0.1"] diff --git a/metricbeat/module/nginx/_beat/config.full.yml b/metricbeat/module/nginx/_beat/config.full.yml index dc42b71e45a..d394da307c2 100644 --- a/metricbeat/module/nginx/_beat/config.full.yml +++ b/metricbeat/module/nginx/_beat/config.full.yml @@ -4,7 +4,7 @@ #period: 10s # Nginx hosts - #hosts: ["http://127.0.0.1/"] + #hosts: ["http://127.0.0.1"] # Path to server status. Default server-status #server_status_path: "server-status" diff --git a/metricbeat/module/nginx/_beat/config.yml b/metricbeat/module/nginx/_beat/config.yml index 69c895d388f..865c8faad97 100644 --- a/metricbeat/module/nginx/_beat/config.yml +++ b/metricbeat/module/nginx/_beat/config.yml @@ -4,4 +4,4 @@ period: 10s # Nginx hosts - hosts: ["http://127.0.0.1/"] + hosts: ["http://127.0.0.1"]