diff --git a/jsonnet/kube-prometheus/versions.json b/jsonnet/kube-prometheus/versions.json index 533454cc..15891b72 100644 --- a/jsonnet/kube-prometheus/versions.json +++ b/jsonnet/kube-prometheus/versions.json @@ -1,7 +1,7 @@ { "alertmanager": "0.23.0", "blackboxExporter": "0.19.0", - "grafana": "8.3.3", + "grafana": "8.3.4", "kubeStateMetrics": "2.3.0", "nodeExporter": "1.3.1", "prometheus": "2.32.1", diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json index 657c1091..4565ef95 100644 --- a/jsonnetfile.lock.json +++ b/jsonnetfile.lock.json @@ -8,8 +8,8 @@ "subdir": "grafana" } }, - "version": "199e363523104ff8b3a12483a4e3eca86372b078", - "sum": "/jDHzVAjHB4AOLkJHw1GyATX5ogZ1iMdcJXZAgaG3+g=" + "version": "e7aeb2be37ea3afcda0dd380553440b394567cd5", + "sum": "IujrtNI+ckmR8isarpBU6yBb2jRtVlytG/qlEOH6BF8=" }, { "source": { @@ -18,8 +18,8 @@ "subdir": "contrib/mixin" } }, - "version": "28b9089de970c2759c9f3439a0493bd170dbbfe9", - "sum": "cdKL5kPYfpWSpTCu4qctmh+gWQqL+4YWom6rw9qLYJU=" + "version": "f9a8c49c695b098d66a07948666664ea10d01a82", + "sum": "wIsqEIGSqnWwJApdQ7k8x2kd/AsffJhYcqUebDiS01w=" }, { "source": { @@ -28,7 +28,7 @@ "subdir": "grafana-mixin" } }, - "version": "7422789ec7ab665fd5d01e3b891f44ac427061c5", + "version": "641e34e341c2a5c8481a8bad2317ed4e75e1c846", "sum": "MkjR7zCgq6MUZgjDzop574tFKoTX2OBr7DTwm1K+Ofs=" }, { @@ -48,7 +48,7 @@ "subdir": "grafana-builder" } }, - "version": "38443f6f8d8ee1e44d2753f5c92dcfe418e08225", + "version": "d3d43dd85811b89949650f570e77455f4cec1136", "sum": "0KkygBQd/AFzUvVzezE4qF/uDYgrwUXVpZfINBti0oc=" }, { @@ -78,8 +78,8 @@ "subdir": "jsonnet/kube-state-metrics" } }, - "version": "41eea36f69efd9824836089aae67d308111f4e01", - "sum": "U1wzIpTAtOvC1yj43Y8PfvT0JfvnAcMfNH12Wi+ab0Y=" + "version": "486b95fcc1ad522d51179b76f0c60f3104ba7c9b", + "sum": "7EENy1etunEj7RzhxbRdmqpfM9qpojxu0UBOrA0iV/U=" }, { "source": { @@ -88,7 +88,7 @@ "subdir": "jsonnet/kube-state-metrics-mixin" } }, - "version": "41eea36f69efd9824836089aae67d308111f4e01", + "version": "486b95fcc1ad522d51179b76f0c60f3104ba7c9b", "sum": "u8gaydJoxEjzizQ8jY8xSjYgWooPmxw+wIWdDxifMAk=" }, { @@ -98,7 +98,7 @@ "subdir": "jsonnet/mixin" } }, - "version": "80cb3c8c76c644e342fe1684ee8732027d8530f7", + "version": "881663b9229405e44504168938af76762c85e7e3", "sum": "qZ4WgiweaE6eeKtFK60QUjLO8sf2L9Q8fgafWvDcyfY=", "name": "prometheus-operator-mixin" }, @@ -109,8 +109,8 @@ "subdir": "jsonnet/prometheus-operator" } }, - "version": "80cb3c8c76c644e342fe1684ee8732027d8530f7", - "sum": "YwsTuahU2pWuYMLTQksQ3n4188UTiyW+I5aNR/H4GuI=" + "version": "881663b9229405e44504168938af76762c85e7e3", + "sum": "hPpoqkhs2Fc5wf7aGi3n49OOKXjpEJeRnFenjHO9Ito=" }, { "source": { @@ -119,7 +119,7 @@ "subdir": "doc/alertmanager-mixin" } }, - "version": "c91717bc89aadd3253063ddca9f56a7c4a4c2736", + "version": "ef25f81f1bc7b74381469b5bb0c264d59a64c8f2", "sum": "iqF63VWQovIGBb7JI5oVVgMShz0dKptSzEVQQjsy+Jo=", "name": "alertmanager" }, @@ -140,7 +140,7 @@ "subdir": "documentation/prometheus-mixin" } }, - "version": "30e2c81c97ce052a9dcfc51ef78885846a6c9745", + "version": "027b082793bc557f9f7dcf8fe4f149ea1cc856eb", "sum": "ZjQoYhvgKwJNkg+h+m9lW3SYjnjv5Yx5btEipLhru88=", "name": "prometheus" }, @@ -151,7 +151,7 @@ "subdir": "mixin" } }, - "version": "4d5f4d9ac2ad33451eae76852ae262a53c959225", + "version": "73f4cf4226a0c6eac73919cc1b37c0c88b701ca3", "sum": "RbqWknYtfJHwMBlM+gAjqfmvV5wqn5AFV/IGcHGadM0=", "name": "thanos-mixin" }, diff --git a/manifests/grafana-config.yaml b/manifests/grafana-config.yaml index a7d0b541..60f45e61 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: 8.3.3 + app.kubernetes.io/version: 8.3.4 name: grafana-config namespace: monitoring stringData: diff --git a/manifests/grafana-dashboardDatasources.yaml b/manifests/grafana-dashboardDatasources.yaml index b00c0c64..1b42d5b5 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: 8.3.3 + app.kubernetes.io/version: 8.3.4 name: grafana-datasources namespace: monitoring stringData: diff --git a/manifests/grafana-dashboardDefinitions.yaml b/manifests/grafana-dashboardDefinitions.yaml index 85c8945f..28179202 100644 --- a/manifests/grafana-dashboardDefinitions.yaml +++ b/manifests/grafana-dashboardDefinitions.yaml @@ -596,7 +596,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 8.3.3 + app.kubernetes.io/version: 8.3.4 name: grafana-dashboard-alertmanager-overview namespace: monitoring - apiVersion: v1 @@ -2357,7 +2357,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 8.3.3 + app.kubernetes.io/version: 8.3.4 name: grafana-dashboard-apiserver namespace: monitoring - apiVersion: v1 @@ -4228,7 +4228,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 8.3.3 + app.kubernetes.io/version: 8.3.4 name: grafana-dashboard-cluster-total namespace: monitoring - apiVersion: v1 @@ -5407,7 +5407,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 8.3.3 + app.kubernetes.io/version: 8.3.4 name: grafana-dashboard-controller-manager namespace: monitoring - apiVersion: v1 @@ -6032,7 +6032,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 8.3.3 + app.kubernetes.io/version: 8.3.4 name: grafana-dashboard-grafana-overview namespace: monitoring - apiVersion: v1 @@ -9109,7 +9109,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 8.3.3 + app.kubernetes.io/version: 8.3.4 name: grafana-dashboard-k8s-resources-cluster namespace: monitoring - apiVersion: v1 @@ -11895,7 +11895,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 8.3.3 + app.kubernetes.io/version: 8.3.4 name: grafana-dashboard-k8s-resources-namespace namespace: monitoring - apiVersion: v1 @@ -12910,7 +12910,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 8.3.3 + app.kubernetes.io/version: 8.3.4 name: grafana-dashboard-k8s-resources-node namespace: monitoring - apiVersion: v1 @@ -15368,7 +15368,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 8.3.3 + app.kubernetes.io/version: 8.3.4 name: grafana-dashboard-k8s-resources-pod namespace: monitoring - apiVersion: v1 @@ -17381,7 +17381,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 8.3.3 + app.kubernetes.io/version: 8.3.4 name: grafana-dashboard-k8s-resources-workload namespace: monitoring - apiVersion: v1 @@ -19559,7 +19559,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 8.3.3 + app.kubernetes.io/version: 8.3.4 name: grafana-dashboard-k8s-resources-workloads-namespace namespace: monitoring - apiVersion: v1 @@ -21802,7 +21802,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 8.3.3 + app.kubernetes.io/version: 8.3.4 name: grafana-dashboard-kubelet namespace: monitoring - apiVersion: v1 @@ -23255,7 +23255,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 8.3.3 + app.kubernetes.io/version: 8.3.4 name: grafana-dashboard-namespace-by-pod namespace: monitoring - apiVersion: v1 @@ -24980,7 +24980,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 8.3.3 + app.kubernetes.io/version: 8.3.4 name: grafana-dashboard-namespace-by-workload namespace: monitoring - apiVersion: v1 @@ -26032,7 +26032,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 8.3.3 + app.kubernetes.io/version: 8.3.4 name: grafana-dashboard-node-cluster-rsrc-use namespace: monitoring - apiVersion: v1 @@ -27110,7 +27110,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 8.3.3 + app.kubernetes.io/version: 8.3.4 name: grafana-dashboard-node-rsrc-use namespace: monitoring - apiVersion: v1 @@ -28090,7 +28090,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 8.3.3 + app.kubernetes.io/version: 8.3.4 name: grafana-dashboard-nodes namespace: monitoring - apiVersion: v1 @@ -28666,7 +28666,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 8.3.3 + app.kubernetes.io/version: 8.3.4 name: grafana-dashboard-persistentvolumesusage namespace: monitoring - apiVersion: v1 @@ -29883,7 +29883,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 8.3.3 + app.kubernetes.io/version: 8.3.4 name: grafana-dashboard-pod-total namespace: monitoring - apiVersion: v1 @@ -31542,7 +31542,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 8.3.3 + app.kubernetes.io/version: 8.3.4 name: grafana-dashboard-prometheus-remote-write namespace: monitoring - apiVersion: v1 @@ -32766,7 +32766,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 8.3.3 + app.kubernetes.io/version: 8.3.4 name: grafana-dashboard-prometheus namespace: monitoring - apiVersion: v1 @@ -34026,7 +34026,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 8.3.3 + app.kubernetes.io/version: 8.3.4 name: grafana-dashboard-proxy namespace: monitoring - apiVersion: v1 @@ -35127,7 +35127,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 8.3.3 + app.kubernetes.io/version: 8.3.4 name: grafana-dashboard-scheduler namespace: monitoring - apiVersion: v1 @@ -36554,7 +36554,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 8.3.3 + app.kubernetes.io/version: 8.3.4 name: grafana-dashboard-workload-total namespace: monitoring kind: ConfigMapList diff --git a/manifests/grafana-dashboardSources.yaml b/manifests/grafana-dashboardSources.yaml index d3993505..a37c549b 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: 8.3.3 + app.kubernetes.io/version: 8.3.4 name: grafana-dashboards namespace: monitoring diff --git a/manifests/grafana-deployment.yaml b/manifests/grafana-deployment.yaml index 14cbaaea..d359cfe3 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: 8.3.3 + app.kubernetes.io/version: 8.3.4 name: grafana namespace: monitoring spec: @@ -18,18 +18,18 @@ spec: template: metadata: annotations: - checksum/grafana-config: 8a40383dc6577c8b30c5bf006ba9ab7e - checksum/grafana-dashboardproviders: cf4ac6c4d98eb91172b3307d9127acc5 - checksum/grafana-datasources: 2e669e49f44117d62bc96ea62c2d39d3 + checksum/grafana-config: da579b2ee81dc98ffbcc068a3422822a + checksum/grafana-dashboardproviders: bc79f12017c019002ed650d44571a465 + checksum/grafana-datasources: c921684c6242ca2a8564803a9ae21504 labels: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 8.3.3 + app.kubernetes.io/version: 8.3.4 spec: containers: - env: [] - image: grafana/grafana:8.3.3 + image: grafana/grafana:8.3.4 name: grafana ports: - containerPort: 3000 diff --git a/manifests/grafana-prometheusRule.yaml b/manifests/grafana-prometheusRule.yaml index a554e3f5..5945a533 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: 8.3.3 + app.kubernetes.io/version: 8.3.4 prometheus: k8s role: alert-rules name: grafana-rules diff --git a/manifests/grafana-service.yaml b/manifests/grafana-service.yaml index 64346b82..daaebb07 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: 8.3.3 + app.kubernetes.io/version: 8.3.4 name: grafana namespace: monitoring spec: diff --git a/manifests/grafana-serviceAccount.yaml b/manifests/grafana-serviceAccount.yaml index a8162227..2972098a 100644 --- a/manifests/grafana-serviceAccount.yaml +++ b/manifests/grafana-serviceAccount.yaml @@ -1,10 +1,11 @@ apiVersion: v1 +automountServiceAccountToken: false kind: ServiceAccount metadata: labels: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 8.3.3 + app.kubernetes.io/version: 8.3.4 name: grafana namespace: monitoring diff --git a/manifests/grafana-serviceMonitor.yaml b/manifests/grafana-serviceMonitor.yaml index 09175a5b..369aec6b 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: 8.3.3 + app.kubernetes.io/version: 8.3.4 name: grafana namespace: monitoring spec: diff --git a/manifests/kubeStateMetrics-deployment.yaml b/manifests/kubeStateMetrics-deployment.yaml index 77a7f2ce..8a967425 100644 --- a/manifests/kubeStateMetrics-deployment.yaml +++ b/manifests/kubeStateMetrics-deployment.yaml @@ -25,6 +25,7 @@ spec: app.kubernetes.io/part-of: kube-prometheus app.kubernetes.io/version: 2.3.0 spec: + automountServiceAccountToken: true containers: - args: - --host=127.0.0.1 diff --git a/manifests/kubeStateMetrics-serviceAccount.yaml b/manifests/kubeStateMetrics-serviceAccount.yaml index 0dfd86a5..6866f8b1 100644 --- a/manifests/kubeStateMetrics-serviceAccount.yaml +++ b/manifests/kubeStateMetrics-serviceAccount.yaml @@ -1,4 +1,5 @@ apiVersion: v1 +automountServiceAccountToken: false kind: ServiceAccount metadata: labels: diff --git a/manifests/prometheusOperator-deployment.yaml b/manifests/prometheusOperator-deployment.yaml index 1a10d66d..e3ea867f 100644 --- a/manifests/prometheusOperator-deployment.yaml +++ b/manifests/prometheusOperator-deployment.yaml @@ -25,6 +25,7 @@ spec: app.kubernetes.io/part-of: kube-prometheus app.kubernetes.io/version: 0.53.1 spec: + automountServiceAccountToken: true containers: - args: - --kubelet-service=kube-system/kubelet diff --git a/manifests/prometheusOperator-serviceAccount.yaml b/manifests/prometheusOperator-serviceAccount.yaml index 0e4aa9c9..cb764d98 100644 --- a/manifests/prometheusOperator-serviceAccount.yaml +++ b/manifests/prometheusOperator-serviceAccount.yaml @@ -1,4 +1,5 @@ apiVersion: v1 +automountServiceAccountToken: false kind: ServiceAccount metadata: labels: