diff --git a/jsonnet/kube-prometheus/versions.json b/jsonnet/kube-prometheus/versions.json index fda0a9022744bbb5d4b55f0f0325275450d27ea6..dd310dd5510cb0cb25d5b955fb7974f9b8d535c1 100644 --- a/jsonnet/kube-prometheus/versions.json +++ b/jsonnet/kube-prometheus/versions.json @@ -1,7 +1,7 @@ { "alertmanager": "0.25.0", "blackboxExporter": "0.23.0", - "grafana": "9.3.6", + "grafana": "9.4.3", "kubeStateMetrics": "2.8.1", "nodeExporter": "1.5.0", "prometheus": "2.42.0", diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json index 288554ef976570413604ba329fddc9fa902e422a..93018a239bfcda7c15158a2adc239469990c6c48 100644 --- a/jsonnetfile.lock.json +++ b/jsonnetfile.lock.json @@ -18,7 +18,7 @@ "subdir": "contrib/mixin" } }, - "version": "858d25c43bbc52b5cc7541814eb35b7f9a241a14", + "version": "7a98ab3ae0d66239f3802b43b26530c3e9c299c7", "sum": "IkDHlaE0gvvcPjSNurFT+jQ2aCOAbqHF1WVmXbAgkds=" }, { @@ -58,7 +58,7 @@ "subdir": "grafana-builder" } }, - "version": "7c72d8eedb2520fc050e3dc4febdd400ab2a1920", + "version": "e9f44d885c53d9ebdc849203f06ed74c7eccd362", "sum": "tDR6yT2GVfw0wTU12iZH+m01HrbIr6g/xN+/8nzNkU0=" }, { @@ -78,7 +78,7 @@ "subdir": "jsonnet/kube-state-metrics" } }, - "version": "3a7e617949cd33428ac75110b7be863867e5fc46", + "version": "054f2a4e712f6b9f89ee227b56db307d8a24cd5d", "sum": "4PJ2ROxODsoYO/1Y70+dgLZVjW5zlfzB+TDpxJBHwaI=" }, { @@ -88,7 +88,7 @@ "subdir": "jsonnet/kube-state-metrics-mixin" } }, - "version": "3a7e617949cd33428ac75110b7be863867e5fc46", + "version": "054f2a4e712f6b9f89ee227b56db307d8a24cd5d", "sum": "u8gaydJoxEjzizQ8jY8xSjYgWooPmxw+wIWdDxifMAk=" }, { @@ -98,7 +98,7 @@ "subdir": "jsonnet/mixin" } }, - "version": "f337e4ecf88d2c228c2325249bf338c6aa999488", + "version": "4acdc01e8bdf0abc8ce1bf87d9c684edb0ab44d0", "sum": "GQmaVFJwKMiD/P4n3N2LrAZVcwutriWrP8joclDtBYQ=", "name": "prometheus-operator-mixin" }, @@ -109,8 +109,8 @@ "subdir": "jsonnet/prometheus-operator" } }, - "version": "f337e4ecf88d2c228c2325249bf338c6aa999488", - "sum": "Rf7+tECEqPn/NuvgJlL81K8oKiZ+O3/8LmTfTNmSp6U=" + "version": "4acdc01e8bdf0abc8ce1bf87d9c684edb0ab44d0", + "sum": "aByD2Nl33aUKhxijXIjT09utrzpE8DRGitrAP9CJWdg=" }, { "source": { @@ -119,7 +119,7 @@ "subdir": "doc/alertmanager-mixin" } }, - "version": "eea788a968c870e3bd78a228e394f745701f18a0", + "version": "41eb1213bb1c7ce0aa9e6464e297976d9c81cfe5", "sum": "PsK+V7oETCPKu2gLoPfqY0wwPKH9TzhNj6o2xezjjXc=", "name": "alertmanager" }, @@ -140,7 +140,7 @@ "subdir": "documentation/prometheus-mixin" } }, - "version": "8f3b2fc9aeaf1bd3f839e820e7f9ffc571006e89", + "version": "d2f5fdd17eb525cfc49e606744c3004fa93b6948", "sum": "LRx0tbMnoE1p8KEn+i81j2YsA5Sgt3itE5Y6jBf5eOQ=", "name": "prometheus" }, @@ -151,7 +151,7 @@ "subdir": "config/crd/bases" } }, - "version": "874e4542aca0994105c0fa9f981749119751c504", + "version": "e88234910527fe08f125f718319d1e9b93463ec5", "sum": "bY/Pcrrbynguq8/HaI88cQ3B2hLv/xc+76QILY7IL+g=" }, { @@ -161,7 +161,7 @@ "subdir": "mixin" } }, - "version": "fdeea3917591fc363a329cbe23af37c6fff0b5f0", + "version": "8da34a1b76a60aadc2cf5020b3db1a2ae6cfc289", "sum": "QIPkur4Hka3BId8ek3OkriAUKphk0mC/NORqJhFgxag=", "name": "thanos-mixin" }, diff --git a/manifests/grafana-config.yaml b/manifests/grafana-config.yaml index b96deee01d0ee120a69c4f7ed6ff7033c6b3eac5..a1628e767f964db70e8c514c96304f540788ab07 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.3.6 + app.kubernetes.io/version: 9.4.3 name: grafana-config namespace: monitoring stringData: diff --git a/manifests/grafana-dashboardDatasources.yaml b/manifests/grafana-dashboardDatasources.yaml index dcfaf277e062a557b4e9335ccd89f223459cb33c..9b7f3d6aab440d6241b9773f259db79c2a9dbf60 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.3.6 + app.kubernetes.io/version: 9.4.3 name: grafana-datasources namespace: monitoring stringData: diff --git a/manifests/grafana-dashboardDefinitions.yaml b/manifests/grafana-dashboardDefinitions.yaml index dbdfc7d98d7fa63f14edc1372667f70cd0a2b5f6..4abe034f0a0e34bcac89fd21b9df4f518a5560b4 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.3.6 + app.kubernetes.io/version: 9.4.3 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.3.6 + app.kubernetes.io/version: 9.4.3 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.3.6 + app.kubernetes.io/version: 9.4.3 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.3.6 + app.kubernetes.io/version: 9.4.3 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.3.6 + app.kubernetes.io/version: 9.4.3 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.3.6 + app.kubernetes.io/version: 9.4.3 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.3.6 + app.kubernetes.io/version: 9.4.3 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.3.6 + app.kubernetes.io/version: 9.4.3 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.3.6 + app.kubernetes.io/version: 9.4.3 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.3.6 + app.kubernetes.io/version: 9.4.3 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.3.6 + app.kubernetes.io/version: 9.4.3 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.3.6 + app.kubernetes.io/version: 9.4.3 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.3.6 + app.kubernetes.io/version: 9.4.3 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.3.6 + app.kubernetes.io/version: 9.4.3 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.3.6 + app.kubernetes.io/version: 9.4.3 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.3.6 + app.kubernetes.io/version: 9.4.3 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.3.6 + app.kubernetes.io/version: 9.4.3 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.3.6 + app.kubernetes.io/version: 9.4.3 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.3.6 + app.kubernetes.io/version: 9.4.3 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.3.6 + app.kubernetes.io/version: 9.4.3 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.3.6 + app.kubernetes.io/version: 9.4.3 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.3.6 + app.kubernetes.io/version: 9.4.3 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.3.6 + app.kubernetes.io/version: 9.4.3 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.3.6 + app.kubernetes.io/version: 9.4.3 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.3.6 + app.kubernetes.io/version: 9.4.3 name: grafana-dashboard-workload-total namespace: monitoring kind: ConfigMapList diff --git a/manifests/grafana-dashboardSources.yaml b/manifests/grafana-dashboardSources.yaml index 78e03951aabfd62df739f3e3c810ce10044c19a7..ac6d9fad2a4b419227e6d45037b4b627f46c6eab 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.3.6 + app.kubernetes.io/version: 9.4.3 name: grafana-dashboards namespace: monitoring diff --git a/manifests/grafana-deployment.yaml b/manifests/grafana-deployment.yaml index 42e3660747462a14f779b14b6266efe2a014b61d..4f2fd66ec223b6df924336e4c680f1cc711751b7 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.3.6 + app.kubernetes.io/version: 9.4.3 name: grafana namespace: monitoring spec: @@ -18,19 +18,19 @@ spec: template: metadata: annotations: - checksum/grafana-config: fb98e3c91d822cbf66c27098b5eab383 - checksum/grafana-dashboardproviders: 33b30eca3609e24e7ea4571ebc5f9837 - checksum/grafana-datasources: 8590d8514fdffb4dfe82092c83e592e0 + checksum/grafana-config: 861ef2c0fc2d19a8563af172a4c7dd9d + checksum/grafana-dashboardproviders: 3bf1ff4315550a6ebe26944742ab2fd4 + checksum/grafana-datasources: 7127ad0c16d0b229907cc0e836cf975e labels: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 9.3.6 + app.kubernetes.io/version: 9.4.3 spec: automountServiceAccountToken: false containers: - env: [] - image: grafana/grafana:9.3.6 + image: grafana/grafana:9.4.3 name: grafana ports: - containerPort: 3000 diff --git a/manifests/grafana-networkPolicy.yaml b/manifests/grafana-networkPolicy.yaml index 4dd53735cae4006f171c33edb84ab0f06ddc96ea..e598c0bb194a713bbc748da86bdd14aa2a9d30b9 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.3.6 + app.kubernetes.io/version: 9.4.3 name: grafana namespace: monitoring spec: diff --git a/manifests/grafana-prometheusRule.yaml b/manifests/grafana-prometheusRule.yaml index 41bb06df31941771e020e4a4c092b584af6f9e8c..b31ee879c93bccca342b9cc9d7a9dd752ac7fc4c 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.3.6 + app.kubernetes.io/version: 9.4.3 prometheus: k8s role: alert-rules name: grafana-rules diff --git a/manifests/grafana-service.yaml b/manifests/grafana-service.yaml index 44d4fd3a8ffae28498c6988b372a1cbb0ea7bbe6..be3ba4d911b4b061fab8e3a357144772c73eb570 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.3.6 + app.kubernetes.io/version: 9.4.3 name: grafana namespace: monitoring spec: diff --git a/manifests/grafana-serviceAccount.yaml b/manifests/grafana-serviceAccount.yaml index 6e96d64e5be2cf78eaa22be42c227574778620ae..abe1c6d3ba01b3a06a4f0fa0d9028dab97b732d9 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.3.6 + app.kubernetes.io/version: 9.4.3 name: grafana namespace: monitoring diff --git a/manifests/grafana-serviceMonitor.yaml b/manifests/grafana-serviceMonitor.yaml index 628fc5d19fe1b0fae032f856ebaaf0dcbeec6540..af9df5a2694d4f02c58113435a291a8ae6da30fd 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.3.6 + app.kubernetes.io/version: 9.4.3 name: grafana namespace: monitoring spec: diff --git a/manifests/setup/0podmonitorCustomResourceDefinition.yaml b/manifests/setup/0podmonitorCustomResourceDefinition.yaml index a74ae1420874c7af6fa352573d524427ebf79257..1afb2735d47d2766d7cb47cfe43065f8ed06b998 100644 --- a/manifests/setup/0podmonitorCustomResourceDefinition.yaml +++ b/manifests/setup/0podmonitorCustomResourceDefinition.yaml @@ -239,6 +239,10 @@ spec: - Lowercase - uppercase - Uppercase + - keepequal + - KeepEqual + - dropequal + - DropEqual type: string modulus: description: Modulus to take of the hash of the source @@ -419,6 +423,10 @@ spec: - Lowercase - uppercase - Uppercase + - keepequal + - KeepEqual + - dropequal + - DropEqual type: string modulus: description: Modulus to take of the hash of the source diff --git a/manifests/setup/0probeCustomResourceDefinition.yaml b/manifests/setup/0probeCustomResourceDefinition.yaml index 22bc46bbf13a0ba9569df8ab2dd3582d0bf138d6..46b36baa480b9a345fefbf7e01253fed1e407530 100644 --- a/manifests/setup/0probeCustomResourceDefinition.yaml +++ b/manifests/setup/0probeCustomResourceDefinition.yaml @@ -188,6 +188,10 @@ spec: - Lowercase - uppercase - Uppercase + - keepequal + - KeepEqual + - dropequal + - DropEqual type: string modulus: description: Modulus to take of the hash of the source label @@ -409,6 +413,10 @@ spec: - Lowercase - uppercase - Uppercase + - keepequal + - KeepEqual + - dropequal + - DropEqual type: string modulus: description: Modulus to take of the hash of the source @@ -538,6 +546,10 @@ spec: - Lowercase - uppercase - Uppercase + - keepequal + - KeepEqual + - dropequal + - DropEqual type: string modulus: description: Modulus to take of the hash of the source diff --git a/manifests/setup/0prometheusCustomResourceDefinition.yaml b/manifests/setup/0prometheusCustomResourceDefinition.yaml index 6efe1d3faaae05a4da6994ceb1026ef2c3ec9673..f2ec156af8abbdc7ea6db20d264d9b2be03dba5b 100644 --- a/manifests/setup/0prometheusCustomResourceDefinition.yaml +++ b/manifests/setup/0prometheusCustomResourceDefinition.yaml @@ -5435,6 +5435,10 @@ spec: - Lowercase - uppercase - Uppercase + - keepequal + - KeepEqual + - dropequal + - DropEqual type: string modulus: description: Modulus to take of the hash of the source diff --git a/manifests/setup/0servicemonitorCustomResourceDefinition.yaml b/manifests/setup/0servicemonitorCustomResourceDefinition.yaml index ab15be4cc7c6aa726874de28999e121073d76617..3a5b7d4c7bc7c44b7b06ae8d7b023179f4df5e51 100644 --- a/manifests/setup/0servicemonitorCustomResourceDefinition.yaml +++ b/manifests/setup/0servicemonitorCustomResourceDefinition.yaml @@ -208,6 +208,10 @@ spec: - Lowercase - uppercase - Uppercase + - keepequal + - KeepEqual + - dropequal + - DropEqual type: string modulus: description: Modulus to take of the hash of the source @@ -388,6 +392,10 @@ spec: - Lowercase - uppercase - Uppercase + - keepequal + - KeepEqual + - dropequal + - DropEqual type: string modulus: description: Modulus to take of the hash of the source