remove deprecation warning (influxdata#9125)

SCP-2000 · Apr 13, 2021 · 66e12e0 · 66e12e0
1 parent 842a788
commit 66e12e0
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 10 deletions.
diff --git a/etc/telegraf.conf b/etc/telegraf.conf
@@ -1259,7 +1259,7 @@
 #   ## 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; deprecated in 1.13
+#   ##   example: metric_version = 1; 
 #   ##            metric_version = 2; recommended version
 #   # metric_version = 1
 #
@@ -7577,7 +7577,7 @@
 #   ## value in both plugins to ensure metrics are round-tripped without
 #   ## modification.
 #   ##
-#   ##   example: metric_version = 1; deprecated in 1.13
+#   ##   example: metric_version = 1; 
 #   ##            metric_version = 2; recommended version
 #   # metric_version = 1
 #

diff --git a/plugins/inputs/prometheus/README.md b/plugins/inputs/prometheus/README.md
@@ -16,7 +16,7 @@ in Prometheus format.
   ## value in both plugins to ensure metrics are round-tripped without
   ## modification.
   ##
-  ##   example: metric_version = 1; deprecated in 1.13
+  ##   example: metric_version = 1; 
   ##            metric_version = 2; recommended version
   # metric_version = 1
 

diff --git a/plugins/inputs/prometheus/prometheus.go b/plugins/inputs/prometheus/prometheus.go
@@ -86,7 +86,7 @@ var sampleConfig = `
   ## value in both plugins to ensure metrics are round-tripped without
   ## modification.
   ##
-  ##   example: metric_version = 1; deprecated in 1.13
+  ##   example: metric_version = 1; 
   ##            metric_version = 2; recommended version
   # metric_version = 1
 
@@ -155,9 +155,6 @@ func (p *Prometheus) Description() string {
 }
 
 func (p *Prometheus) Init() error {
-	if p.MetricVersion != 2 {
-		p.Log.Warnf("Use of deprecated configuration: 'metric_version = 1'; please update to 'metric_version = 2'")
-	}
 
 	// Config proccessing for node scrape scope for monitor_kubernetes_pods
 	p.isNodeScrapeScope = strings.EqualFold(p.PodScrapeScope, "node")

diff --git a/plugins/outputs/prometheus_client/README.md b/plugins/outputs/prometheus_client/README.md
@@ -14,7 +14,7 @@ all metrics on `/metrics` (default) to be polled by a Prometheus server.
   ## 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; deprecated in 1.13
+  ##   example: metric_version = 1;
   ##            metric_version = 2; recommended version
   # metric_version = 1
 

diff --git a/plugins/outputs/prometheus_client/prometheus_client.go b/plugins/outputs/prometheus_client/prometheus_client.go
@@ -35,7 +35,7 @@ var sampleConfig = `
   ## 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; deprecated in 1.13
+  ##   example: metric_version = 1;
   ##            metric_version = 2; recommended version
   # metric_version = 1
 
@@ -133,7 +133,6 @@ func (p *PrometheusClient) Init() error {
 	default:
 		fallthrough
 	case 1:
-		p.Log.Warnf("Use of deprecated configuration: metric_version = 1; please update to metric_version = 2")
 		p.collector = v1.NewCollector(time.Duration(p.ExpirationInterval), p.StringAsLabel, p.Log)
 		err := registry.Register(p.collector)
 		if err != nil {