From aab8dd5b7a5b5d86c1959e1a6fd423c9cdccbfab Mon Sep 17 00:00:00 2001 From: DeDe Morton Date: Tue, 3 Mar 2020 11:32:13 -0800 Subject: [PATCH 1/2] [docs] Add username and password to haproxy example (#16703) --- metricbeat/metricbeat.reference.yml | 2 ++ metricbeat/module/haproxy/_meta/config.reference.yml | 2 ++ x-pack/metricbeat/metricbeat.reference.yml | 2 ++ 3 files changed, 6 insertions(+) diff --git a/metricbeat/metricbeat.reference.yml b/metricbeat/metricbeat.reference.yml index f7346e0f885f..2ff711ccb141 100644 --- a/metricbeat/metricbeat.reference.yml +++ b/metricbeat/metricbeat.reference.yml @@ -315,6 +315,8 @@ metricbeat.modules: metricsets: ["info", "stat"] period: 10s hosts: ["tcp://127.0.0.1:14567"] + username : "admin" + password : "admin" enabled: true #--------------------------------- HTTP Module --------------------------------- diff --git a/metricbeat/module/haproxy/_meta/config.reference.yml b/metricbeat/module/haproxy/_meta/config.reference.yml index bf45b4dc75ae..4f9d85b2dc75 100644 --- a/metricbeat/module/haproxy/_meta/config.reference.yml +++ b/metricbeat/module/haproxy/_meta/config.reference.yml @@ -2,4 +2,6 @@ metricsets: ["info", "stat"] period: 10s hosts: ["tcp://127.0.0.1:14567"] + username : "admin" + password : "admin" enabled: true diff --git a/x-pack/metricbeat/metricbeat.reference.yml b/x-pack/metricbeat/metricbeat.reference.yml index 8d8e2b572818..d9bfa411c313 100644 --- a/x-pack/metricbeat/metricbeat.reference.yml +++ b/x-pack/metricbeat/metricbeat.reference.yml @@ -508,6 +508,8 @@ metricbeat.modules: metricsets: ["info", "stat"] period: 10s hosts: ["tcp://127.0.0.1:14567"] + username : "admin" + password : "admin" enabled: true #--------------------------------- HTTP Module --------------------------------- From d6ae7c00941a0b672fd93451a98cf9827c4866a2 Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Tue, 3 Mar 2020 16:13:45 -0800 Subject: [PATCH 2/2] Generate haproxy module docs (#16776) --- metricbeat/docs/modules/haproxy.asciidoc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/metricbeat/docs/modules/haproxy.asciidoc b/metricbeat/docs/modules/haproxy.asciidoc index b22d8244df49..8f43e3cbae98 100644 --- a/metricbeat/docs/modules/haproxy.asciidoc +++ b/metricbeat/docs/modules/haproxy.asciidoc @@ -59,6 +59,8 @@ metricbeat.modules: metricsets: ["info", "stat"] period: 10s hosts: ["tcp://127.0.0.1:14567"] + username : "admin" + password : "admin" enabled: true ----