fix: Update prometheusremotewrite parser to be a new style parser plugin

influxdata · Jul 5, 2022 · 980c82f · 980c82f
1 parent 2f67010
commit 980c82f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/plugins/parsers/all/all.go b/plugins/parsers/all/all.go
@@ -12,6 +12,7 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/parsers/json_v2"
 	_ "github.com/influxdata/telegraf/plugins/parsers/logfmt"
 	_ "github.com/influxdata/telegraf/plugins/parsers/nagios"
+	_ "github.com/influxdata/telegraf/plugins/parsers/prometheusremotewrite"
 	_ "github.com/influxdata/telegraf/plugins/parsers/value"
 	_ "github.com/influxdata/telegraf/plugins/parsers/wavefront"
 	_ "github.com/influxdata/telegraf/plugins/parsers/xpath"

diff --git a/plugins/parsers/prometheusremotewrite/parser.go b/plugins/parsers/prometheusremotewrite/parser.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/metric"
+	"github.com/influxdata/telegraf/plugins/parsers"
 
 	"github.com/prometheus/common/model"
 	"github.com/prometheus/prometheus/prompb"
@@ -82,3 +83,14 @@ func (p *Parser) ParseLine(line string) (telegraf.Metric, error) {
 func (p *Parser) SetDefaultTags(tags map[string]string) {
 	p.DefaultTags = tags
 }
+
+func (p *Parser) InitFromConfig(config *parsers.Config) error {
+	return nil
+}
+
+func init() {
+	parsers.Add("prometheusremotewrite",
+		func(defaultMetricName string) telegraf.Parser {
+			return &Parser{}
+		})
+}
diff --git a/plugins/parsers/registry.go b/plugins/parsers/registry.go
@@ -7,7 +7,6 @@ import (
 	"github.com/influxdata/telegraf/plugins/parsers/influx"
 	"github.com/influxdata/telegraf/plugins/parsers/influx/influx_upstream"
 	"github.com/influxdata/telegraf/plugins/parsers/prometheus"
-	"github.com/influxdata/telegraf/plugins/parsers/prometheusremotewrite"
 	"github.com/influxdata/telegraf/plugins/parsers/temporary/json_v2"
 	"github.com/influxdata/telegraf/plugins/parsers/temporary/xpath"
 )
@@ -207,8 +206,6 @@ func NewParser(config *Config) (Parser, error) {
 			config.DefaultTags,
 			config.PrometheusIgnoreTimestamp,
 		)
-	case "prometheusremotewrite":
-		parser, err = NewPrometheusRemoteWriteParser(config.DefaultTags)
 	default:
 		creator, found := Parsers[config.DataFormat]
 		if !found {
@@ -242,9 +239,3 @@ func NewPrometheusParser(defaultTags map[string]string, ignoreTimestamp bool) (P
 		IgnoreTimestamp: ignoreTimestamp,
 	}, nil
 }
-
-func NewPrometheusRemoteWriteParser(defaultTags map[string]string) (Parser, error) {
-	return &prometheusremotewrite.Parser{
-		DefaultTags: defaultTags,
-	}, nil
-}