From e21a6b214cafc8bd722e43f8453e7ca6fa6de1a9 Mon Sep 17 00:00:00 2001 From: PromOperatorBot <85787986+prom-op-bot@users.noreply.github.com> Date: Mon, 12 Sep 2022 10:08:29 +0200 Subject: [PATCH] [bot] [main] Automated version update (#1871) Co-authored-by: Prometheus Operator Bot <prom-op-bot@users.noreply.github.com> --- jsonnet/kube-prometheus/versions.json | 2 +- jsonnetfile.lock.json | 22 ++++---- manifests/grafana-config.yaml | 2 +- manifests/grafana-dashboardDatasources.yaml | 2 +- manifests/grafana-dashboardDefinitions.yaml | 50 +++++++++---------- manifests/grafana-dashboardSources.yaml | 2 +- manifests/grafana-deployment.yaml | 12 ++--- manifests/grafana-networkPolicy.yaml | 2 +- manifests/grafana-prometheusRule.yaml | 2 +- manifests/grafana-service.yaml | 2 +- manifests/grafana-serviceAccount.yaml | 2 +- manifests/grafana-serviceMonitor.yaml | 2 +- .../0prometheusCustomResourceDefinition.yaml | 6 +-- 13 files changed, 54 insertions(+), 54 deletions(-) diff --git a/jsonnet/kube-prometheus/versions.json b/jsonnet/kube-prometheus/versions.json index 45809398..7b4880c0 100644 --- a/jsonnet/kube-prometheus/versions.json +++ b/jsonnet/kube-prometheus/versions.json @@ -1,7 +1,7 @@ { "alertmanager": "0.24.0", "blackboxExporter": "0.22.0", - "grafana": "9.1.2", + "grafana": "9.1.4", "kubeStateMetrics": "2.6.0", "nodeExporter": "1.3.1", "prometheus": "2.38.0", diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json index e577a160..19e17e60 100644 --- a/jsonnetfile.lock.json +++ b/jsonnetfile.lock.json @@ -18,7 +18,7 @@ "subdir": "contrib/mixin" } }, - "version": "4d57eb8d3b2190bfdba3c65f8eb93c0349fc6dcc", + "version": "b886bbc89f31d7ac59bdfbb3d14a4263dae85a1b", "sum": "IkDHlaE0gvvcPjSNurFT+jQ2aCOAbqHF1WVmXbAgkds=" }, { @@ -58,7 +58,7 @@ "subdir": "grafana-builder" } }, - "version": "c132c4afcf17491718539db4c2d94c0ea4346120", + "version": "dbf6fc14105c28b6fd0253005f7ca2da37d3d4e1", "sum": "tDR6yT2GVfw0wTU12iZH+m01HrbIr6g/xN+/8nzNkU0=" }, { @@ -98,7 +98,7 @@ "subdir": "jsonnet/mixin" } }, - "version": "a63bbe70bd58fa1a59a5b22c2ffe4102beebe41f", + "version": "ad64869358bfc470bac56c48a1ecee6dfb8dc88c", "sum": "GQmaVFJwKMiD/P4n3N2LrAZVcwutriWrP8joclDtBYQ=", "name": "prometheus-operator-mixin" }, @@ -109,8 +109,8 @@ "subdir": "jsonnet/prometheus-operator" } }, - "version": "a63bbe70bd58fa1a59a5b22c2ffe4102beebe41f", - "sum": "yyCtOZvvEmJ7jL8oogGCt89X/acej9flL588+P4g9F4=" + "version": "ad64869358bfc470bac56c48a1ecee6dfb8dc88c", + "sum": "zMopZuzEV7tZcO5AiKZMK8tSxabMKNdObpAOaYNY1jo=" }, { "source": { @@ -119,7 +119,7 @@ "subdir": "doc/alertmanager-mixin" } }, - "version": "c732372d7d3be49198398d34753080459f01749e", + "version": "699bc4dfdf59cd0501d36808a02b302a4336d695", "sum": "PsK+V7oETCPKu2gLoPfqY0wwPKH9TzhNj6o2xezjjXc=", "name": "alertmanager" }, @@ -130,7 +130,7 @@ "subdir": "docs/node-mixin" } }, - "version": "4ad86b349b7ffdbc30087c00a12def3254fd850b", + "version": "8755e852fa40d14338cc56e4780406c42c7c2237", "sum": "tappaHscNBSJCA6ypSWt7DDhohIOkxNjcLFRb3WKpu4=" }, { @@ -140,8 +140,8 @@ "subdir": "documentation/prometheus-mixin" } }, - "version": "6767f6e1a946af41f83ca233c6fbfc94a928abee", - "sum": "crD6rsagAMJFnVRw4pO63z3LLYfz4QFIiMR14zjjIfY=", + "version": "0c9f9b7f3ff46fd3361413a850db775a7afebbb4", + "sum": "Dq+wurABxuqRAHj4DGp2sCmjJWzNjrhP2XEScsS0kmY=", "name": "prometheus" }, { @@ -161,8 +161,8 @@ "subdir": "mixin" } }, - "version": "a947f33e1420d7ad4e171c4300b81a0dac1b083a", - "sum": "oksO55VdKbsLAVA3vl7b1woE9TLmfvH7sz5+1A7iOBE=", + "version": "0d659bf171afa6bdf5c5ece3033df3a7e8245d8c", + "sum": "095uB0qB1Ek+aNYf+CgydVZk5aFETsfD8GYf6gDwSJs=", "name": "thanos-mixin" }, { diff --git a/manifests/grafana-config.yaml b/manifests/grafana-config.yaml index 6c2c10da..76b745b6 100644 --- a/manifests/grafana-config.yaml +++ b/manifests/grafana-config.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 9.1.2 + app.kubernetes.io/version: 9.1.4 name: grafana-config namespace: monitoring stringData: diff --git a/manifests/grafana-dashboardDatasources.yaml b/manifests/grafana-dashboardDatasources.yaml index 17afdddb..76449968 100644 --- a/manifests/grafana-dashboardDatasources.yaml +++ b/manifests/grafana-dashboardDatasources.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 9.1.2 + app.kubernetes.io/version: 9.1.4 name: grafana-datasources namespace: monitoring stringData: diff --git a/manifests/grafana-dashboardDefinitions.yaml b/manifests/grafana-dashboardDefinitions.yaml index 3c4a8cfd..35c500e9 100644 --- a/manifests/grafana-dashboardDefinitions.yaml +++ b/manifests/grafana-dashboardDefinitions.yaml @@ -600,7 +600,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 9.1.2 + app.kubernetes.io/version: 9.1.4 name: grafana-dashboard-alertmanager-overview namespace: monitoring - apiVersion: v1 @@ -2361,7 +2361,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 9.1.2 + app.kubernetes.io/version: 9.1.4 name: grafana-dashboard-apiserver namespace: monitoring - apiVersion: v1 @@ -4232,7 +4232,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 9.1.2 + app.kubernetes.io/version: 9.1.4 name: grafana-dashboard-cluster-total namespace: monitoring - apiVersion: v1 @@ -5411,7 +5411,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 9.1.2 + app.kubernetes.io/version: 9.1.4 name: grafana-dashboard-controller-manager namespace: monitoring - apiVersion: v1 @@ -6036,7 +6036,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 9.1.2 + app.kubernetes.io/version: 9.1.4 name: grafana-dashboard-grafana-overview namespace: monitoring - apiVersion: v1 @@ -9113,7 +9113,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 9.1.2 + app.kubernetes.io/version: 9.1.4 name: grafana-dashboard-k8s-resources-cluster namespace: monitoring - apiVersion: v1 @@ -11899,7 +11899,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 9.1.2 + app.kubernetes.io/version: 9.1.4 name: grafana-dashboard-k8s-resources-namespace namespace: monitoring - apiVersion: v1 @@ -12914,7 +12914,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 9.1.2 + app.kubernetes.io/version: 9.1.4 name: grafana-dashboard-k8s-resources-node namespace: monitoring - apiVersion: v1 @@ -15372,7 +15372,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 9.1.2 + app.kubernetes.io/version: 9.1.4 name: grafana-dashboard-k8s-resources-pod namespace: monitoring - apiVersion: v1 @@ -17385,7 +17385,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 9.1.2 + app.kubernetes.io/version: 9.1.4 name: grafana-dashboard-k8s-resources-workload namespace: monitoring - apiVersion: v1 @@ -19563,7 +19563,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 9.1.2 + app.kubernetes.io/version: 9.1.4 name: grafana-dashboard-k8s-resources-workloads-namespace namespace: monitoring - apiVersion: v1 @@ -21806,7 +21806,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 9.1.2 + app.kubernetes.io/version: 9.1.4 name: grafana-dashboard-kubelet namespace: monitoring - apiVersion: v1 @@ -23259,7 +23259,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 9.1.2 + app.kubernetes.io/version: 9.1.4 name: grafana-dashboard-namespace-by-pod namespace: monitoring - apiVersion: v1 @@ -24984,7 +24984,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 9.1.2 + app.kubernetes.io/version: 9.1.4 name: grafana-dashboard-namespace-by-workload namespace: monitoring - apiVersion: v1 @@ -26036,7 +26036,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 9.1.2 + app.kubernetes.io/version: 9.1.4 name: grafana-dashboard-node-cluster-rsrc-use namespace: monitoring - apiVersion: v1 @@ -27114,7 +27114,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 9.1.2 + app.kubernetes.io/version: 9.1.4 name: grafana-dashboard-node-rsrc-use namespace: monitoring - apiVersion: v1 @@ -28176,7 +28176,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 9.1.2 + app.kubernetes.io/version: 9.1.4 name: grafana-dashboard-nodes-darwin namespace: monitoring - apiVersion: v1 @@ -29231,7 +29231,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 9.1.2 + app.kubernetes.io/version: 9.1.4 name: grafana-dashboard-nodes namespace: monitoring - apiVersion: v1 @@ -29807,7 +29807,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 9.1.2 + app.kubernetes.io/version: 9.1.4 name: grafana-dashboard-persistentvolumesusage namespace: monitoring - apiVersion: v1 @@ -31024,7 +31024,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 9.1.2 + app.kubernetes.io/version: 9.1.4 name: grafana-dashboard-pod-total namespace: monitoring - apiVersion: v1 @@ -32683,7 +32683,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 9.1.2 + app.kubernetes.io/version: 9.1.4 name: grafana-dashboard-prometheus-remote-write namespace: monitoring - apiVersion: v1 @@ -33907,7 +33907,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 9.1.2 + app.kubernetes.io/version: 9.1.4 name: grafana-dashboard-prometheus namespace: monitoring - apiVersion: v1 @@ -35167,7 +35167,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 9.1.2 + app.kubernetes.io/version: 9.1.4 name: grafana-dashboard-proxy namespace: monitoring - apiVersion: v1 @@ -36268,7 +36268,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 9.1.2 + app.kubernetes.io/version: 9.1.4 name: grafana-dashboard-scheduler namespace: monitoring - apiVersion: v1 @@ -37695,7 +37695,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 9.1.2 + app.kubernetes.io/version: 9.1.4 name: grafana-dashboard-workload-total namespace: monitoring kind: ConfigMapList diff --git a/manifests/grafana-dashboardSources.yaml b/manifests/grafana-dashboardSources.yaml index b118e3e9..04401d57 100644 --- a/manifests/grafana-dashboardSources.yaml +++ b/manifests/grafana-dashboardSources.yaml @@ -22,6 +22,6 @@ metadata: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 9.1.2 + app.kubernetes.io/version: 9.1.4 name: grafana-dashboards namespace: monitoring diff --git a/manifests/grafana-deployment.yaml b/manifests/grafana-deployment.yaml index e186ea09..9f7bf8ca 100644 --- a/manifests/grafana-deployment.yaml +++ b/manifests/grafana-deployment.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 9.1.2 + app.kubernetes.io/version: 9.1.4 name: grafana namespace: monitoring spec: @@ -18,19 +18,19 @@ spec: template: metadata: annotations: - checksum/grafana-config: 3df48d50924aa9626c7423c043e81828 - checksum/grafana-dashboardproviders: a5559a08054be15861267cb897f5238c - checksum/grafana-datasources: 908923847f5d72db94c28414e5b6a139 + checksum/grafana-config: 41daa262d6041301012b35bce9c2e66d + checksum/grafana-dashboardproviders: 9801de9e59a3658b5e31b98a194e47be + checksum/grafana-datasources: cd37a85afae39a3531129c35c35099ea labels: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 9.1.2 + app.kubernetes.io/version: 9.1.4 spec: automountServiceAccountToken: false containers: - env: [] - image: grafana/grafana:9.1.2 + image: grafana/grafana:9.1.4 name: grafana ports: - containerPort: 3000 diff --git a/manifests/grafana-networkPolicy.yaml b/manifests/grafana-networkPolicy.yaml index e8f80edf..5dcaa367 100644 --- a/manifests/grafana-networkPolicy.yaml +++ b/manifests/grafana-networkPolicy.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 9.1.2 + app.kubernetes.io/version: 9.1.4 name: grafana namespace: monitoring spec: diff --git a/manifests/grafana-prometheusRule.yaml b/manifests/grafana-prometheusRule.yaml index 5bb37968..917e5a7d 100644 --- a/manifests/grafana-prometheusRule.yaml +++ b/manifests/grafana-prometheusRule.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 9.1.2 + app.kubernetes.io/version: 9.1.4 prometheus: k8s role: alert-rules name: grafana-rules diff --git a/manifests/grafana-service.yaml b/manifests/grafana-service.yaml index 034ecfdc..f64a17d2 100644 --- a/manifests/grafana-service.yaml +++ b/manifests/grafana-service.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 9.1.2 + app.kubernetes.io/version: 9.1.4 name: grafana namespace: monitoring spec: diff --git a/manifests/grafana-serviceAccount.yaml b/manifests/grafana-serviceAccount.yaml index 32a77248..ae4f1b3c 100644 --- a/manifests/grafana-serviceAccount.yaml +++ b/manifests/grafana-serviceAccount.yaml @@ -6,6 +6,6 @@ metadata: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 9.1.2 + app.kubernetes.io/version: 9.1.4 name: grafana namespace: monitoring diff --git a/manifests/grafana-serviceMonitor.yaml b/manifests/grafana-serviceMonitor.yaml index 93659b33..d849c8a1 100644 --- a/manifests/grafana-serviceMonitor.yaml +++ b/manifests/grafana-serviceMonitor.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 9.1.2 + app.kubernetes.io/version: 9.1.4 name: grafana namespace: monitoring spec: diff --git a/manifests/setup/0prometheusCustomResourceDefinition.yaml b/manifests/setup/0prometheusCustomResourceDefinition.yaml index 9290f2f7..80f1d7cf 100644 --- a/manifests/setup/0prometheusCustomResourceDefinition.yaml +++ b/manifests/setup/0prometheusCustomResourceDefinition.yaml @@ -112,8 +112,8 @@ spec: the Prometheus container. It is intended for e.g. activating hidden flags which are not supported by the dedicated configuration options yet. The arguments are passed as-is to the Prometheus container - which may cause issues if they are invalid or not supporeted by - the given Prometheus version. In case of an argument conflict (e.g. + which may cause issues if they are invalid or not supported by the + given Prometheus version. In case of an argument conflict (e.g. an argument which is already set by the operator itself) or when providing an invalid argument the reconciliation will fail and an error will be logged. @@ -6373,7 +6373,7 @@ spec: description: AdditionalArgs allows setting additional arguments for the Thanos container. The arguments are passed as-is to the Thanos container which may cause issues if they are invalid - or not supporeted the given Thanos version. In case of an argument + or not supported the given Thanos version. In case of an argument conflict (e.g. an argument which is already set by the operator itself) or when providing an invalid argument the reconciliation will fail and an error will be logged. -- GitLab