prepare for 0.31.3 (#2974) (#2975)

(cherry picked from commit 732c1d6)
grafana · Feb 13, 2023 · 996155f · 996155f
1 parent e2a948f
commit 996155f
Show file tree

Hide file tree

Showing 18 changed files with 36 additions and 23 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,18 @@ 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.31.3 (2023-02-13)
+--------------------
+
+### Bugfixes
+
+- `loki.source.cloudflare`: fix issue where the `zone_id` argument
+  was being ignored, and the `api_token` argument was being used for the zone
+  instead. (@rfratto)
+
+- `loki.source.cloudflare`: fix issue where `api_token` argument was not marked
+  as a sensitive field. (@rfratto)
+
 v0.31.2 (2023-02-08)
 --------------------
 

diff --git a/docs/sources/configuration/integrations/node-exporter-config.md b/docs/sources/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.31.2 \
+  grafana/agent:v0.31.3 \
   --config.file=/etc/agent-config/agent.yaml
 ```
 
@@ -67,7 +67,7 @@ metadata:
   name: agent
 spec:
   containers:
-  - image: grafana/agent:v0.31.2
+  - image: grafana/agent:v0.31.3
     name: agent
     args:
     - --config.file=/etc/agent-config/agent.yaml

diff --git a/docs/sources/configuration/integrations/process-exporter-config.md b/docs/sources/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.31.2 \
+  grafana/agent:v0.31.3 \
   --config.file=/etc/agent-config/agent.yaml
 ```
 
@@ -37,7 +37,7 @@ metadata:
   name: agent
 spec:
   containers:
-  - image: grafana/agent:v0.31.2
+  - image: grafana/agent:v0.31.3
     name: agent
     args:
     - --config.file=/etc/agent-config/agent.yaml

diff --git a/docs/sources/operator/deploy-agent-operator-resources.md b/docs/sources/operator/deploy-agent-operator-resources.md
@@ -54,7 +54,7 @@ To deploy the `GrafanaAgent` resource:
       labels:
         app: grafana-agent
     spec:
-      image: grafana/agent:v0.31.2
+      image: grafana/agent:v0.31.3
       logLevel: info
       serviceAccountName: grafana-agent
       metrics:

diff --git a/docs/sources/operator/getting-started.md b/docs/sources/operator/getting-started.md
@@ -75,7 +75,7 @@ To install Agent Operator:
           serviceAccountName: grafana-agent-operator
           containers:
           - name: operator
-            image: grafana/agent-operator:v0.31.2
+            image: grafana/agent-operator:v0.31.3
             args:
             - --kubelet-service=default/kubelet
     ---

diff --git a/docs/sources/set-up/install-agent-docker.md b/docs/sources/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.31.2
+  grafana/agent:v0.31.3
 ```
 
 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.31.2-windows
+      grafana/agent:v0.31.3-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
@@ -39,6 +39,7 @@ var (
 		"v0.31.0",
 		"v0.31.1",
 		"v0.31.2",
+		"v0.31.3",
 		// NOTE(rfratto): when performing an upgrade, add the newest version above instead of changing the existing reference.
 	}
 

diff --git a/production/grafanacloud-install.sh b/production/grafanacloud-install.sh
@@ -50,7 +50,7 @@ PACKAGE_SYSTEM=${PACKAGE_SYSTEM:=}
 #
 # Global constants.
 #
-RELEASE_VERSION="v0.31.2"
+RELEASE_VERSION="v0.31.3"
 
 # The DEB and RPM urls don't include the `v` version prefix in the file names,
 # so we trim it out using ${RELEASE_VERSION#v} below.

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.31.2
+        image: grafana/agent:v0.31.3
         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.31.2
+        image: grafana/agent:v0.31.3
         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.31.2
+        image: grafana/agent:v0.31.3
         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.31.2'
+'grafana/agent:v0.31.3'
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.31.2',
-    agent_operator: 'grafana/agent-operator:v0.31.2',
+    agent: 'grafana/agent:v0.31.3',
+    agent_operator: 'grafana/agent-operator:v0.31.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
@@ -25,7 +25,7 @@ check_installed() {
 check_installed curl
 check_installed envsubst
 
-MANIFEST_BRANCH=v0.31.2
+MANIFEST_BRANCH=v0.31.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
@@ -372,7 +372,7 @@ spec:
       containers:
       - args:
         - --kubelet-service=default/kubelet
-        image: grafana/agent-operator:v0.31.2
+        image: grafana/agent-operator:v0.31.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.31.2
+  image: grafana/agent:v0.31.3
   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.31.2',
-    agentctl: 'grafana/agentctl:v0.31.2',
+    agent: 'grafana/agent:v0.31.3',
+    agentctl: 'grafana/agentctl:v0.31.3',
   },
 
   // 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.31.2',
-    agentctl: 'grafana/agentctl:v0.31.2',
+    agent: 'grafana/agent:v0.31.3',
+    agentctl: 'grafana/agentctl:v0.31.3',
   },
   _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.31.2',
+    image: 'grafana/agentctl:v0.31.3',
     schedule: '*/5 * * * *',
     configs: [],
   } + config,