From f8dbe137c0dd2c9997ac5ebdd067515be0d386af 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 20005b8069f0..0db4e3771e42 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 9e5493db4097..9aa3ad33ee64 100644 --- a/x-pack/metricbeat/metricbeat.reference.yml +++ b/x-pack/metricbeat/metricbeat.reference.yml @@ -476,6 +476,8 @@ metricbeat.modules: metricsets: ["info", "stat"] period: 10s hosts: ["tcp://127.0.0.1:14567"] + username : "admin" + password : "admin" enabled: true #--------------------------------- HTTP Module --------------------------------- From af53f33a07e5184fe4882c96e88667ad9e1088c5 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 588b996e1e79..aa6aa7c9bc44 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 ----