From bfed76b15dada60c65ce5f65f8d3e61d07d90f36 Mon Sep 17 00:00:00 2001 From: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com> Date: Wed, 22 May 2024 13:09:21 -0400 Subject: [PATCH 1/2] prep for v0.41.0-rc.1 on main Signed-off-by: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com> --- CHANGELOG.md | 3 +++ docs/sources/_index.md | 2 +- docs/sources/flow/release-notes.md | 4 ++++ go.sum | 2 -- static/operator/defaults.go | 2 +- tools/gen-versioned-files/agent-version.txt | 2 +- 6 files changed, 10 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7ea545a3531d..c159f1b10ee8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,9 @@ internal API changes are not present. Main (unreleased) ----------------- +v0.41.0-rc.1 (2024-05-22) +------------------------- + ### Breaking changes - The default listen port for `otelcol.receiver.opencensus` has changed from diff --git a/docs/sources/_index.md b/docs/sources/_index.md index 3974801b5aef..04f9c918ed19 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.5 + AGENT_RELEASE: v0.41.0-rc.1 OTEL_VERSION: v0.96.0 refs: variants: diff --git a/docs/sources/flow/release-notes.md b/docs/sources/flow/release-notes.md index b5e311127a57..e01a37736d97 100644 --- a/docs/sources/flow/release-notes.md +++ b/docs/sources/flow/release-notes.md @@ -36,6 +36,10 @@ Other release notes for the different {{< param "PRODUCT_ROOT_NAME" >}} variants The default listen port for `otelcol.receiver.opencensus` has changed from 4317 to 55678 to align with the upstream defaults. To retain the previous listen port, explicitly set the `endpoint` argument to `0.0.0.0:4317` before upgrading. +### Breaking change: default `mimir.rules.kubernetes` sync interval changed + +The default sync interval for `mimir.rules.kubernetes` has changed from `30s` to `5m` to reduce load on Mimir. + ## v0.40 ### Breaking change: Prohibit the configuration of services within modules. diff --git a/go.sum b/go.sum index e000d9c1cec0..58076ea2f25a 100644 --- a/go.sum +++ b/go.sum @@ -1043,8 +1043,6 @@ github.com/grafana/jsonparser v0.0.0-20240209175146-098958973a2d h1:YwbJJ/PrVWVd github.com/grafana/jsonparser v0.0.0-20240209175146-098958973a2d/go.mod h1:796sq+UcONnSlzA3RtlBZ+b/hrerkZXiEmO8oMjyRwY= github.com/grafana/kafka_exporter v0.0.0-20240409084445-5e3488ad9f9a h1:jqM4NNdx8LSquKo8bPx+XWn91S2b+sgNvEcFfSJQtHY= github.com/grafana/kafka_exporter v0.0.0-20240409084445-5e3488ad9f9a/go.mod h1:ZXGGyeTUMenf/H1CDBK9lv3azjswfa0nVzLoQAYmnDc= -github.com/grafana/loki v1.6.2-0.20240221085104-f9d188620153 h1:C191g5Ls8lIf9lkJEoScTQgoVDwUdK4HXKP5XtL+zAM= -github.com/grafana/loki v1.6.2-0.20240221085104-f9d188620153/go.mod h1:j2XCl3SmslPf+3Vs7uyoaJE/QkmUlL9JzTBTShSOSiU= github.com/grafana/loki v1.6.2-0.20240510183741-cef4c2826b4b h1:x5JsSnExxRl9kTMNqHebMCv0fn+V1+T16z7Tgz6xYf4= github.com/grafana/loki v1.6.2-0.20240510183741-cef4c2826b4b/go.mod h1:j2XCl3SmslPf+3Vs7uyoaJE/QkmUlL9JzTBTShSOSiU= github.com/grafana/loki/pkg/push v0.0.0-20231212100434-384e5c2dc872 h1:6kPX7bngjBgUlHqADwZ6249UtzMaoQW5n0H8bOtnYeM= diff --git a/static/operator/defaults.go b/static/operator/defaults.go index 30ecbc4f2044..25f5739fbf86 100644 --- a/static/operator/defaults.go +++ b/static/operator/defaults.go @@ -2,7 +2,7 @@ package operator // Supported versions of the Grafana Agent. var ( - DefaultAgentVersion = "v0.40.5" + DefaultAgentVersion = "v0.41.0-rc.1" 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 6a9c7cb0af27..7861b5387129 100644 --- a/tools/gen-versioned-files/agent-version.txt +++ b/tools/gen-versioned-files/agent-version.txt @@ -1 +1 @@ -v0.40.5 +v0.41.0-rc.1 From a458b1dd59eb3c78e9013faf85768efe8babe88f Mon Sep 17 00:00:00 2001 From: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com> Date: Fri, 31 May 2024 10:49:45 -0400 Subject: [PATCH 2/2] set for v0.41.0 skipping rc Signed-off-by: erikbaranowski <39704712+erikbaranowski@users.noreply.github.com> --- CHANGELOG.md | 4 ++-- docs/sources/_index.md | 2 +- static/operator/defaults.go | 2 +- tools/gen-versioned-files/agent-version.txt | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d11d868deb31..97baa5276cf0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,8 +10,8 @@ internal API changes are not present. Main (unreleased) ----------------- -v0.41.0-rc.1 (2024-05-22) -------------------------- +v0.41.0 (2024-05-31) +-------------------- ### Breaking changes diff --git a/docs/sources/_index.md b/docs/sources/_index.md index 04f9c918ed19..c61ff7984856 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.41.0-rc.1 + AGENT_RELEASE: v0.41.0 OTEL_VERSION: v0.96.0 refs: variants: diff --git a/static/operator/defaults.go b/static/operator/defaults.go index 25f5739fbf86..40be995cdd55 100644 --- a/static/operator/defaults.go +++ b/static/operator/defaults.go @@ -2,7 +2,7 @@ package operator // Supported versions of the Grafana Agent. var ( - DefaultAgentVersion = "v0.41.0-rc.1" + DefaultAgentVersion = "v0.41.0" 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 7861b5387129..9dedf1e9be1c 100644 --- a/tools/gen-versioned-files/agent-version.txt +++ b/tools/gen-versioned-files/agent-version.txt @@ -1 +1 @@ -v0.41.0-rc.1 +v0.41.0