From 9c40102138f74e86f2a0d22f654a4a37b35cd2d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Tudur=C3=AD?= Date: Tue, 9 Jan 2024 16:51:11 +0100 Subject: [PATCH] Change refs v0.39 (#6081) * V0.39 update refs (#6054) * Update version to v0.39.0-rc.0 (#6053) (cherry picked from commit c246cf896ce497d2821b4e18116e5b1493d3b199) * Remove main from changelog * Cherry picks release v0.39 (#6078) * add call to set perf query (#6065) * add changelog (#6058) * Fix changelog --------- Co-authored-by: mattdurham * Update refs to v0.39 --------- Co-authored-by: mattdurham --- CHANGELOG.md | 12 ++++-------- docs/sources/_index.md | 2 +- 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 ++-- .../tanka/grafana-agent/v2/internal/base.libsonnet | 4 ++-- .../tanka/grafana-agent/v2/internal/syncer.libsonnet | 2 +- tools/gen-versioned-files/agent-version.txt | 2 +- 14 files changed, 21 insertions(+), 25 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1a25d6b0d1b6..ab53913ab789 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,12 +16,9 @@ Main (unreleased) - [GO-2023-2412](https://github.com/advisories/GHSA-7ww5-4wqc-m92c) - [CVE-2023-49568](https://github.com/advisories/GHSA-mw99-9chc-xw7r) -### Bugfixes - -- Fix performance issue where perf lib where clause was not being set, leading to timeouts in collecting metrics for windows_exporter. (@mattdurham) -v0.39.0-rc.0 (2024-01-05) -------------------------- +v0.39.0 (2024-01-09) +-------------------- ### Breaking changes @@ -42,9 +39,6 @@ v0.39.0-rc.0 (2024-01-05) ### Features - A new `discovery.ovhcloud` component for discovering scrape targets on OVHcloud. (@ptodev) - -### Features - - Allow specifying additional containers to run. (@juangom) ### Enhancements @@ -123,6 +117,8 @@ v0.39.0-rc.0 (2024-01-05) - Fix issue where `prometheus.exporter.kafka` would crash when configuring `sasl_password`. (@rfratto) +- Fix performance issue where perf lib where clause was not being set, leading to timeouts in collecting metrics for windows_exporter. (@mattdurham) + - Fix nil panic when using the process collector with the windows exporter. (@mattdurham) ### Other changes diff --git a/docs/sources/_index.md b/docs/sources/_index.md index 4b19726241b6..890ac82d71a7 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.39.0-rc.0 + AGENT_RELEASE: v0.39.0 OTEL_VERSION: v0.87.0 --- diff --git a/pkg/operator/defaults.go b/pkg/operator/defaults.go index a518d884b0b1..bc9cff6ab04e 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.39.0-rc.0" + DefaultAgentVersion = "v0.39.0" DefaultAgentBaseImage = "grafana/agent" DefaultAgentImage = DefaultAgentBaseImage + ":" + DefaultAgentVersion ) diff --git a/production/kubernetes/agent-bare.yaml b/production/kubernetes/agent-bare.yaml index 0ca2da3bc58f..ccf5d13439ce 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.37.4 + image: grafana/agent:v0.39.0 imagePullPolicy: IfNotPresent name: grafana-agent ports: diff --git a/production/kubernetes/agent-loki.yaml b/production/kubernetes/agent-loki.yaml index 4eeb798a00d8..497462d3efcb 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.37.4 + image: grafana/agent:v0.39.0 imagePullPolicy: IfNotPresent name: grafana-agent-logs ports: diff --git a/production/kubernetes/agent-traces.yaml b/production/kubernetes/agent-traces.yaml index 7c2835846b0a..c42cec6125e3 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.37.4 + image: grafana/agent:v0.39.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 be3865408074..70fb0ff0cffe 100644 --- a/production/kubernetes/build/lib/version.libsonnet +++ b/production/kubernetes/build/lib/version.libsonnet @@ -1 +1 @@ -'grafana/agent:v0.37.4' +'grafana/agent:v0.39.0' diff --git a/production/kubernetes/build/templates/operator/main.jsonnet b/production/kubernetes/build/templates/operator/main.jsonnet index fe49426c4fa4..efc5b6e9df9f 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.37.4', - agent_operator: 'grafana/agent-operator:v0.37.4', + agent: 'grafana/agent:v0.39.0', + agent_operator: 'grafana/agent-operator:v0.39.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 93cc7120af23..32127903a224 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.37.4 +MANIFEST_BRANCH=v0.39.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 ba8c08e75e6f..442bab4fa353 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.37.4 + image: grafana/agent-operator:v0.39.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.37.4 + image: grafana/agent:v0.39.0 integrations: selector: matchLabels: diff --git a/production/tanka/grafana-agent/v1/main.libsonnet b/production/tanka/grafana-agent/v1/main.libsonnet index 8ff06ab1bf5b..d4096bc015e9 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.37.4', - agentctl: 'grafana/agentctl:v0.37.4', + agent: 'grafana/agent:v0.39.0', + agentctl: 'grafana/agentctl:v0.39.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 53921bf64aaf..6d697c93a3aa 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.37.4', - agentctl: 'grafana/agentctl:v0.37.4', + agent: 'grafana/agent:v0.39.0', + agentctl: 'grafana/agentctl:v0.39.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 689b14fd87b3..79409f65f310 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.37.4', + image: 'grafana/agentctl:v0.39.0', schedule: '*/5 * * * *', configs: [], } + config, diff --git a/tools/gen-versioned-files/agent-version.txt b/tools/gen-versioned-files/agent-version.txt index f02ec0731bfa..999889149ec2 100644 --- a/tools/gen-versioned-files/agent-version.txt +++ b/tools/gen-versioned-files/agent-version.txt @@ -1 +1 @@ -v0.39.0-rc.0 +v0.39.0 \ No newline at end of file