diff --git a/CHANGELOG.md b/CHANGELOG.md index f5b006ea0998..f52c8555ee91 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -62,6 +62,8 @@ Main (unreleased) ### Bugfixes +- Update to config converter so default relabel `source_labels` are left off the river output. (@erikbaranowski) + - Rename `GrafanaAgentManagement` mixin rules to `GrafanaAgentConfig` and update individual alerts to be more accurate. (@spartan0x117) - Fix potential goroutine leak in log file tailing in static mode. (@thampiotr) diff --git a/converter/internal/prometheusconvert/relabel.go b/converter/internal/prometheusconvert/relabel.go index 3adf79734179..9b9aa2d9abc4 100644 --- a/converter/internal/prometheusconvert/relabel.go +++ b/converter/internal/prometheusconvert/relabel.go @@ -67,9 +67,12 @@ func ToFlowRelabelConfigs(relabelConfigs []*prom_relabel.Config) []*flow_relabel var metricRelabelConfigs []*flow_relabel.Config for _, relabelConfig := range relabelConfigs { - sourceLabels := make([]string, len(relabelConfig.SourceLabels)) - for i, sourceLabel := range relabelConfig.SourceLabels { - sourceLabels[i] = string(sourceLabel) + var sourceLabels []string + if len(relabelConfig.SourceLabels) > 0 { + sourceLabels = make([]string, len(relabelConfig.SourceLabels)) + for i, sourceLabel := range relabelConfig.SourceLabels { + sourceLabels[i] = string(sourceLabel) + } } metricRelabelConfigs = append(metricRelabelConfigs, &flow_relabel.Config{ diff --git a/converter/internal/staticconvert/testdata/integrations.river b/converter/internal/staticconvert/testdata/integrations.river index 1d348ba221d3..61722a0f0da9 100644 --- a/converter/internal/staticconvert/testdata/integrations.river +++ b/converter/internal/staticconvert/testdata/integrations.river @@ -35,9 +35,8 @@ discovery.relabel "integrations_node_exporter" { } rule { - source_labels = [] - target_label = "__address__" - replacement = "localhost:8099" + target_label = "__address__" + replacement = "localhost:8099" } } diff --git a/converter/internal/staticconvert/testdata/prom_scrape.river b/converter/internal/staticconvert/testdata/prom_scrape.river index 8a8de80bc8a9..6041ce444256 100644 --- a/converter/internal/staticconvert/testdata/prom_scrape.river +++ b/converter/internal/staticconvert/testdata/prom_scrape.river @@ -52,9 +52,8 @@ discovery.relabel "metrics_agent_promobee" { } rule { - source_labels = [] - target_label = "__address__" - replacement = "localhost:8099" + target_label = "__address__" + replacement = "localhost:8099" } }