From 91d50ee37406e2ce2eaeb316793f64372ece7df8 Mon Sep 17 00:00:00 2001 From: Sven Rebhan <36194019+srebhan@users.noreply.github.com> Date: Wed, 1 Jun 2022 17:22:25 +0200 Subject: [PATCH] fix: Update sample.conf for prometheus (#11217) --- plugins/inputs/prometheus/sample.conf | 10 +++------- plugins/outputs/prometheus_client/sample.conf | 9 +++------ 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/plugins/inputs/prometheus/sample.conf b/plugins/inputs/prometheus/sample.conf index 6349fa304..34945169a 100644 --- a/plugins/inputs/prometheus/sample.conf +++ b/plugins/inputs/prometheus/sample.conf @@ -3,13 +3,9 @@ ## An array of urls to scrape metrics from. urls = ["http://localhost:9100/metrics"] - ## Metric version controls the mapping from Prometheus metrics into - ## Telegraf metrics. When using the prometheus_client output, use the same - ## value in both plugins to ensure metrics are round-tripped without - ## modification. - ## - ## example: metric_version = 1; - ## metric_version = 2; recommended version + ## Metric version controls the mapping from Prometheus metrics into Telegraf metrics. + ## See "Metric Format Configuration" in plugins/inputs/prometheus/README.md for details. + ## Valid options: 1, 2 # metric_version = 1 ## Url tag name (tag containing scrapped url. optional, default is "url") diff --git a/plugins/outputs/prometheus_client/sample.conf b/plugins/outputs/prometheus_client/sample.conf index 23118d5fb..762b25680 100644 --- a/plugins/outputs/prometheus_client/sample.conf +++ b/plugins/outputs/prometheus_client/sample.conf @@ -3,12 +3,9 @@ ## Address to listen on. listen = ":9273" - ## Metric version controls the mapping from Telegraf metrics into - ## Prometheus format. When using the prometheus input, use the same value in - ## both plugins to ensure metrics are round-tripped without modification. - ## - ## example: metric_version = 1; - ## metric_version = 2; recommended version + ## Metric version controls the mapping from Prometheus metrics into Telegraf metrics. + ## See "Metric Format Configuration" in plugins/inputs/prometheus/README.md for details. + ## Valid options: 1, 2 # metric_version = 1 ## Use HTTP Basic Authentication.