Use textparse in prometheus module helper library (#33865)

elastic · Jan 25, 2023 · 9754d2b · 9754d2b
1 parent 5ed9f16
commit 9754d2b
Show file tree

Hide file tree

Showing 33 changed files with 1,274 additions and 1,206 deletions.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -192,6 +192,7 @@ https://github.com/elastic/beats/compare/v8.2.0\...main[Check the HEAD diff]
 - Add GCP Redis regions support {pull}33728[33728]
 - Add namespace metadata to all namespaced kubernetes resources. {pull}33763[33763]
 - Changed cloudwatch module to call ListMetrics API only once per region, instead of per AWS namespace {pull}34055[34055]
+- Handle duplicated TYPE line for prometheus metrics {issue}18813[18813] {pull}33865[33865]
 
 *Packetbeat*
 

diff --git a/metricbeat/helper/openmetrics/metric.go b/metricbeat/helper/openmetrics/metric.go
@@ -24,8 +24,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/elastic/beats/v7/libbeat/common"
 	"github.com/elastic/elastic-agent-libs/mapstr"
+
+	"github.com/elastic/beats/v7/libbeat/common"
+	"github.com/elastic/beats/v7/metricbeat/helper/prometheus"
 )
 
 // MetricMap defines the mapping from Openmetrics metric to a Metricbeat field
@@ -37,7 +39,7 @@ type MetricMap interface {
 	GetField() string
 
 	// GetValue returns the resulting value
-	GetValue(m *OpenMetric) interface{}
+	GetValue(m *prometheus.OpenMetric) interface{}
 	GetNilValue() interface{}
 
 	// GetConfiguration returns the configuration for the metric
@@ -207,7 +209,7 @@ func (m *commonMetric) GetNilValue() interface{} {
 }
 
 // GetValue returns the resulting value
-func (m *commonMetric) GetValue(metric *OpenMetric) interface{} {
+func (m *commonMetric) GetValue(metric *prometheus.OpenMetric) interface{} {
 	info := metric.GetInfo()
 	if info != nil {
 		if info.HasValidValue() {
@@ -325,7 +327,7 @@ type keywordMetric struct {
 }
 
 // GetValue returns the resulting value
-func (m *keywordMetric) GetValue(metric *OpenMetric) interface{} {
+func (m *keywordMetric) GetValue(metric *prometheus.OpenMetric) interface{} {
 	if gauge := metric.GetGauge(); gauge != nil && gauge.GetValue() == 1 {
 		return m.keyword
 	}
@@ -337,7 +339,7 @@ type booleanMetric struct {
 }
 
 // GetValue returns the resulting value
-func (m *booleanMetric) GetValue(metric *OpenMetric) interface{} {
+func (m *booleanMetric) GetValue(metric *prometheus.OpenMetric) interface{} {
 	if gauge := metric.GetGauge(); gauge != nil {
 		return gauge.GetValue() == 1
 	}
@@ -350,14 +352,14 @@ type labelMetric struct {
 }
 
 // GetValue returns the resulting value
-func (m *labelMetric) GetValue(metric *OpenMetric) interface{} {
+func (m *labelMetric) GetValue(metric *prometheus.OpenMetric) interface{} {
 	if gauge := metric.GetGauge(); gauge != nil && gauge.GetValue() == 1 {
 		return getLabel(metric, m.label)
 	}
 	return nil
 }
 
-func getLabel(metric *OpenMetric, name string) string {
+func getLabel(metric *prometheus.OpenMetric, name string) string {
 	for _, label := range metric.GetLabel() {
 		if label.Name == name {
 			return label.Value
@@ -371,7 +373,7 @@ type infoMetric struct {
 }
 
 // GetValue returns the resulting value
-func (m *infoMetric) GetValue(metric *OpenMetric) interface{} {
+func (m *infoMetric) GetValue(metric *prometheus.OpenMetric) interface{} {
 	return ""
 }