Prep release for 0.39.2 (#6281)

* fix for errors sending to amp (#6272) * Add an error diag to the converter from static to flow when `scrape_i… (#6270) * Add an error diag to the converter from static to flow when `scrape_integration` is set to true but no remote_write is defined. Signed-off-by: erikbaranowski <[email protected]> --------- Signed-off-by: erikbaranowski <[email protected]> * changelog * update version in code --------- Signed-off-by: erikbaranowski <[email protected]> Co-authored-by: Erik Baranowski <[email protected]>
grafana · Jan 31, 2024 · deae3f8 · deae3f8
1 parent 08ded95
commit deae3f8
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,16 @@ This document contains a historical list of changes between releases. Only
 changes that impact end-user behavior are listed; changes to documentation or
 internal API changes are not present.
 
+v0.39.2 (2024-1-31)
+--------------------
+
+### Bugfixes
+
+- Fix error introduced in v0.39.0 preventing remote write to Amazon Managed Prometheus. (@captncraig)
+
+- An error will be returned in the converter from Static to Flow when `scrape_integration` is set
+  to `true` but no `remote_write` is defined. (@erikbaranowski)
+
 v0.39.1 (2024-01-19)
 --------------------
 
@@ -3731,4 +3741,4 @@ v0.1.0 (2020-03-16)
   presence of a `host_filter` flag within the Agent configuration file.
 
 [upgrade guide]: https://grafana.com/docs/agent/latest/upgrade-guide/
-[contributors guide]: ./docs/developer/contributing.md#updating-the-changelog
+[contributors guide]: ./docs/developer/contributing.md#updating-the-changelog
diff --git a/converter/internal/staticconvert/internal/build/builder.go b/converter/internal/staticconvert/internal/build/builder.go
@@ -204,6 +204,10 @@ func (b *IntegrationsConfigBuilder) appendExporter(commonConfig *int_config.Comm
 		RemoteWriteConfigs: b.cfg.Integrations.ConfigV1.PrometheusRemoteWrite,
 	}
 
+	if len(b.cfg.Integrations.ConfigV1.PrometheusRemoteWrite) == 0 {
+		b.diags.Add(diag.SeverityLevelError, "The converter does not support handling integrations which are not connected to a remote_write.")
+	}
+
 	jobNameToCompLabelsFunc := func(jobName string) string {
 		return b.jobNameToCompLabel(jobName)
 	}

diff --git a/converter/internal/staticconvert/testdata/integrations_no_rw.diags b/converter/internal/staticconvert/testdata/integrations_no_rw.diags
@@ -0,0 +1,2 @@
+(Error) The converter does not support handling integrations which are not connected to a remote_write.
+(Warning) Please review your agent command line flags and ensure they are set in your Flow mode config file where necessary.
diff --git a/converter/internal/staticconvert/testdata/integrations_no_rw.yaml b/converter/internal/staticconvert/testdata/integrations_no_rw.yaml
@@ -0,0 +1,4 @@
+integrations:
+  node_exporter:
+    scrape_integration: true
+    enabled: true
diff --git a/docs/sources/_index.md b/docs/sources/_index.md
@@ -9,7 +9,7 @@ title: Grafana Agent
 description: Grafana Agent is a flexible, performant, vendor-neutral, telemetry collector
 weight: 350
 cascade:
-  AGENT_RELEASE: v0.39.1
+  AGENT_RELEASE: v0.39.2
   OTEL_VERSION: v0.87.0
 ---
 

diff --git a/go.mod b/go.mod
@@ -685,9 +685,10 @@ replace (
 //
 // * There is a release of Prometheus which contains
 // prometheus/prometheus#13002
+// and prometheus/prometheus#13497
 // We use the last v1-related tag as the replace statement does not work for v2
 // tags without the v2 suffix to the module root.
-replace github.com/prometheus/prometheus => github.com/grafana/prometheus v1.8.2-0.20240105105355-3e2c486167d2 // grafana/prometheus@drop-old-inmemory-samples-squashed-2
+replace github.com/prometheus/prometheus => github.com/grafana/prometheus v1.8.2-0.20240130142130-51b39f24d406 // cmp_header_order branch
 
 replace gopkg.in/yaml.v2 => github.com/rfratto/go-yaml v0.0.0-20211119180816-77389c3526dc
 

diff --git a/go.sum b/go.sum
@@ -1078,8 +1078,8 @@ github.com/grafana/opentelemetry-collector/service v0.0.0-20231018134914-c0109e0
 github.com/grafana/opentelemetry-collector/service v0.0.0-20231018134914-c0109e052230/go.mod h1:kBdpzrqR2wJkOdg50yzp4dv+2XBMyeqTgF4lCx0hSpQ=
 github.com/grafana/postgres_exporter v0.8.1-0.20210722175051-db35d7c2f520 h1:HnFWqxhoSF3WC7sKAdMZ+SRXvHLVZlZ3sbQjuUlTqkw=
 github.com/grafana/postgres_exporter v0.8.1-0.20210722175051-db35d7c2f520/go.mod h1:+HPXgiOV0InDHcZ2jNijL1SOKvo0eEPege5fQA0+ICI=
-github.com/grafana/prometheus v1.8.2-0.20240105105355-3e2c486167d2 h1:eJD8U9G91ID/pKsLjJnjqve8yv1NiE/l6dGYnwchPVM=
-github.com/grafana/prometheus v1.8.2-0.20240105105355-3e2c486167d2/go.mod h1:SRw624aMAxTfryAcP8rOjg4S/sHHaetx2lyJJ2nM83g=
+github.com/grafana/prometheus v1.8.2-0.20240130142130-51b39f24d406 h1:LVIOYe5j92m10wluP5hgeHqSkOLnZzcPxhYCkdbLXCE=
+github.com/grafana/prometheus v1.8.2-0.20240130142130-51b39f24d406/go.mod h1:SRw624aMAxTfryAcP8rOjg4S/sHHaetx2lyJJ2nM83g=
 github.com/grafana/pyroscope-go/godeltaprof v0.1.3 h1:eunWpv1B3Z7ZK9o4499EmQGlY+CsDmSZ4FbxjRx37uk=
 github.com/grafana/pyroscope-go/godeltaprof v0.1.3/go.mod h1:1HSPtjU8vLG0jE9JrTdzjgFqdJ/VgN7fvxBNq3luJko=
 github.com/grafana/pyroscope/api v0.2.0 h1:TzOxL0s6SiaLEy944ZAKgHcx/JDRJXu4O8ObwkqR6p4=

diff --git a/pkg/operator/defaults.go b/pkg/operator/defaults.go
@@ -2,7 +2,7 @@ package operator
 
 // Supported versions of the Grafana Agent.
 var (
-	DefaultAgentVersion   = "v0.39.1"
+	DefaultAgentVersion   = "v0.39.2"
 	DefaultAgentBaseImage = "grafana/agent"
 	DefaultAgentImage     = DefaultAgentBaseImage + ":" + DefaultAgentVersion
 )

diff --git a/tools/gen-versioned-files/agent-version.txt b/tools/gen-versioned-files/agent-version.txt
@@ -1 +1 @@
-v0.39.1
+v0.39.2