From 67501d0759265753351d9bc84435715e150f5d57 Mon Sep 17 00:00:00 2001 From: PromOperatorBot <85787986+prom-op-bot@users.noreply.github.com> Date: Mon, 15 Aug 2022 10:43:23 +0200 Subject: [PATCH] [bot] [main] Automated version update (#1838) Co-authored-by: Prometheus Operator Bot <prom-op-bot@users.noreply.github.com> --- jsonnet/kube-prometheus/versions.json | 2 +- jsonnetfile.lock.json | 24 ++++----- 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 +- .../0thanosrulerCustomResourceDefinition.yaml | 5 ++ 13 files changed, 57 insertions(+), 52 deletions(-) diff --git a/jsonnet/kube-prometheus/versions.json b/jsonnet/kube-prometheus/versions.json index decd399f..b2840c47 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.0.6", + "grafana": "9.0.7", "kubeStateMetrics": "2.5.0", "nodeExporter": "1.3.1", "prometheus": "2.37.0", diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json index 7a03e2be..5444c25b 100644 --- a/jsonnetfile.lock.json +++ b/jsonnetfile.lock.json @@ -18,7 +18,7 @@ "subdir": "contrib/mixin" } }, - "version": "c070dedb92820cf66a33af994f1adff6a54a8707", + "version": "a1405e9633a8b50d1542b293d7e54b921a276e7e", "sum": "IkDHlaE0gvvcPjSNurFT+jQ2aCOAbqHF1WVmXbAgkds=" }, { @@ -58,7 +58,7 @@ "subdir": "grafana-builder" } }, - "version": "da70df69e80ff98173883268a57b980d8022c395", + "version": "a2ba95acc8b7653d33bd57075678d8de2a64e5b3", "sum": "1Ge62JmmPDq7fWyDAt3uCTobGEj4sJdbkqxRGWK22p0=" }, { @@ -78,7 +78,7 @@ "subdir": "jsonnet/kube-state-metrics" } }, - "version": "fad76e457a5cc0da10a6defed00539d256435c20", + "version": "767af98d2f8eaba93d8834b56dc346b4235c043e", "sum": "dFXBd/OAQREzokDmW+6Wnp28KrjK5ZLUz4YX7GO4/m0=" }, { @@ -88,7 +88,7 @@ "subdir": "jsonnet/kube-state-metrics-mixin" } }, - "version": "fad76e457a5cc0da10a6defed00539d256435c20", + "version": "767af98d2f8eaba93d8834b56dc346b4235c043e", "sum": "u8gaydJoxEjzizQ8jY8xSjYgWooPmxw+wIWdDxifMAk=" }, { @@ -98,7 +98,7 @@ "subdir": "jsonnet/mixin" } }, - "version": "ad9ae0a764423eddd158ae53f7809409ff494fc6", + "version": "9f64561535810a9a3e4862beeb72577044be993f", "sum": "GQmaVFJwKMiD/P4n3N2LrAZVcwutriWrP8joclDtBYQ=", "name": "prometheus-operator-mixin" }, @@ -109,8 +109,8 @@ "subdir": "jsonnet/prometheus-operator" } }, - "version": "ad9ae0a764423eddd158ae53f7809409ff494fc6", - "sum": "RhKMm1XZfGiUfalPKc/lbIRCJjQHxZblOudvifFIDVw=" + "version": "9f64561535810a9a3e4862beeb72577044be993f", + "sum": "hV3FK2ekNFLUlKnj5chRp8WKKxZemfbwynYWK5RkY1E=" }, { "source": { @@ -140,7 +140,7 @@ "subdir": "documentation/prometheus-mixin" } }, - "version": "d91621890a2ccb3191a6d74812cc1827dd4093bf", + "version": "0fa8469f76107dc12e949164fc174a4098aedb19", "sum": "crD6rsagAMJFnVRw4pO63z3LLYfz4QFIiMR14zjjIfY=", "name": "prometheus" }, @@ -151,8 +151,8 @@ "subdir": "config/crd/bases" } }, - "version": "4c7fa4b9fbd054ddfd0a878af6dc93807b7c199e", - "sum": "OcgJ4F0OaDwz6JgO2NkaXRz+hpB3puMkJRl/0L4za0Y=" + "version": "dc85a954055e7893d31fa2a1e6b04f0d9c04051c", + "sum": "d1550yhsX4VxdVN7b0gWT0cido/W90P6OGLzLqPwZcs=" }, { "source": { @@ -161,8 +161,8 @@ "subdir": "mixin" } }, - "version": "291b6fa4afbab3228d5251a440acf132ff059989", - "sum": "M8vlJRfaKuqG8LJMMYBdFKuuKQgcLiFG27ZDWePHzTQ=", + "version": "cbe66572419153e8ee180e97565c4f8afd63a4b2", + "sum": "oksO55VdKbsLAVA3vl7b1woE9TLmfvH7sz5+1A7iOBE=", "name": "thanos-mixin" }, { diff --git a/manifests/grafana-config.yaml b/manifests/grafana-config.yaml index cf981bc4..a7e28fb8 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.0.6 + app.kubernetes.io/version: 9.0.7 name: grafana-config namespace: monitoring stringData: diff --git a/manifests/grafana-dashboardDatasources.yaml b/manifests/grafana-dashboardDatasources.yaml index 7f563fee..4d763478 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.0.6 + app.kubernetes.io/version: 9.0.7 name: grafana-datasources namespace: monitoring stringData: diff --git a/manifests/grafana-dashboardDefinitions.yaml b/manifests/grafana-dashboardDefinitions.yaml index 8e4ccb58..149c19d9 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.0.6 + app.kubernetes.io/version: 9.0.7 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.0.6 + app.kubernetes.io/version: 9.0.7 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.0.6 + app.kubernetes.io/version: 9.0.7 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.0.6 + app.kubernetes.io/version: 9.0.7 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.0.6 + app.kubernetes.io/version: 9.0.7 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.0.6 + app.kubernetes.io/version: 9.0.7 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.0.6 + app.kubernetes.io/version: 9.0.7 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.0.6 + app.kubernetes.io/version: 9.0.7 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.0.6 + app.kubernetes.io/version: 9.0.7 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.0.6 + app.kubernetes.io/version: 9.0.7 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.0.6 + app.kubernetes.io/version: 9.0.7 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.0.6 + app.kubernetes.io/version: 9.0.7 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.0.6 + app.kubernetes.io/version: 9.0.7 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.0.6 + app.kubernetes.io/version: 9.0.7 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.0.6 + app.kubernetes.io/version: 9.0.7 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.0.6 + app.kubernetes.io/version: 9.0.7 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.0.6 + app.kubernetes.io/version: 9.0.7 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.0.6 + app.kubernetes.io/version: 9.0.7 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.0.6 + app.kubernetes.io/version: 9.0.7 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.0.6 + app.kubernetes.io/version: 9.0.7 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.0.6 + app.kubernetes.io/version: 9.0.7 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.0.6 + app.kubernetes.io/version: 9.0.7 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.0.6 + app.kubernetes.io/version: 9.0.7 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.0.6 + app.kubernetes.io/version: 9.0.7 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.0.6 + app.kubernetes.io/version: 9.0.7 name: grafana-dashboard-workload-total namespace: monitoring kind: ConfigMapList diff --git a/manifests/grafana-dashboardSources.yaml b/manifests/grafana-dashboardSources.yaml index 92371c0e..7a486057 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.0.6 + app.kubernetes.io/version: 9.0.7 name: grafana-dashboards namespace: monitoring diff --git a/manifests/grafana-deployment.yaml b/manifests/grafana-deployment.yaml index e8c5322b..7f795c5a 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.0.6 + app.kubernetes.io/version: 9.0.7 name: grafana namespace: monitoring spec: @@ -18,19 +18,19 @@ spec: template: metadata: annotations: - checksum/grafana-config: a0f9a1881f7108b30093dceac202a3e9 - checksum/grafana-dashboardproviders: 1e71a9b69046c3460199161bcd401d88 - checksum/grafana-datasources: 9253b0cb91ec58ed4f7dd7a600b4297f + checksum/grafana-config: bc631c541633845dc1a68f67b5149c23 + checksum/grafana-dashboardproviders: a443bf3ad562a96949f2d279a91c2be1 + checksum/grafana-datasources: 0834755c4ada730ae3dad3db753d560d labels: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 9.0.6 + app.kubernetes.io/version: 9.0.7 spec: automountServiceAccountToken: false containers: - env: [] - image: grafana/grafana:9.0.6 + image: grafana/grafana:9.0.7 name: grafana ports: - containerPort: 3000 diff --git a/manifests/grafana-networkPolicy.yaml b/manifests/grafana-networkPolicy.yaml index deb9c3e7..ff6d6d4a 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.0.6 + app.kubernetes.io/version: 9.0.7 name: grafana namespace: monitoring spec: diff --git a/manifests/grafana-prometheusRule.yaml b/manifests/grafana-prometheusRule.yaml index 30d55e69..615e7714 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.0.6 + app.kubernetes.io/version: 9.0.7 prometheus: k8s role: alert-rules name: grafana-rules diff --git a/manifests/grafana-service.yaml b/manifests/grafana-service.yaml index 7f28127b..706b5229 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.0.6 + app.kubernetes.io/version: 9.0.7 name: grafana namespace: monitoring spec: diff --git a/manifests/grafana-serviceAccount.yaml b/manifests/grafana-serviceAccount.yaml index 0fc639ca..5a17d4f6 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.0.6 + app.kubernetes.io/version: 9.0.7 name: grafana namespace: monitoring diff --git a/manifests/grafana-serviceMonitor.yaml b/manifests/grafana-serviceMonitor.yaml index 831c36c3..c47519ad 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.0.6 + app.kubernetes.io/version: 9.0.7 name: grafana namespace: monitoring spec: diff --git a/manifests/setup/0thanosrulerCustomResourceDefinition.yaml b/manifests/setup/0thanosrulerCustomResourceDefinition.yaml index 65b0a4f3..394f8fbd 100644 --- a/manifests/setup/0thanosrulerCustomResourceDefinition.yaml +++ b/manifests/setup/0thanosrulerCustomResourceDefinition.yaml @@ -4830,6 +4830,11 @@ spec: - key type: object x-kubernetes-map-type: atomic + tracingConfigFile: + description: TracingConfig specifies the path of the tracing configuration + file. When used alongside with TracingConfig, TracingConfigFile + takes precedence. + type: string volumes: description: Volumes allows configuration of additional volumes on the output StatefulSet definition. Volumes specified will be appended -- GitLab