From c76a796d9b7e77ad14215f145e7b067763b76d22 Mon Sep 17 00:00:00 2001 From: Craig Peterson <192540+captncraig@users.noreply.github.com> Date: Thu, 29 Jun 2023 09:53:23 -0400 Subject: [PATCH] changelog and version updates for 0.34.3 (#4277) * changelog and version updates for 0.34.3 * one too many replaces * not helm chart * no 1.20.5 --- CHANGELOG.md | 13 +++++++------ .../operator/deploy-agent-operator-resources.md | 2 +- docs/sources/operator/getting-started.md | 2 +- .../integrations/node-exporter-config.md | 4 ++-- .../integrations/process-exporter-config.md | 4 ++-- docs/sources/static/set-up/install-agent-docker.md | 4 ++-- pkg/operator/defaults.go | 2 +- production/kubernetes/build/lib/version.libsonnet | 2 +- .../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 ++-- .../grafana-agent/v2/internal/syncer.libsonnet | 2 +- 13 files changed, 25 insertions(+), 24 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a1d49ed9bfe..73317d701681 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -68,10 +68,6 @@ Main (unreleased) - Fix oauth default scope in `loki.source.azure_event_hubs`. (@akselleirv) -- Fix panic from improper startup ordering in `prometheus.operator.servicemonitors`. (@captncraig) - -- Fixes a bug in conversion of OpenTelemetry histograms when exported to Prometheus. (@grcevski) - - Fix bug where `otelcol.exporter.otlphttp` ignores configuration for `traces_endpoint`, `metrics_endpoint`, and `logs_endpoint` attributes. (@SimoneFalzone) - Fix issue in `prometheus.remote_write` where the `queue_config` and @@ -83,9 +79,14 @@ Main (unreleased) - Fix issue where flow mode exports labeled as "string or secret" could not be used in a binary operation. (@rfratto) -### Other changes +v0.34.3 (2023-06-27) +-------------------- -- Build with go version 1.20.5 (@captncraig) +### Bugfixes + +- Fixes a bug in conversion of OpenTelemetry histograms when exported to Prometheus. (@grcevski) +- Enforce sha256 digest signing for rpms enabling installation on FIPS-enabled OSes. (@kfriedrich123) +- Fix panic from improper startup ordering in `prometheus.operator.servicemonitors`. (@captncraig) v0.34.2 (2023-06-20) -------------------- diff --git a/docs/sources/operator/deploy-agent-operator-resources.md b/docs/sources/operator/deploy-agent-operator-resources.md index caf9810428cc..064e397243e2 100644 --- a/docs/sources/operator/deploy-agent-operator-resources.md +++ b/docs/sources/operator/deploy-agent-operator-resources.md @@ -53,7 +53,7 @@ To deploy the `GrafanaAgent` resource: labels: app: grafana-agent spec: - image: grafana/agent:v0.34.2 + image: grafana/agent:v0.34.3 integrations: selector: matchLabels: diff --git a/docs/sources/operator/getting-started.md b/docs/sources/operator/getting-started.md index 5a1105da9e7a..427b5fa52a8f 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.34.2 + image: grafana/agent-operator:v0.34.3 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 f2046eaf84cb..257dda290fe9 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.34.2 \ + grafana/agent:v0.34.3 \ --config.file=/etc/agent-config/agent.yaml ``` @@ -67,7 +67,7 @@ metadata: name: agent spec: containers: - - image: grafana/agent:v0.34.2 + - image: grafana/agent:v0.34.3 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 e98d9c35f9a0..3e9141179b26 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.34.2 \ + grafana/agent:v0.34.3 \ --config.file=/etc/agent-config/agent.yaml ``` @@ -37,7 +37,7 @@ metadata: name: agent spec: containers: - - image: grafana/agent:v0.34.2 + - image: grafana/agent:v0.34.3 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 9c23a7739664..347b6e3c36bd 100644 --- a/docs/sources/static/set-up/install-agent-docker.md +++ b/docs/sources/static/set-up/install-agent-docker.md @@ -29,7 +29,7 @@ Grafana Agent is available as a Docker container image on the following platform docker run \ -v WAL_DATA_DIRECTORY:/etc/agent/data \ -v CONFIG_FILE_PATH:/etc/agent/agent.yaml \ - grafana/agent:v0.34.2 + grafana/agent:v0.34.3 ``` - Replace `CONFIG_FILE_PATH` with the configuration file path on your Linux host system. @@ -47,7 +47,7 @@ Grafana Agent is available as a Docker container image on the following platform docker run ^ -v WAL_DATA_DIRECTORY:c:\etc\grafana-agent\data ^ -v CONFIG_FILE_PATH:c:\etc\grafana-agent ^ - grafana/agent:v0.34.2-windows + grafana/agent:v0.34.3-windows ``` - Replace `CONFIG_FILE_PATH` with the configuration file path on your Windows host system. diff --git a/pkg/operator/defaults.go b/pkg/operator/defaults.go index 326190e7b7dd..fc66bdf8c3b7 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.34.2" + DefaultAgentVersion = "v0.34.3" DefaultAgentBaseImage = "grafana/agent" DefaultAgentImage = DefaultAgentBaseImage + ":" + DefaultAgentVersion ) diff --git a/production/kubernetes/build/lib/version.libsonnet b/production/kubernetes/build/lib/version.libsonnet index 50e64d7536ce..d0648c870ec8 100644 --- a/production/kubernetes/build/lib/version.libsonnet +++ b/production/kubernetes/build/lib/version.libsonnet @@ -1 +1 @@ -'grafana/agent:v0.34.2' +'grafana/agent:v0.34.3' diff --git a/production/kubernetes/build/templates/operator/main.jsonnet b/production/kubernetes/build/templates/operator/main.jsonnet index 71807f0490b9..6601af9a81ba 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.34.2', - agent_operator: 'grafana/agent-operator:v0.34.2', + agent: 'grafana/agent:v0.34.3', + agent_operator: 'grafana/agent-operator:v0.34.3', 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 22bb08300cec..134b3f596ab0 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.34.2 +MANIFEST_BRANCH=v0.34.3 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 9796bfb51666..0dea8aeaf467 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.34.2 + image: grafana/agent-operator:v0.34.3 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.34.2 + image: grafana/agent:v0.34.3 integrations: selector: matchLabels: diff --git a/production/tanka/grafana-agent/v1/main.libsonnet b/production/tanka/grafana-agent/v1/main.libsonnet index 30a1c20ef338..ec4c75ee6a83 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.34.2', - agentctl: 'grafana/agentctl:v0.34.2', + agent: 'grafana/agent:v0.34.3', + agentctl: 'grafana/agentctl:v0.34.3', }, // new creates a new DaemonSet deployment of the grafana-agent. By default, diff --git a/production/tanka/grafana-agent/v2/internal/syncer.libsonnet b/production/tanka/grafana-agent/v2/internal/syncer.libsonnet index 44bf4a61b8ed..76603c37cfbd 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.34.2', + image: 'grafana/agentctl:v0.34.3', schedule: '*/5 * * * *', configs: [], } + config,