From ab1bf49b9d31d097b8cfc7aed1eb85567b9e7419 Mon Sep 17 00:00:00 2001 From: David Kilfoyle Date: Mon, 18 Mar 2024 07:41:05 -0400 Subject: [PATCH 1/3] Fix docs build break from SSL module page --- metricbeat/docs/modules/mysql.asciidoc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/metricbeat/docs/modules/mysql.asciidoc b/metricbeat/docs/modules/mysql.asciidoc index 5433fe94224..be116db141e 100644 --- a/metricbeat/docs/modules/mysql.asciidoc +++ b/metricbeat/docs/modules/mysql.asciidoc @@ -101,6 +101,8 @@ metricbeat.modules: # Client certificate key file #ssl.key: "/etc/pki/client/cert.key"---- +---- + [float] === Metricsets From fc863b673aa441502f6a2f0f6d664a297c73f3eb Mon Sep 17 00:00:00 2001 From: David Kilfoyle <41695641+kilfoyle@users.noreply.github.com> Date: Mon, 18 Mar 2024 08:18:54 -0400 Subject: [PATCH 2/3] Update metricbeat/docs/modules/mysql.asciidoc Co-authored-by: Denis --- metricbeat/docs/modules/mysql.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metricbeat/docs/modules/mysql.asciidoc b/metricbeat/docs/modules/mysql.asciidoc index be116db141e..dc31d98f979 100644 --- a/metricbeat/docs/modules/mysql.asciidoc +++ b/metricbeat/docs/modules/mysql.asciidoc @@ -100,7 +100,7 @@ metricbeat.modules: #ssl.certificate: "/etc/pki/client/cert.crt" # Client certificate key file - #ssl.key: "/etc/pki/client/cert.key"---- + #ssl.key: "/etc/pki/client/cert.key" ---- From 2e78d427b0cb600f8a065e936f24f82c1487bf2a Mon Sep 17 00:00:00 2001 From: Denis Rechkunov Date: Mon, 18 Mar 2024 13:34:50 +0100 Subject: [PATCH 3/3] Fix the config reference, so we can build the docs --- metricbeat/docs/modules/mysql.asciidoc | 3 +-- metricbeat/metricbeat.reference.yml | 3 ++- metricbeat/module/mysql/_meta/config.reference.yml | 4 ++-- x-pack/metricbeat/metricbeat.reference.yml | 3 ++- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/metricbeat/docs/modules/mysql.asciidoc b/metricbeat/docs/modules/mysql.asciidoc index dc31d98f979..8711359bf5f 100644 --- a/metricbeat/docs/modules/mysql.asciidoc +++ b/metricbeat/docs/modules/mysql.asciidoc @@ -98,12 +98,11 @@ metricbeat.modules: # Certificate for SSL/TLS client authentication #ssl.certificate: "/etc/pki/client/cert.crt" - + # Client certificate key file #ssl.key: "/etc/pki/client/cert.key" ---- - [float] === Metricsets diff --git a/metricbeat/metricbeat.reference.yml b/metricbeat/metricbeat.reference.yml index 59a8d5d6c38..3f9ccb0a9db 100644 --- a/metricbeat/metricbeat.reference.yml +++ b/metricbeat/metricbeat.reference.yml @@ -772,9 +772,10 @@ metricbeat.modules: # Certificate for SSL/TLS client authentication #ssl.certificate: "/etc/pki/client/cert.crt" - + # Client certificate key file #ssl.key: "/etc/pki/client/cert.key" + #--------------------------------- NATS Module --------------------------------- - module: nats metricsets: diff --git a/metricbeat/module/mysql/_meta/config.reference.yml b/metricbeat/module/mysql/_meta/config.reference.yml index f31774cb1be..4e5cc470aca 100644 --- a/metricbeat/module/mysql/_meta/config.reference.yml +++ b/metricbeat/module/mysql/_meta/config.reference.yml @@ -30,6 +30,6 @@ # Certificate for SSL/TLS client authentication #ssl.certificate: "/etc/pki/client/cert.crt" - + # Client certificate key file - #ssl.key: "/etc/pki/client/cert.key" \ No newline at end of file + #ssl.key: "/etc/pki/client/cert.key" diff --git a/x-pack/metricbeat/metricbeat.reference.yml b/x-pack/metricbeat/metricbeat.reference.yml index 313fc5491e0..f71e58904fd 100644 --- a/x-pack/metricbeat/metricbeat.reference.yml +++ b/x-pack/metricbeat/metricbeat.reference.yml @@ -1180,9 +1180,10 @@ metricbeat.modules: # Certificate for SSL/TLS client authentication #ssl.certificate: "/etc/pki/client/cert.crt" - + # Client certificate key file #ssl.key: "/etc/pki/client/cert.key" + #--------------------------------- NATS Module --------------------------------- - module: nats metricsets: