From 3a2d6d566b7e870023ad7d8539b9bfc74c07eef0 Mon Sep 17 00:00:00 2001 From: Paschalis Tsilias Date: Mon, 6 Nov 2023 19:31:05 +0200 Subject: [PATCH] Update code references for v0.37.4 (#5718) Signed-off-by: Paschalis Tsilias --- CHANGELOG.md | 15 ++++++++++----- 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 +- .../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/base.libsonnet | 4 ++-- .../grafana-agent/v2/internal/syncer.libsonnet | 2 +- tools/gen-versioned-files/agent-version.txt | 2 +- 14 files changed, 27 insertions(+), 22 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9fbef786b1b1..fabedfa99040 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -77,9 +77,6 @@ Main (unreleased) - The `loki.source.docker` component now allows connecting to Docker daemons over HTTP(S) and setting up TLS credentials. (@tpaschalis) -- Added an `add_metric_suffixes` option to `otelcol.exporter.prometheus` in flow mode, - which configures whether to add type and unit suffixes to metrics names. (@mar4uk) - - Added an `exclude_event_message` option to `loki.source.windowsevent` in flow mode, which excludes the human-friendly event message from Windows event logs. (@ptodev) @@ -132,10 +129,18 @@ Main (unreleased) - Fixed a bug where UDP syslog messages were never processed (@joshuapare) -- Fix a bug where reloading the configuration of a `loki.write` component lead - to a panic. (@tpaschalis) +v0.37.4 (2023-11-06) +----------------- + +### Enhancements +- Added an `add_metric_suffixes` option to `otelcol.exporter.prometheus` in flow mode, + which configures whether to add type and unit suffixes to metrics names. (@mar4uk) +### Bugfixes + +- Fix a bug where reloading the configuration of a `loki.write` component lead + to a panic. (@tpaschalis) v0.37.3 (2023-10-26) ----------------- diff --git a/docs/sources/_index.md b/docs/sources/_index.md index cc9dc89efea9..c46dfe04feea 100644 --- a/docs/sources/_index.md +++ b/docs/sources/_index.md @@ -8,7 +8,7 @@ title: Grafana Agent description: Grafana Agent is a flexible, performant, vendor-neutral, telemetry collector weight: 350 cascade: - AGENT_RELEASE: v0.37.3 + AGENT_RELEASE: v0.37.4 OTEL_VERSION: v0.87.0 --- diff --git a/pkg/operator/defaults.go b/pkg/operator/defaults.go index e9907c4a4ae5..68842b412f42 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.37.3" + DefaultAgentVersion = "v0.37.4" DefaultAgentBaseImage = "grafana/agent" DefaultAgentImage = DefaultAgentBaseImage + ":" + DefaultAgentVersion ) diff --git a/production/kubernetes/agent-bare.yaml b/production/kubernetes/agent-bare.yaml index 668d2b286a73..0ca2da3bc58f 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.3 + image: grafana/agent:v0.37.4 imagePullPolicy: IfNotPresent name: grafana-agent ports: diff --git a/production/kubernetes/agent-loki.yaml b/production/kubernetes/agent-loki.yaml index dabcbb9f03b4..4eeb798a00d8 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.3 + image: grafana/agent:v0.37.4 imagePullPolicy: IfNotPresent name: grafana-agent-logs ports: diff --git a/production/kubernetes/agent-traces.yaml b/production/kubernetes/agent-traces.yaml index ee15687e834c..7c2835846b0a 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.3 + image: grafana/agent:v0.37.4 imagePullPolicy: IfNotPresent name: grafana-agent-traces ports: diff --git a/production/kubernetes/build/lib/version.libsonnet b/production/kubernetes/build/lib/version.libsonnet index b9571fb91726..be3865408074 100644 --- a/production/kubernetes/build/lib/version.libsonnet +++ b/production/kubernetes/build/lib/version.libsonnet @@ -1 +1 @@ -'grafana/agent:v0.37.3' +'grafana/agent:v0.37.4' diff --git a/production/kubernetes/build/templates/operator/main.jsonnet b/production/kubernetes/build/templates/operator/main.jsonnet index e92dfa9ae4d7..dda322bac503 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.3', - agent_operator: 'grafana/agent-operator:v0.37.3', + agent: 'grafana/agent:v0.37.4', + agent_operator: 'grafana/agent-operator:v0.37.4', 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 ea25968e6bd3..93cc7120af23 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.3 +MANIFEST_BRANCH=v0.37.4 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 863585a29b89..797ce35fa972 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.3 + image: grafana/agent-operator:v0.37.4 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.3 + image: grafana/agent:v0.37.4 integrations: selector: matchLabels: diff --git a/production/tanka/grafana-agent/v1/main.libsonnet b/production/tanka/grafana-agent/v1/main.libsonnet index c21bb98e03c5..8ff06ab1bf5b 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.3', - agentctl: 'grafana/agentctl:v0.37.3', + agent: 'grafana/agent:v0.37.4', + agentctl: 'grafana/agentctl:v0.37.4', }, // 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 16840b40aace..53921bf64aaf 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.3', - agentctl: 'grafana/agentctl:v0.37.3', + agent: 'grafana/agent:v0.37.4', + agentctl: 'grafana/agentctl:v0.37.4', }, _config:: { name: name, diff --git a/production/tanka/grafana-agent/v2/internal/syncer.libsonnet b/production/tanka/grafana-agent/v2/internal/syncer.libsonnet index 35bb6f40a00e..689b14fd87b3 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.3', + image: 'grafana/agentctl:v0.37.4', schedule: '*/5 * * * *', configs: [], } + config, diff --git a/tools/gen-versioned-files/agent-version.txt b/tools/gen-versioned-files/agent-version.txt index 7c49ad6429e3..f3d8baac63b3 100644 --- a/tools/gen-versioned-files/agent-version.txt +++ b/tools/gen-versioned-files/agent-version.txt @@ -1 +1 @@ -v0.37.3 +v0.37.4