Cherry pick update from main (#4501)

grafana · Jul 18, 2023 · 5425a8f · 5425a8f
1 parent 4d488c2
commit 5425a8f
Show file tree

Hide file tree

Showing 17 changed files with 32 additions and 42 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,27 +7,13 @@ 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.35.0-rc.1 (2023-07-17)
--------------------------
-
-### Features
-
-- Add support for converting Prometheus `file_sd_config` to `discovery.file`. (@erikbaranowski)
-
-
-### Bugfixes
-
-- Fix issue where `remote.http` incorrectly had a status of "Unknown" until the
-  period specified by the polling frequency elapsed. (@rfratto)
-
-
-v0.35.0-rc.0 (2023-07-13)
--------------------------
+v0.35.0 (2023-07-18)
+--------------------
 
 > **BREAKING CHANGES**: This release has breaking changes. Please read entries
 > carefully and consult the [upgrade guide][] for specific instructions.
-
-### Breaking changes 
+ 
+### Breaking changes
 
 - The algorithm for the "hash" action of `otelcol.processor.attributes` has changed.
   The change was made in PR [#22831](https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/22831) of opentelemetry-collector-contrib. (@ptodev)
@@ -98,7 +84,7 @@ v0.35.0-rc.0 (2023-07-13)
 
 - Add support to the `grafana-agent run` CLI for converting a river file from supported formats to river. (@erikbaranowski)
 
-- Add boringcrypto builds and docker images for Linux arm64 and x64.  (@mattdurham)
+- Add boringcrypto builds and docker images for Linux arm64 and x64. (@mattdurham)
 
 - New Grafana Agent Flow components:
 
@@ -183,6 +169,10 @@ v0.35.0-rc.0 (2023-07-13)
 
 ### Bugfixes
 
+- Fix issue where `remote.http` incorrectly had a status of "Unknown" until the
+  period specified by the polling frquency elapsed. (@rfratto)
+
+
 - Add signing region to remote.s3 component for use with custom endpoints so that Authorization Headers work correctly when
   proxying requests. (@mattdurham)
 

diff --git a/docs/sources/operator/deploy-agent-operator-resources.md b/docs/sources/operator/deploy-agent-operator-resources.md
@@ -58,7 +58,7 @@ To deploy the `GrafanaAgent` resource:
       labels:
         app: grafana-agent
     spec:
-      image: grafana/agent:v0.35.0-rc.1
+      image: grafana/agent:v0.35.0
       integrations:
         selector:
           matchLabels:

diff --git a/docs/sources/operator/getting-started.md b/docs/sources/operator/getting-started.md
@@ -74,7 +74,7 @@ To install Agent Operator:
           serviceAccountName: grafana-agent-operator
           containers:
           - name: operator
-            image: grafana/agent-operator:v0.35.0-rc.1
+            image: grafana/agent-operator:v0.35.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
@@ -29,7 +29,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.35.0-rc.1 \
+  grafana/agent:v0.35.0 \
   --config.file=/etc/agent-config/agent.yaml
 ```
 
@@ -68,7 +68,7 @@ metadata:
   name: agent
 spec:
   containers:
-  - image: grafana/agent:v0.35.0-rc.1
+  - image: grafana/agent:v0.35.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
@@ -21,7 +21,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.35.0-rc.1 \
+  grafana/agent:v0.35.0 \
   --config.file=/etc/agent-config/agent.yaml
 ```
 
@@ -38,7 +38,7 @@ metadata:
   name: agent
 spec:
   containers:
-  - image: grafana/agent:v0.35.0-rc.1
+  - image: grafana/agent:v0.35.0
     name: agent
     args:
     - --config.file=/etc/agent-config/agent.yaml

diff --git a/docs/sources/static/set-up/install/install-agent-docker.md b/docs/sources/static/set-up/install/install-agent-docker.md
@@ -33,7 +33,7 @@ To run a Grafana Agent Docker container on Linux, run the following command in a
 docker run \
   -v WAL_DATA_DIRECTORY:/etc/agent/data \
   -v CONFIG_FILE_PATH:/etc/agent/agent.yaml \
-  grafana/agent:v0.35.0-rc.1
+  grafana/agent:v0.35.0
 ```
 
 Replace `CONFIG_FILE_PATH` with the configuration file path on your Linux host system.
@@ -50,7 +50,7 @@ To run a Grafana Agent Docker container on Windows, run the following command in
 docker run ^
   -v WAL_DATA_DIRECTORY:C:\etc\grafana-agent\data ^
   -v CONFIG_FILE_PATH:C:\etc\grafana-agent ^
-  grafana/agent:v0.35.0-rc.1-windows
+  grafana/agent:v0.35.0-windows
 ```
 
 Replace the following:

diff --git 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.35.0-rc.1"
+	DefaultAgentVersion   = "v0.35.0"
 	DefaultAgentBaseImage = "grafana/agent"
 	DefaultAgentImage     = DefaultAgentBaseImage + ":" + DefaultAgentVersion
 )

diff --git 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.35.0-rc.1
+        image: grafana/agent:v0.35.0
         imagePullPolicy: IfNotPresent
         name: grafana-agent
         ports:

diff --git 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.35.0-rc.1
+        image: grafana/agent:v0.35.0
         imagePullPolicy: IfNotPresent
         name: grafana-agent-logs
         ports:

diff --git 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.35.0-rc.1
+        image: grafana/agent:v0.35.0
         imagePullPolicy: IfNotPresent
         name: grafana-agent-traces
         ports:

diff --git a/production/kubernetes/build/lib/version.libsonnet b/production/kubernetes/build/lib/version.libsonnet
@@ -1 +1 @@
-'grafana/agent:v0.35.0-rc.1'
+'grafana/agent:v0.35.0'
diff --git 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.35.0-rc.1',
-    agent_operator: 'grafana/agent-operator:v0.35.0-rc.1',
+    agent: 'grafana/agent:v0.35.0',
+    agent_operator: 'grafana/agent-operator:v0.35.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
@@ -25,7 +25,7 @@ check_installed() {
 check_installed curl
 check_installed envsubst
 
-MANIFEST_BRANCH=v0.35.0-rc.1
+MANIFEST_BRANCH=v0.35.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
@@ -372,7 +372,7 @@ spec:
       containers:
       - args:
         - --kubelet-service=default/kubelet
-        image: grafana/agent-operator:v0.35.0-rc.1
+        image: grafana/agent-operator:v0.35.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.35.0-rc.1
+  image: grafana/agent:v0.35.0
   integrations:
     selector:
       matchLabels:

diff --git 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.35.0-rc.1',
-    agentctl: 'grafana/agentctl:v0.35.0-rc.1',
+    agent: 'grafana/agent:v0.35.0',
+    agentctl: 'grafana/agentctl:v0.35.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
@@ -11,8 +11,8 @@ function(name='grafana-agent', namespace='') {
   local this = self,
 
   _images:: {
-    agent: 'grafana/agent:v0.35.0-rc.1',
-    agentctl: 'grafana/agentctl:v0.35.0-rc.1',
+    agent: 'grafana/agent:v0.35.0',
+    agentctl: 'grafana/agentctl:v0.35.0',
   },
   _config:: {
     name: name,

diff --git 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.35.0-rc.1',
+    image: 'grafana/agentctl:v0.35.0',
     schedule: '*/5 * * * *',
     configs: [],
   } + config,
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		'grafana/agent:v0.35.0-rc.1'
		'grafana/agent:v0.35.0'