From d25614ee52578ac5a0dc0c6d31c45ee97263843a Mon Sep 17 00:00:00 2001 From: Mischa Thompson Date: Tue, 25 Apr 2023 10:16:40 -0700 Subject: [PATCH] Update v0.33 release branch with version changes (#3635) * Update v0.33 stable release refs (#3634) * Update CHANGELOG Removes RC candidate sections and moves any necessary changes to the stable release section. Some changes were ommitted as they were introduced and fixed/removed within the release cycle. * Update code references v0.33.0-rc.2 -> v0.33.0 (cherry picked from commit f77adb374a9022719f703debbf89d7b5a87e2a80) * Remove unreleased items from CHANGELOG --- CHANGELOG.md | 21 +++---------------- .../deploy-agent-operator-resources.md | 4 ++-- docs/sources/operator/getting-started.md | 2 +- .../integrations/node-exporter-config.md | 4 ++-- .../integrations/process-exporter-config.md | 4 ++-- .../static/set-up/install-agent-docker.md | 4 ++-- pkg/operator/defaults.go | 2 +- production/kubernetes/agent-bare.yaml | 2 +- production/kubernetes/agent-loki.yaml | 2 +- production/kubernetes/agent-traces.yaml | 2 +- .../kubernetes/build/lib/version.libsonnet | 2 +- .../build/templates/operator/main.jsonnet | 4 ++-- production/kubernetes/install-bare.sh | 2 +- .../operator/templates/agent-operator.yaml | 4 ++-- .../tanka/grafana-agent/v1/main.libsonnet | 4 ++-- .../grafana-agent/v2/internal/base.libsonnet | 4 ++-- .../v2/internal/syncer.libsonnet | 2 +- 17 files changed, 27 insertions(+), 42 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 49abe6d7ca72..b2ff65d8c6d4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,23 +7,9 @@ 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.33.0-rc.2 (2023-04-24) -------------------------- -### Bugfixes - -- Fix bug where `loki.source.docker` always failed to start. (@rfratto) - -v0.33.0-rc.1 (2023-04-21) -------------------------- -### Bugfixes -- Fix bug introduced to operator when FilterRunning not specified in PodMonitors. (@captncraig) - -- Remove `otelcol.processor.attributes`. (@ptodev) - - -v0.33.0-rc.0 (2023-04-20) -------------------------- +v0.33.0 (2023-04-25) +-------------------- ### Breaking changes @@ -71,8 +57,6 @@ v0.33.0-rc.0 (2023-04-20) - `otelcol.auth.sigv4` performs AWS Signature Version 4 (SigV4) authentication for making requests to AWS services via `otelcol` components that support authentication extensions. (@ptodev) - - `otelcol.processor.attributes` accepts telemetry data from other `otelcol` - components and modifies attributes of a span, log, or metric. (@ptodev) - `prometheus.exporter.blackbox` collects metrics from Blackbox exporter. (@marctc) - `prometheus.exporter.mysql` collects metrics from a MySQL database. (@spartan0x117) - `prometheus.exporter.postgres` collects metrics from a PostgreSQL database. (@spartan0x117) @@ -203,6 +187,7 @@ v0.33.0-rc.0 (2023-04-20) - Fixes a bug where the github exporter would get stuck in an infinite loop under certain conditions. (@jcreixell) +- Fix bug where `loki.source.docker` always failed to start. (@rfratto) ### Other changes diff --git a/docs/sources/operator/deploy-agent-operator-resources.md b/docs/sources/operator/deploy-agent-operator-resources.md index 7fe31213e72a..03b97e5299a9 100644 --- a/docs/sources/operator/deploy-agent-operator-resources.md +++ b/docs/sources/operator/deploy-agent-operator-resources.md @@ -53,12 +53,12 @@ To deploy the `GrafanaAgent` resource: labels: app: grafana-agent spec: - image: grafana/agent:v0.33.0-rc.2 + image: grafana/agent:v0.33.0 integrations: selector: matchLabels: agent: grafana-agent-integrations - image: grafana/agent:v0.33.0-rc.2 + image: grafana/agent:v0.33.0 logLevel: info serviceAccountName: grafana-agent metrics: diff --git a/docs/sources/operator/getting-started.md b/docs/sources/operator/getting-started.md index e05f2f7cd695..1894ffb0b153 100644 --- a/docs/sources/operator/getting-started.md +++ b/docs/sources/operator/getting-started.md @@ -73,7 +73,7 @@ To install Agent Operator: serviceAccountName: grafana-agent-operator containers: - name: operator - image: grafana/agent-operator:v0.33.0-rc.2 + image: grafana/agent-operator:v0.33.0 args: - --kubelet-service=default/kubelet --- diff --git a/docs/sources/static/configuration/integrations/node-exporter-config.md b/docs/sources/static/configuration/integrations/node-exporter-config.md index 895d4c05a80f..3249546323df 100644 --- a/docs/sources/static/configuration/integrations/node-exporter-config.md +++ b/docs/sources/static/configuration/integrations/node-exporter-config.md @@ -28,7 +28,7 @@ docker run \ -v "/proc:/host/proc:ro,rslave" \ -v /tmp/agent:/etc/agent \ -v /path/to/config.yaml:/etc/agent-config/agent.yaml \ - grafana/agent:v0.33.0-rc.2 \ + grafana/agent:v0.33.0 \ --config.file=/etc/agent-config/agent.yaml ``` @@ -67,7 +67,7 @@ metadata: name: agent spec: containers: - - image: grafana/agent:v0.33.0-rc.2 + - image: grafana/agent:v0.33.0 name: agent args: - --config.file=/etc/agent-config/agent.yaml diff --git a/docs/sources/static/configuration/integrations/process-exporter-config.md b/docs/sources/static/configuration/integrations/process-exporter-config.md index 501596a47727..eba20fd32f74 100644 --- a/docs/sources/static/configuration/integrations/process-exporter-config.md +++ b/docs/sources/static/configuration/integrations/process-exporter-config.md @@ -20,7 +20,7 @@ docker run \ -v "/proc:/proc:ro" \ -v /tmp/agent:/etc/agent \ -v /path/to/config.yaml:/etc/agent-config/agent.yaml \ - grafana/agent:v0.33.0-rc.2 \ + grafana/agent:v0.33.0 \ --config.file=/etc/agent-config/agent.yaml ``` @@ -37,7 +37,7 @@ metadata: name: agent spec: containers: - - image: grafana/agent:v0.33.0-rc.2 + - image: grafana/agent:v0.33.0 name: agent args: - --config.file=/etc/agent-config/agent.yaml diff --git a/docs/sources/static/set-up/install-agent-docker.md b/docs/sources/static/set-up/install-agent-docker.md index 390bdcd24794..a100609c0a11 100644 --- a/docs/sources/static/set-up/install-agent-docker.md +++ b/docs/sources/static/set-up/install-agent-docker.md @@ -21,7 +21,7 @@ Install Grafana Agent and get it up and running on Docker. docker run \ -v /tmp/agent:/etc/agent/data \ -v /path/to/config.yaml:/etc/agent/agent.yaml \ - grafana/agent:v0.33.0-rc.2 + grafana/agent:v0.33.0 ``` 2. Replace `/tmp/agent` with the folder you want to store WAL data in. @@ -40,7 +40,7 @@ container through a bind mount for the flags to work properly. docker run ^ -v c:\grafana-agent-data:c:\etc\grafana-agent\data ^ -v c:\workspace\config\grafana-agent:c:\etc\grafana-agent ^ - grafana/agent:v0.33.0-rc.2-windows + grafana/agent:v0.33.0-windows ``` 2. Replace `c:\grafana-agent-data` with the folder you want to store WAL data in. diff --git a/pkg/operator/defaults.go b/pkg/operator/defaults.go index b722791a48eb..60283568c0b2 100644 --- 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.33.0-rc.2" + DefaultAgentVersion = "v0.33.0" DefaultAgentBaseImage = "grafana/agent" DefaultAgentImage = DefaultAgentBaseImage + ":" + DefaultAgentVersion ) diff --git a/production/kubernetes/agent-bare.yaml b/production/kubernetes/agent-bare.yaml index dd29fb1423c0..08f047dc1a63 100644 --- a/production/kubernetes/agent-bare.yaml +++ b/production/kubernetes/agent-bare.yaml @@ -83,7 +83,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: grafana/agent:v0.33.0-rc.2 + image: grafana/agent:v0.33.0 imagePullPolicy: IfNotPresent name: grafana-agent ports: diff --git a/production/kubernetes/agent-loki.yaml b/production/kubernetes/agent-loki.yaml index 733304440d41..880a997cd515 100644 --- a/production/kubernetes/agent-loki.yaml +++ b/production/kubernetes/agent-loki.yaml @@ -65,7 +65,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: grafana/agent:v0.33.0-rc.2 + image: grafana/agent:v0.33.0 imagePullPolicy: IfNotPresent name: grafana-agent-logs ports: diff --git a/production/kubernetes/agent-traces.yaml b/production/kubernetes/agent-traces.yaml index 208adbed7253..44b9f1512e91 100644 --- a/production/kubernetes/agent-traces.yaml +++ b/production/kubernetes/agent-traces.yaml @@ -114,7 +114,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: grafana/agent:v0.33.0-rc.2 + image: grafana/agent:v0.33.0 imagePullPolicy: IfNotPresent name: grafana-agent-traces ports: diff --git a/production/kubernetes/build/lib/version.libsonnet b/production/kubernetes/build/lib/version.libsonnet index 6b274b9e5cb4..9c3ecfa317f9 100644 --- a/production/kubernetes/build/lib/version.libsonnet +++ b/production/kubernetes/build/lib/version.libsonnet @@ -1 +1 @@ -'grafana/agent:v0.33.0-rc.2' +'grafana/agent:v0.33.0' diff --git a/production/kubernetes/build/templates/operator/main.jsonnet b/production/kubernetes/build/templates/operator/main.jsonnet index a2f238d1f052..723719a8522d 100644 --- a/production/kubernetes/build/templates/operator/main.jsonnet +++ b/production/kubernetes/build/templates/operator/main.jsonnet @@ -23,8 +23,8 @@ local ksm = import 'kube-state-metrics/kube-state-metrics.libsonnet'; local this = self, _images:: { - agent: 'grafana/agent:v0.33.0-rc.2', - agent_operator: 'grafana/agent-operator:v0.33.0-rc.2', + agent: 'grafana/agent:v0.33.0', + agent_operator: 'grafana/agent-operator:v0.33.0', ksm: 'registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.5.0', }, diff --git a/production/kubernetes/install-bare.sh b/production/kubernetes/install-bare.sh index 021114d1d1da..085ad1a2ac5b 100644 --- a/production/kubernetes/install-bare.sh +++ b/production/kubernetes/install-bare.sh @@ -25,7 +25,7 @@ check_installed() { check_installed curl check_installed envsubst -MANIFEST_BRANCH=v0.33.0-rc.2 +MANIFEST_BRANCH=v0.33.0 MANIFEST_URL=${MANIFEST_URL:-https://raw.githubusercontent.com/grafana/agent/${MANIFEST_BRANCH}/production/kubernetes/agent-bare.yaml} NAMESPACE=${NAMESPACE:-default} diff --git a/production/operator/templates/agent-operator.yaml b/production/operator/templates/agent-operator.yaml index ee193489fc0c..5885bc8e64f4 100644 --- a/production/operator/templates/agent-operator.yaml +++ b/production/operator/templates/agent-operator.yaml @@ -372,7 +372,7 @@ spec: containers: - args: - --kubelet-service=default/kubelet - image: grafana/agent-operator:v0.33.0-rc.2 + image: grafana/agent-operator:v0.33.0 imagePullPolicy: IfNotPresent name: grafana-agent-operator serviceAccount: grafana-agent-operator @@ -436,7 +436,7 @@ metadata: name: grafana-agent namespace: ${NAMESPACE} spec: - image: grafana/agent:v0.33.0-rc.2 + image: grafana/agent:v0.33.0 integrations: selector: matchLabels: diff --git a/production/tanka/grafana-agent/v1/main.libsonnet b/production/tanka/grafana-agent/v1/main.libsonnet index d62a26757b23..1d51e4c8e304 100644 --- a/production/tanka/grafana-agent/v1/main.libsonnet +++ b/production/tanka/grafana-agent/v1/main.libsonnet @@ -15,8 +15,8 @@ local service = k.core.v1.service; (import './lib/traces.libsonnet') + { _images:: { - agent: 'grafana/agent:v0.33.0-rc.2', - agentctl: 'grafana/agentctl:v0.33.0-rc.2', + agent: 'grafana/agent:v0.33.0', + agentctl: 'grafana/agentctl:v0.33.0', }, // new creates a new DaemonSet deployment of the grafana-agent. By default, diff --git a/production/tanka/grafana-agent/v2/internal/base.libsonnet b/production/tanka/grafana-agent/v2/internal/base.libsonnet index 6eba47ae66f7..b052e4c4fa4d 100644 --- a/production/tanka/grafana-agent/v2/internal/base.libsonnet +++ b/production/tanka/grafana-agent/v2/internal/base.libsonnet @@ -11,8 +11,8 @@ function(name='grafana-agent', namespace='') { local this = self, _images:: { - agent: 'grafana/agent:v0.33.0-rc.2', - agentctl: 'grafana/agentctl:v0.33.0-rc.2', + agent: 'grafana/agent:v0.33.0', + agentctl: 'grafana/agentctl:v0.33.0', }, _config:: { name: name, diff --git a/production/tanka/grafana-agent/v2/internal/syncer.libsonnet b/production/tanka/grafana-agent/v2/internal/syncer.libsonnet index 1a7c82f17cda..44787f1102e6 100644 --- a/production/tanka/grafana-agent/v2/internal/syncer.libsonnet +++ b/production/tanka/grafana-agent/v2/internal/syncer.libsonnet @@ -14,7 +14,7 @@ function( ) { local _config = { api: error 'api must be set', - image: 'grafana/agentctl:v0.33.0-rc.2', + image: 'grafana/agentctl:v0.33.0', schedule: '*/5 * * * *', configs: [], } + config,