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

influxdata · Jul 7, 2022 · 6293e9a · 6293e9a
1 parent a0aa408
commit 6293e9a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/plugins/parsers/all/all.go b/plugins/parsers/all/all.go
@@ -15,6 +15,7 @@ import (
 	_ "github.com/influxdata/telegraf/plugins/parsers/logfmt"
 	_ "github.com/influxdata/telegraf/plugins/parsers/nagios"
 	_ "github.com/influxdata/telegraf/plugins/parsers/prometheus"
+	_ "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
@@ -4,7 +4,6 @@ import (
 	"fmt"
 
 	"github.com/influxdata/telegraf"
-	"github.com/influxdata/telegraf/plugins/parsers/prometheusremotewrite"
 	"github.com/influxdata/telegraf/plugins/parsers/temporary/json_v2"
 	"github.com/influxdata/telegraf/plugins/parsers/temporary/xpath"
 )
@@ -193,8 +192,6 @@ func NewParser(config *Config) (Parser, error) {
 	var err error
 	var parser Parser
 	switch config.DataFormat {
-	case "prometheusremotewrite":
-		parser, err = NewPrometheusRemoteWriteParser(config.DefaultTags)
 	default:
 		creator, found := Parsers[config.DataFormat]
 		if !found {
@@ -213,8 +210,5 @@ func NewParser(config *Config) (Parser, error) {
 	return parser, err
 }
 
-func NewPrometheusRemoteWriteParser(defaultTags map[string]string) (Parser, error) {
-	return &prometheusremotewrite.Parser{
-		DefaultTags: defaultTags,
 	}, nil
 }