Fixed an issue in the static config converter where exporter instance…

… values (#5782) were not being mapped when translating to flow. Signed-off-by: erikbaranowski <[email protected]>
grafana · Nov 15, 2023 · bbd4509 · bbd4509
1 parent 0b03f0b
commit bbd4509
Show file tree

Hide file tree

Showing 5 changed files with 75 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -143,6 +143,9 @@ Main (unreleased)
   resulting in remote write sending the exemplar first and Prometheus failing to ingest it due to missing
   series. (@krajorama)
 
+- Fixed an issue in the static config converter where exporter instance values
+  were not being mapped when translating to flow. (@erikbaranowski)
+
 v0.37.4 (2023-11-06)
 -----------------
 

diff --git a/converter/internal/staticconvert/internal/build/builder.go b/converter/internal/staticconvert/internal/build/builder.go
@@ -163,9 +163,19 @@ func (b *IntegrationsConfigBuilder) appendV1Integrations() {
 }
 
 func (b *IntegrationsConfigBuilder) appendExporter(commonConfig *int_config.Common, name string, extraTargets []discovery.Target) {
+	var relabelConfigs []*relabel.Config
+	if commonConfig.InstanceKey != nil {
+		defaultConfig := relabel.DefaultRelabelConfig
+		relabelConfig := &defaultConfig
+		relabelConfig.TargetLabel = "instance"
+		relabelConfig.Replacement = *commonConfig.InstanceKey
+
+		relabelConfigs = append(relabelConfigs, relabelConfig)
+	}
+
 	scrapeConfig := prom_config.DefaultScrapeConfig
 	scrapeConfig.JobName = b.formatJobName(name, nil)
-	scrapeConfig.RelabelConfigs = commonConfig.RelabelConfigs
+	scrapeConfig.RelabelConfigs = append(commonConfig.RelabelConfigs, relabelConfigs...)
 	scrapeConfig.MetricRelabelConfigs = commonConfig.MetricRelabelConfigs
 	scrapeConfig.HTTPClientConfig.TLSConfig = b.cfg.Integrations.ConfigV1.TLSConfig
 
@@ -282,6 +292,15 @@ func (b *IntegrationsConfigBuilder) appendExporterV2(commonConfig *common_v2.Met
 		relabelConfigs = append(relabelConfigs, relabelConfig)
 	}
 
+	if commonConfig.InstanceKey != nil {
+		defaultConfig := relabel.DefaultRelabelConfig
+		relabelConfig := &defaultConfig
+		relabelConfig.TargetLabel = "instance"
+		relabelConfig.Replacement = *commonConfig.InstanceKey
+
+		relabelConfigs = append(relabelConfigs, relabelConfig)
+	}
+
 	commonConfig.ApplyDefaults(b.cfg.Integrations.ConfigV2.Metrics.Autoscrape)
 	scrapeConfig := prom_config.DefaultScrapeConfig
 	scrapeConfig.JobName = b.formatJobName(name, commonConfig.InstanceKey)

diff --git a/converter/internal/staticconvert/testdata-v2/integrations_v2.river b/converter/internal/staticconvert/testdata-v2/integrations_v2.river
@@ -15,8 +15,17 @@ prometheus.exporter.azure "integrations_azure1" {
 	metrics       = ["HttpRequestCount"]
 }
 
+discovery.relabel "integrations_azure1" {
+	targets = prometheus.exporter.azure.integrations_azure1.targets
+
+	rule {
+		target_label = "instance"
+		replacement  = "azure1"
+	}
+}
+
 prometheus.scrape "integrations_azure1" {
-	targets    = prometheus.exporter.azure.integrations_azure1.targets
+	targets    = discovery.relabel.integrations_azure1.output
 	forward_to = [prometheus.remote_write.metrics_default.receiver]
 	job_name   = "integrations/azure1"
 }
@@ -27,8 +36,17 @@ prometheus.exporter.azure "integrations_azure2" {
 	metrics       = ["HttpRequestCount"]
 }
 
+discovery.relabel "integrations_azure2" {
+	targets = prometheus.exporter.azure.integrations_azure2.targets
+
+	rule {
+		target_label = "instance"
+		replacement  = "azure2"
+	}
+}
+
 prometheus.scrape "integrations_azure2" {
-	targets    = prometheus.exporter.azure.integrations_azure2.targets
+	targets    = discovery.relabel.integrations_azure2.output
 	forward_to = [prometheus.remote_write.metrics_default.receiver]
 	job_name   = "integrations/azure2"
 }
@@ -409,8 +427,17 @@ prometheus.exporter.apache "integrations_apache1" {
 	insecure = true
 }
 
+discovery.relabel "integrations_apache1" {
+	targets = prometheus.exporter.apache.integrations_apache1.targets
+
+	rule {
+		target_label = "instance"
+		replacement  = "apache1"
+	}
+}
+
 prometheus.scrape "integrations_apache1" {
-	targets    = prometheus.exporter.apache.integrations_apache1.targets
+	targets    = discovery.relabel.integrations_apache1.output
 	forward_to = [prometheus.remote_write.metrics_default.receiver]
 	job_name   = "integrations/apache1"
 }
@@ -431,6 +458,11 @@ discovery.relabel "integrations_apache2" {
 		target_label  = "test_label_2"
 		replacement   = "test_label_value_2"
 	}
+
+	rule {
+		target_label = "instance"
+		replacement  = "apache2"
+	}
 }
 
 prometheus.scrape "integrations_apache2" {

diff --git a/converter/internal/staticconvert/testdata/integrations.river b/converter/internal/staticconvert/testdata/integrations.river
@@ -331,6 +331,11 @@ discovery.relabel "integrations_mongodb_exporter" {
 		target_label  = "mongodb_cluster"
 		replacement   = "prod-cluster"
 	}
+
+	rule {
+		target_label = "instance"
+		replacement  = "instance-key-value"
+	}
 }
 
 prometheus.scrape "integrations_mongodb_exporter" {
@@ -349,8 +354,17 @@ prometheus.exporter.mssql "integrations_mssql" {
 	connection_string = "sqlserver://<USERNAME>:<PASSWORD>@<HOST>:<PORT>"
 }
 
+discovery.relabel "integrations_mssql" {
+	targets = prometheus.exporter.mssql.integrations_mssql.targets
+
+	rule {
+		target_label = "instance"
+		replacement  = "instance-key-value"
+	}
+}
+
 prometheus.scrape "integrations_mssql" {
-	targets    = prometheus.exporter.mssql.integrations_mssql.targets
+	targets    = discovery.relabel.integrations_mssql.output
 	forward_to = [prometheus.remote_write.integrations.receiver]
 	job_name   = "integrations/mssql"
 

diff --git a/converter/internal/staticconvert/testdata/integrations.yaml b/converter/internal/staticconvert/testdata/integrations.yaml
@@ -107,6 +107,7 @@ integrations:
   mongodb_exporter:
     enabled: true
     mongodb_uri: mongodb://mongodb-a:27017
+    instance: 'instance-key-value'
     relabel_configs:
     - source_labels: [__address__]
       target_label: service_name
@@ -116,6 +117,7 @@ integrations:
       replacement: 'prod-cluster'
   mssql:
     enabled: true
+    instance: 'instance-key-value'
     connection_string: sqlserver://<USERNAME>:<PASSWORD>@<HOST>:<PORT>
   mysqld_exporter:
     enabled: true