From 30e605bf60cdbbff810eea42cd621e0df129c51a Mon Sep 17 00:00:00 2001 From: Mischa Thompson Date: Fri, 21 Apr 2023 13:01:29 -0700 Subject: [PATCH] Update v0.33.0 rc.1 refs (#3594) (#3595) * Update CHANGELOG with new header * Bump v0.33.0-rc.0 -> v0.33.0-rc.1 --- CHANGELOG.md | 8 ++++++++ docs/sources/operator/deploy-agent-operator-resources.md | 4 ++-- docs/sources/operator/getting-started.md | 2 +- .../configuration/integrations/node-exporter-config.md | 4 ++-- .../configuration/integrations/process-exporter-config.md | 4 ++-- docs/sources/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 +- production/kubernetes/build/lib/version.libsonnet | 2 +- .../kubernetes/build/templates/operator/main.jsonnet | 4 ++-- production/kubernetes/install-bare.sh | 2 +- production/operator/templates/agent-operator.yaml | 4 ++-- production/tanka/grafana-agent/v1/main.libsonnet | 4 ++-- production/tanka/grafana-agent/v2/internal/base.libsonnet | 4 ++-- .../tanka/grafana-agent/v2/internal/syncer.libsonnet | 2 +- 17 files changed, 32 insertions(+), 24 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 52f55c749e8c..a7b2ee4a34fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,14 @@ changes that impact end-user behavior are listed; changes to documentation or internal API changes are not present. +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) ------------------------- diff --git a/docs/sources/operator/deploy-agent-operator-resources.md b/docs/sources/operator/deploy-agent-operator-resources.md index 96b0ef5d97a6..47f3c0a9d05b 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.0 + image: grafana/agent:v0.33.0-rc.1 integrations: selector: matchLabels: agent: grafana-agent-integrations - image: grafana/agent:v0.33.0-rc.0 + image: grafana/agent:v0.33.0-rc.1 logLevel: info serviceAccountName: grafana-agent metrics: diff --git a/docs/sources/operator/getting-started.md b/docs/sources/operator/getting-started.md index 299739353e35..0767a6bf6ac2 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.0 + image: grafana/agent-operator:v0.33.0-rc.1 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 9b27e5696217..8bd31e5af682 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.0 \ + grafana/agent:v0.33.0-rc.1 \ --config.file=/etc/agent-config/agent.yaml ``` @@ -67,7 +67,7 @@ metadata: name: agent spec: containers: - - image: grafana/agent:v0.33.0-rc.0 + - image: grafana/agent:v0.33.0-rc.1 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 fcc2e894cf65..db7049039c79 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.0 \ + grafana/agent:v0.33.0-rc.1 \ --config.file=/etc/agent-config/agent.yaml ``` @@ -37,7 +37,7 @@ metadata: name: agent spec: containers: - - image: grafana/agent:v0.33.0-rc.0 + - image: grafana/agent:v0.33.0-rc.1 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 4a4ea2071fa3..6c7c8c8fc64c 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.0 + grafana/agent:v0.33.0-rc.1 ``` 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.0-windows + grafana/agent:v0.33.0-rc.1-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 4179f6799c77..70d8dc02be96 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.0" + DefaultAgentVersion = "v0.33.0-rc.1" DefaultAgentBaseImage = "grafana/agent" DefaultAgentImage = DefaultAgentBaseImage + ":" + DefaultAgentVersion ) diff --git a/production/kubernetes/agent-bare.yaml b/production/kubernetes/agent-bare.yaml index 66477051a9bb..cc8f7946ce03 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.0 + image: grafana/agent:v0.33.0-rc.1 imagePullPolicy: IfNotPresent name: grafana-agent ports: diff --git a/production/kubernetes/agent-loki.yaml b/production/kubernetes/agent-loki.yaml index 0a4a7e552bc1..e4d9c041c02f 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.0 + image: grafana/agent:v0.33.0-rc.1 imagePullPolicy: IfNotPresent name: grafana-agent-logs ports: diff --git a/production/kubernetes/agent-traces.yaml b/production/kubernetes/agent-traces.yaml index 60d6ba4c74e5..2eb67d5ca9ff 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.0 + image: grafana/agent:v0.33.0-rc.1 imagePullPolicy: IfNotPresent name: grafana-agent-traces ports: diff --git a/production/kubernetes/build/lib/version.libsonnet b/production/kubernetes/build/lib/version.libsonnet index 4748c19d4dc8..856666106012 100644 --- a/production/kubernetes/build/lib/version.libsonnet +++ b/production/kubernetes/build/lib/version.libsonnet @@ -1 +1 @@ -'grafana/agent:v0.33.0-rc.0' +'grafana/agent:v0.33.0-rc.1' diff --git a/production/kubernetes/build/templates/operator/main.jsonnet b/production/kubernetes/build/templates/operator/main.jsonnet index 2aea4f91ec49..34bbb6ef5ec3 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.0', - agent_operator: 'grafana/agent-operator:v0.33.0-rc.0', + agent: 'grafana/agent:v0.33.0-rc.1', + agent_operator: 'grafana/agent-operator:v0.33.0-rc.1', 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 d0e7ed53d954..73883c9243fa 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.0 +MANIFEST_BRANCH=v0.33.0-rc.1 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 65203643be33..d011ee2d9d23 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.0 + image: grafana/agent-operator:v0.33.0-rc.1 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.0 + image: grafana/agent:v0.33.0-rc.1 integrations: selector: matchLabels: diff --git a/production/tanka/grafana-agent/v1/main.libsonnet b/production/tanka/grafana-agent/v1/main.libsonnet index 9b8b56db04a1..a17aebfd8239 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.0', - agentctl: 'grafana/agentctl:v0.33.0-rc.0', + agent: 'grafana/agent:v0.33.0-rc.1', + agentctl: 'grafana/agentctl:v0.33.0-rc.1', }, // 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 30cc1ba8696a..d4c92185e3f4 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.0', - agentctl: 'grafana/agentctl:v0.33.0-rc.0', + agent: 'grafana/agent:v0.33.0-rc.1', + agentctl: 'grafana/agentctl:v0.33.0-rc.1', }, _config:: { name: name, diff --git a/production/tanka/grafana-agent/v2/internal/syncer.libsonnet b/production/tanka/grafana-agent/v2/internal/syncer.libsonnet index 0d18be6b768c..5b535370404c 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.0', + image: 'grafana/agentctl:v0.33.0-rc.1', schedule: '*/5 * * * *', configs: [], } + config,