From ed541483b8736af8b9af3e904bc960811447c4fe Mon Sep 17 00:00:00 2001
From: Robert Fratto <robertfratto@gmail.com>
Date: Tue, 5 Mar 2024 13:52:21 -0500
Subject: [PATCH] prepare for 0.40.2 release (#6619)

---
 CHANGELOG.md                                | 7 +++++++
 docs/sources/_index.md                      | 2 +-
 internal/static/operator/defaults.go        | 2 +-
 tools/gen-versioned-files/agent-version.txt | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 827be4fa105c..7f9c0e92f1ae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,9 @@ Main (unreleased)
 
 - A new `loki.rules.kubernetes` component that discovers `PrometheusRule` Kubernetes resources and loads them into a Loki Ruler instance. (@EStork09)
 
+v0.40.2 (2024-03-05)
+--------------------
+
 ### Bugfixes
 
 - Set permissions on the `Grafana Agent [Flow]` folder when installing via the
@@ -29,6 +32,10 @@ Main (unreleased)
 - Fix a duplicate metrics registration panic when recreating static
   mode metric instance's write handler. (@rfratto, @hainenber)
 
+### Other changes
+
+- Change the Docker base image for Linux containers to `public.ecr.aws/ubuntu/ubuntu:mantic`. (@hainenber)
+
 v0.40.1 (2024-02-27)
 --------------------
 
diff --git a/docs/sources/_index.md b/docs/sources/_index.md
index 556ea167a769..6300bb5df2db 100644
--- 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.40.1
+  AGENT_RELEASE: v0.40.2
   OTEL_VERSION: v0.87.0
 ---
 
diff --git a/internal/static/operator/defaults.go b/internal/static/operator/defaults.go
index e985937bb348..52005e52976a 100644
--- a/internal/static/operator/defaults.go
+++ b/internal/static/operator/defaults.go
@@ -2,7 +2,7 @@ package operator
 
 // Supported versions of the Grafana Agent.
 var (
-	DefaultAgentVersion   = "v0.40.1"
+	DefaultAgentVersion   = "v0.40.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
index 01437515a7c3..1e24a0583af0 100644
--- a/tools/gen-versioned-files/agent-version.txt
+++ b/tools/gen-versioned-files/agent-version.txt
@@ -1 +1 @@
-v0.40.1
+v0.40.2