From 6a2e173b41fb655ef2226c92833ac0a469ed1577 Mon Sep 17 00:00:00 2001 From: Jaime Soriano Pastor Date: Wed, 12 Feb 2020 11:07:25 +0100 Subject: [PATCH] Remove spaces in prometheus commented out option (#16233) (#16237) (cherry picked from commit 4dd40a48f92eef9a5b4957a153e1adb6739d4e8d) --- metricbeat/docs/modules/prometheus.asciidoc | 2 +- metricbeat/metricbeat.reference.yml | 2 +- metricbeat/module/prometheus/_meta/config.yml | 2 +- metricbeat/modules.d/prometheus.yml.disabled | 2 +- x-pack/metricbeat/metricbeat.reference.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/metricbeat/docs/modules/prometheus.asciidoc b/metricbeat/docs/modules/prometheus.asciidoc index 46a5f672939..f5c57b82477 100644 --- a/metricbeat/docs/modules/prometheus.asciidoc +++ b/metricbeat/docs/modules/prometheus.asciidoc @@ -36,7 +36,7 @@ metricbeat.modules: #password: "secret" # This can be used for service account based authorization: - # bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token + #bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token #ssl.certificate_authorities: # - /var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt ---- diff --git a/metricbeat/metricbeat.reference.yml b/metricbeat/metricbeat.reference.yml index 390a5408e58..8ed71958c0a 100644 --- a/metricbeat/metricbeat.reference.yml +++ b/metricbeat/metricbeat.reference.yml @@ -703,7 +703,7 @@ metricbeat.modules: #password: "secret" # This can be used for service account based authorization: - # bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token + #bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token #ssl.certificate_authorities: # - /var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt diff --git a/metricbeat/module/prometheus/_meta/config.yml b/metricbeat/module/prometheus/_meta/config.yml index d322be32d5c..69f3219bbd2 100644 --- a/metricbeat/module/prometheus/_meta/config.yml +++ b/metricbeat/module/prometheus/_meta/config.yml @@ -6,6 +6,6 @@ #password: "secret" # This can be used for service account based authorization: - # bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token + #bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token #ssl.certificate_authorities: # - /var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt diff --git a/metricbeat/modules.d/prometheus.yml.disabled b/metricbeat/modules.d/prometheus.yml.disabled index e1033cc9081..d69d3e1cf40 100644 --- a/metricbeat/modules.d/prometheus.yml.disabled +++ b/metricbeat/modules.d/prometheus.yml.disabled @@ -9,6 +9,6 @@ #password: "secret" # This can be used for service account based authorization: - # bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token + #bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token #ssl.certificate_authorities: # - /var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt diff --git a/x-pack/metricbeat/metricbeat.reference.yml b/x-pack/metricbeat/metricbeat.reference.yml index d54b06a4f2e..4727203cc1f 100644 --- a/x-pack/metricbeat/metricbeat.reference.yml +++ b/x-pack/metricbeat/metricbeat.reference.yml @@ -902,7 +902,7 @@ metricbeat.modules: #password: "secret" # This can be used for service account based authorization: - # bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token + #bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token #ssl.certificate_authorities: # - /var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt