From 5d115787961567926293e16b45a81e6016cfa10e Mon Sep 17 00:00:00 2001 From: Prometheus Operator Bot Date: Mon, 21 Oct 2024 08:28:42 +0000 Subject: [PATCH] [bot] [main] Automated version update --- jsonnet/kube-prometheus/versions.json | 2 +- jsonnetfile.lock.json | 26 +++---- manifests/grafana-config.yaml | 2 +- manifests/grafana-dashboardDatasources.yaml | 2 +- manifests/grafana-dashboardDefinitions.yaml | 72 +++++++++---------- 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 +- ...kubernetesControlPlane-prometheusRule.yaml | 12 ++-- ...managerConfigCustomResourceDefinition.yaml | 2 +- ...0alertmanagerCustomResourceDefinition.yaml | 2 +- .../0podmonitorCustomResourceDefinition.yaml | 2 +- .../setup/0probeCustomResourceDefinition.yaml | 2 +- .../0prometheusCustomResourceDefinition.yaml | 18 ++++- ...ometheusagentCustomResourceDefinition.yaml | 7 +- ...rometheusruleCustomResourceDefinition.yaml | 2 +- ...0scrapeconfigCustomResourceDefinition.yaml | 10 ++- ...ervicemonitorCustomResourceDefinition.yaml | 2 +- .../0thanosrulerCustomResourceDefinition.yaml | 2 +- 23 files changed, 104 insertions(+), 85 deletions(-) diff --git a/jsonnet/kube-prometheus/versions.json b/jsonnet/kube-prometheus/versions.json index 5c95bccec3..b374e1bd59 100644 --- a/jsonnet/kube-prometheus/versions.json +++ b/jsonnet/kube-prometheus/versions.json @@ -1,7 +1,7 @@ { "alertmanager": "0.27.0", "blackboxExporter": "0.25.0", - "grafana": "11.2.1", + "grafana": "11.2.2+security-01", "kubeStateMetrics": "2.13.0", "nodeExporter": "1.8.2", "prometheus": "2.54.1", diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json index 6b0458504f..3f13abe0d0 100644 --- a/jsonnetfile.lock.json +++ b/jsonnetfile.lock.json @@ -18,7 +18,7 @@ "subdir": "contrib/mixin" } }, - "version": "f5acd17796d39af0999fbb23df2e242dbc1b2066", + "version": "55de68d18c63fde8747f2cd9f7c2ff242346f756", "sum": "IXI3LQIT9NmTPJAk8WLUJd5+qZfcGpeNCyWIK7oEpws=" }, { @@ -88,7 +88,7 @@ "subdir": "grafana-builder" } }, - "version": "638ce5cdede46cb1a352fd8c9fa01127eb26b088", + "version": "3805ed5082bb7db66cd75badb57a673c965aa24c", "sum": "yxqWcq/N3E/a/XreeU6EuE6X7kYPnG0AspAQFKOjASo=" }, { @@ -98,7 +98,7 @@ "subdir": "mixin-utils" } }, - "version": "638ce5cdede46cb1a352fd8c9fa01127eb26b088", + "version": "3805ed5082bb7db66cd75badb57a673c965aa24c", "sum": "LoYq5QxJmUXEtqkEG8CFUBLBhhzDDaNANHc7Gz36ZdM=" }, { @@ -128,8 +128,8 @@ "subdir": "" } }, - "version": "cb72d737459a655e7575c09f7859815ae3690981", - "sum": "JaPnO5N/KUBgA9v6qE7CYzp8OWDTpzjM0+l/SPqL4m4=" + "version": "0348e09edc3961a29a55f199d1bf0060c847a608", + "sum": "kTZuZcE+pNw8ZVZECKxrZG4F9BS+ydWMcgACE9oUrRc=" }, { "source": { @@ -138,7 +138,7 @@ "subdir": "jsonnet/kube-state-metrics" } }, - "version": "a9363414964759db050a6b9ca95fe060110dd77e", + "version": "e14a9d771c65c352f06cdcce0835d71daef4738e", "sum": "lO7jUSzAIy8Yk9pOWJIWgPRhubkWzVh56W6wtYfbVH4=" }, { @@ -148,7 +148,7 @@ "subdir": "jsonnet/kube-state-metrics-mixin" } }, - "version": "a9363414964759db050a6b9ca95fe060110dd77e", + "version": "e14a9d771c65c352f06cdcce0835d71daef4738e", "sum": "qclI7LwucTjBef3PkGBkKxF0mfZPbHnn4rlNWKGtR4c=" }, { @@ -158,7 +158,7 @@ "subdir": "jsonnet/mixin" } }, - "version": "d7238551702187164fd65c3de51278d99bf0986f", + "version": "94031224b1c186ff6671ec9f447716f748ac9d31", "sum": "gi+knjdxs2T715iIQIntrimbHRgHnpM8IFBJDD1gYfs=", "name": "prometheus-operator-mixin" }, @@ -169,8 +169,8 @@ "subdir": "jsonnet/prometheus-operator" } }, - "version": "d7238551702187164fd65c3de51278d99bf0986f", - "sum": "dzBCtpO20E+VN200+vSQBv68kgTdB4oNwi/Padgnrp8=" + "version": "94031224b1c186ff6671ec9f447716f748ac9d31", + "sum": "5G3bgQK3WFueFwjZDcTaI16cyf19rqxK+H1oGsiIgx0=" }, { "source": { @@ -179,7 +179,7 @@ "subdir": "doc/alertmanager-mixin" } }, - "version": "e1492602209b86e0ca6d7671c7353b62a31b897b", + "version": "4fcb18ee41ecaff4ee1816ad363dc63fdf3583b9", "sum": "IpF46ZXsm+0wJJAPtAre8+yxTNZA57mBqGpBP/r7/kw=", "name": "alertmanager" }, @@ -200,7 +200,7 @@ "subdir": "documentation/prometheus-mixin" } }, - "version": "90f7832447d2f26c181ad42fef757be68d0cb805", + "version": "6b36a5592a8f7e51f9801e5c8944ad9ca185e5cc", "sum": "dYLcLzGH4yF3qB7OGC/7z4nqeTNjv42L7Q3BENU8XJI=", "name": "prometheus" }, @@ -222,7 +222,7 @@ "subdir": "mixin" } }, - "version": "f265c3b06212ab115b3411df7a875a26aad64d0c", + "version": "731e4607d34a5d638ebf849c53582aa21ce591dc", "sum": "ieCD4eMgGbOlrI8GmckGPHBGQDcLasE1rULYq56W/bs=", "name": "thanos-mixin" }, diff --git a/manifests/grafana-config.yaml b/manifests/grafana-config.yaml index f9d5907bbf..29f689816e 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: 11.2.1 + app.kubernetes.io/version: 11.2.2+security-01 name: grafana-config namespace: monitoring stringData: diff --git a/manifests/grafana-dashboardDatasources.yaml b/manifests/grafana-dashboardDatasources.yaml index 558ca510e9..fd14efd1b5 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: 11.2.1 + app.kubernetes.io/version: 11.2.2+security-01 name: grafana-datasources namespace: monitoring stringData: diff --git a/manifests/grafana-dashboardDefinitions.yaml b/manifests/grafana-dashboardDefinitions.yaml index 9609677b2a..7e1628fce6 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: 11.2.1 + app.kubernetes.io/version: 11.2.2+security-01 name: grafana-dashboard-alertmanager-overview namespace: monitoring - apiVersion: v1 @@ -1482,7 +1482,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 11.2.1 + app.kubernetes.io/version: 11.2.2+security-01 name: grafana-dashboard-apiserver namespace: monitoring - apiVersion: v1 @@ -2296,7 +2296,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 11.2.1 + app.kubernetes.io/version: 11.2.2+security-01 name: grafana-dashboard-cluster-total namespace: monitoring - apiVersion: v1 @@ -2900,7 +2900,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 11.2.1 + app.kubernetes.io/version: 11.2.2+security-01 name: grafana-dashboard-controller-manager namespace: monitoring - apiVersion: v1 @@ -3525,7 +3525,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 11.2.1 + app.kubernetes.io/version: 11.2.2+security-01 name: grafana-dashboard-grafana-overview namespace: monitoring - apiVersion: v1 @@ -5112,7 +5112,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 11.2.1 + app.kubernetes.io/version: 11.2.2+security-01 name: grafana-dashboard-k8s-resources-cluster namespace: monitoring - apiVersion: v1 @@ -5162,7 +5162,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "cluster:node_cpu:ratio_rate5m", + "expr": "sum(cluster:node_cpu:ratio_rate5m) / count(cluster:node_cpu:ratio_rate5m)", "instant": true } ], @@ -5753,7 +5753,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 11.2.1 + app.kubernetes.io/version: 11.2.2+security-01 name: grafana-dashboard-k8s-resources-multicluster namespace: monitoring - apiVersion: v1 @@ -6018,7 +6018,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "scalar(kube_resourcequota{cluster=\"$cluster\", namespace=\"$namespace\", type=\"hard\",resource=\"requests.cpu\"})", + "expr": "scalar(max(kube_resourcequota{cluster=\"$cluster\", namespace=\"$namespace\", type=\"hard\",resource=\"requests.cpu\"}))", "legendFormat": "quota - requests" }, { @@ -6026,7 +6026,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "scalar(kube_resourcequota{cluster=\"$cluster\", namespace=\"$namespace\", type=\"hard\",resource=\"limits.cpu\"})", + "expr": "scalar(max(kube_resourcequota{cluster=\"$cluster\", namespace=\"$namespace\", type=\"hard\",resource=\"limits.cpu\"}))", "legendFormat": "quota - limits" } ], @@ -6276,7 +6276,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "scalar(kube_resourcequota{cluster=\"$cluster\", namespace=\"$namespace\", type=\"hard\",resource=\"requests.memory\"})", + "expr": "scalar(max(kube_resourcequota{cluster=\"$cluster\", namespace=\"$namespace\", type=\"hard\",resource=\"requests.memory\"}))", "legendFormat": "quota - requests" }, { @@ -6284,7 +6284,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "scalar(kube_resourcequota{cluster=\"$cluster\", namespace=\"$namespace\", type=\"hard\",resource=\"limits.memory\"})", + "expr": "scalar(max(kube_resourcequota{cluster=\"$cluster\", namespace=\"$namespace\", type=\"hard\",resource=\"limits.memory\"}))", "legendFormat": "quota - limits" } ], @@ -7271,7 +7271,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 11.2.1 + app.kubernetes.io/version: 11.2.2+security-01 name: grafana-dashboard-k8s-resources-namespace namespace: monitoring - apiVersion: v1 @@ -7849,7 +7849,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 11.2.1 + app.kubernetes.io/version: 11.2.2+security-01 name: grafana-dashboard-k8s-resources-node namespace: monitoring - apiVersion: v1 @@ -9233,7 +9233,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 11.2.1 + app.kubernetes.io/version: 11.2.2+security-01 name: grafana-dashboard-k8s-resources-pod namespace: monitoring - apiVersion: v1 @@ -10299,7 +10299,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 11.2.1 + app.kubernetes.io/version: 11.2.2+security-01 name: grafana-dashboard-k8s-resources-workload namespace: monitoring - apiVersion: v1 @@ -10424,7 +10424,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "scalar(kube_resourcequota{cluster=\"$cluster\", namespace=\"$namespace\", type=\"hard\",resource=~\"requests.cpu|cpu\"})", + "expr": "scalar(max(kube_resourcequota{cluster=\"$cluster\", namespace=\"$namespace\", type=\"hard\",resource=~\"requests.cpu|cpu\"}))", "legendFormat": "quota - requests" }, { @@ -10432,7 +10432,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "scalar(kube_resourcequota{cluster=\"$cluster\", namespace=\"$namespace\", type=\"hard\",resource=~\"limits.cpu\"})", + "expr": "scalar(max(kube_resourcequota{cluster=\"$cluster\", namespace=\"$namespace\", type=\"hard\",resource=~\"limits.cpu\"}))", "legendFormat": "quota - limits" } ], @@ -10719,7 +10719,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "scalar(kube_resourcequota{cluster=\"$cluster\", namespace=\"$namespace\", type=\"hard\",resource=~\"requests.memory|memory\"})", + "expr": "scalar(max(kube_resourcequota{cluster=\"$cluster\", namespace=\"$namespace\", type=\"hard\",resource=~\"requests.memory|memory\"}))", "legendFormat": "quota - requests" }, { @@ -10727,7 +10727,7 @@ items: "type": "prometheus", "uid": "${datasource}" }, - "expr": "scalar(kube_resourcequota{cluster=\"$cluster\", namespace=\"$namespace\", type=\"hard\",resource=~\"limits.memory\"})", + "expr": "scalar(max(kube_resourcequota{cluster=\"$cluster\", namespace=\"$namespace\", type=\"hard\",resource=~\"limits.memory\"}))", "legendFormat": "quota - limits" } ], @@ -11562,7 +11562,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 11.2.1 + app.kubernetes.io/version: 11.2.2+security-01 name: grafana-dashboard-k8s-resources-workloads-namespace namespace: monitoring - apiVersion: v1 @@ -12815,7 +12815,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 11.2.1 + app.kubernetes.io/version: 11.2.2+security-01 name: grafana-dashboard-kubelet namespace: monitoring - apiVersion: v1 @@ -13453,7 +13453,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 11.2.1 + app.kubernetes.io/version: 11.2.2+security-01 name: grafana-dashboard-namespace-by-pod namespace: monitoring - apiVersion: v1 @@ -14249,7 +14249,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 11.2.1 + app.kubernetes.io/version: 11.2.2+security-01 name: grafana-dashboard-namespace-by-workload namespace: monitoring - apiVersion: v1 @@ -15302,7 +15302,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 11.2.1 + app.kubernetes.io/version: 11.2.2+security-01 name: grafana-dashboard-node-cluster-rsrc-use namespace: monitoring - apiVersion: v1 @@ -16381,7 +16381,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 11.2.1 + app.kubernetes.io/version: 11.2.2+security-01 name: grafana-dashboard-node-rsrc-use namespace: monitoring - apiVersion: v1 @@ -17449,7 +17449,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 11.2.1 + app.kubernetes.io/version: 11.2.2+security-01 name: grafana-dashboard-nodes-aix namespace: monitoring - apiVersion: v1 @@ -18538,7 +18538,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 11.2.1 + app.kubernetes.io/version: 11.2.2+security-01 name: grafana-dashboard-nodes-darwin namespace: monitoring - apiVersion: v1 @@ -19620,7 +19620,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 11.2.1 + app.kubernetes.io/version: 11.2.2+security-01 name: grafana-dashboard-nodes namespace: monitoring - apiVersion: v1 @@ -19942,7 +19942,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 11.2.1 + app.kubernetes.io/version: 11.2.2+security-01 name: grafana-dashboard-persistentvolumesusage namespace: monitoring - apiVersion: v1 @@ -20434,7 +20434,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 11.2.1 + app.kubernetes.io/version: 11.2.2+security-01 name: grafana-dashboard-pod-total namespace: monitoring - apiVersion: v1 @@ -22093,7 +22093,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 11.2.1 + app.kubernetes.io/version: 11.2.2+security-01 name: grafana-dashboard-prometheus-remote-write namespace: monitoring - apiVersion: v1 @@ -23334,7 +23334,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 11.2.1 + app.kubernetes.io/version: 11.2.2+security-01 name: grafana-dashboard-prometheus namespace: monitoring - apiVersion: v1 @@ -23989,7 +23989,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 11.2.1 + app.kubernetes.io/version: 11.2.2+security-01 name: grafana-dashboard-proxy namespace: monitoring - apiVersion: v1 @@ -24590,7 +24590,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 11.2.1 + app.kubernetes.io/version: 11.2.2+security-01 name: grafana-dashboard-scheduler namespace: monitoring - apiVersion: v1 @@ -25172,7 +25172,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 11.2.1 + app.kubernetes.io/version: 11.2.2+security-01 name: grafana-dashboard-workload-total namespace: monitoring kind: ConfigMapList diff --git a/manifests/grafana-dashboardSources.yaml b/manifests/grafana-dashboardSources.yaml index 23fb050b8c..625ad9e844 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: 11.2.1 + app.kubernetes.io/version: 11.2.2+security-01 name: grafana-dashboards namespace: monitoring diff --git a/manifests/grafana-deployment.yaml b/manifests/grafana-deployment.yaml index 3fa37230b4..9852039d22 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: 11.2.1 + app.kubernetes.io/version: 11.2.2+security-01 name: grafana namespace: monitoring spec: @@ -18,19 +18,19 @@ spec: template: metadata: annotations: - checksum/grafana-config: e12dc3d29f03df88bfe8e6fae64e5240 - checksum/grafana-dashboardproviders: e24c700dcef0abdf5b6f31ba292fa62b - checksum/grafana-datasources: 19a115373979a415c1a78985d1ba268b + checksum/grafana-config: 455fb709780e12e2d7a9c9049f8e3437 + checksum/grafana-dashboardproviders: 25e073795e8c365e1f5797b2c9b18eca + checksum/grafana-datasources: 03bc162bcf9eb588bf605d5b2a891f1b labels: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 11.2.1 + app.kubernetes.io/version: 11.2.2+security-01 spec: automountServiceAccountToken: false containers: - env: [] - image: grafana/grafana:11.2.1 + image: grafana/grafana:11.2.2+security-01 name: grafana ports: - containerPort: 3000 diff --git a/manifests/grafana-networkPolicy.yaml b/manifests/grafana-networkPolicy.yaml index 5dcc8da53e..bf78373f5d 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: 11.2.1 + app.kubernetes.io/version: 11.2.2+security-01 name: grafana namespace: monitoring spec: diff --git a/manifests/grafana-prometheusRule.yaml b/manifests/grafana-prometheusRule.yaml index 53f9400f2e..b31211faf8 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: 11.2.1 + app.kubernetes.io/version: 11.2.2+security-01 prometheus: k8s role: alert-rules name: grafana-rules diff --git a/manifests/grafana-service.yaml b/manifests/grafana-service.yaml index ddf6f94da5..19e17191aa 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: 11.2.1 + app.kubernetes.io/version: 11.2.2+security-01 name: grafana namespace: monitoring spec: diff --git a/manifests/grafana-serviceAccount.yaml b/manifests/grafana-serviceAccount.yaml index 4723297436..eeaec43c61 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: 11.2.1 + app.kubernetes.io/version: 11.2.2+security-01 name: grafana namespace: monitoring diff --git a/manifests/grafana-serviceMonitor.yaml b/manifests/grafana-serviceMonitor.yaml index 1187be8dcd..37d5de5eb4 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: 11.2.1 + app.kubernetes.io/version: 11.2.2+security-01 name: grafana namespace: monitoring spec: diff --git a/manifests/kubernetesControlPlane-prometheusRule.yaml b/manifests/kubernetesControlPlane-prometheusRule.yaml index 03640c2f29..93c39cf000 100644 --- a/manifests/kubernetesControlPlane-prometheusRule.yaml +++ b/manifests/kubernetesControlPlane-prometheusRule.yaml @@ -772,18 +772,18 @@ spec: labels: verb: write record: code:apiserver_request_total:increase30d - - expr: | - sum by (cluster, verb, scope) (increase(apiserver_request_sli_duration_seconds_count{job="apiserver"}[1h])) - record: cluster_verb_scope:apiserver_request_sli_duration_seconds_count:increase1h - - expr: | - sum by (cluster, verb, scope) (avg_over_time(cluster_verb_scope:apiserver_request_sli_duration_seconds_count:increase1h[30d]) * 24 * 30) - record: cluster_verb_scope:apiserver_request_sli_duration_seconds_count:increase30d - expr: | sum by (cluster, verb, scope, le) (increase(apiserver_request_sli_duration_seconds_bucket[1h])) record: cluster_verb_scope_le:apiserver_request_sli_duration_seconds_bucket:increase1h - expr: | sum by (cluster, verb, scope, le) (avg_over_time(cluster_verb_scope_le:apiserver_request_sli_duration_seconds_bucket:increase1h[30d]) * 24 * 30) record: cluster_verb_scope_le:apiserver_request_sli_duration_seconds_bucket:increase30d + - expr: | + sum by (cluster, verb, scope) (cluster_verb_scope_le:apiserver_request_sli_duration_seconds_bucket:increase1h{le="+Inf"}) + record: cluster_verb_scope:apiserver_request_sli_duration_seconds_count:increase1h + - expr: | + sum by (cluster, verb, scope) (cluster_verb_scope_le:apiserver_request_sli_duration_seconds_bucket:increase30d{le="+Inf"} * 24 * 30) + record: cluster_verb_scope:apiserver_request_sli_duration_seconds_count:increase30d - expr: | 1 - ( ( diff --git a/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml b/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml index 1611f829ca..09b320ad9c 100644 --- a/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml +++ b/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.3 + controller-gen.kubebuilder.io/version: v0.16.4 operator.prometheus.io/version: 0.77.1 name: alertmanagerconfigs.monitoring.coreos.com spec: diff --git a/manifests/setup/0alertmanagerCustomResourceDefinition.yaml b/manifests/setup/0alertmanagerCustomResourceDefinition.yaml index 1415af637b..9e49381847 100644 --- a/manifests/setup/0alertmanagerCustomResourceDefinition.yaml +++ b/manifests/setup/0alertmanagerCustomResourceDefinition.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.3 + controller-gen.kubebuilder.io/version: v0.16.4 operator.prometheus.io/version: 0.77.1 name: alertmanagers.monitoring.coreos.com spec: diff --git a/manifests/setup/0podmonitorCustomResourceDefinition.yaml b/manifests/setup/0podmonitorCustomResourceDefinition.yaml index 931a3ca4a9..339cda2ea1 100644 --- a/manifests/setup/0podmonitorCustomResourceDefinition.yaml +++ b/manifests/setup/0podmonitorCustomResourceDefinition.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.3 + controller-gen.kubebuilder.io/version: v0.16.4 operator.prometheus.io/version: 0.77.1 name: podmonitors.monitoring.coreos.com spec: diff --git a/manifests/setup/0probeCustomResourceDefinition.yaml b/manifests/setup/0probeCustomResourceDefinition.yaml index 34ac4143bb..88c966356e 100644 --- a/manifests/setup/0probeCustomResourceDefinition.yaml +++ b/manifests/setup/0probeCustomResourceDefinition.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.3 + controller-gen.kubebuilder.io/version: v0.16.4 operator.prometheus.io/version: 0.77.1 name: probes.monitoring.coreos.com spec: diff --git a/manifests/setup/0prometheusCustomResourceDefinition.yaml b/manifests/setup/0prometheusCustomResourceDefinition.yaml index 1634023bcc..c876d3765c 100644 --- a/manifests/setup/0prometheusCustomResourceDefinition.yaml +++ b/manifests/setup/0prometheusCustomResourceDefinition.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.3 + controller-gen.kubebuilder.io/version: v0.16.4 operator.prometheus.io/version: 0.77.1 name: prometheuses.monitoring.coreos.com spec: @@ -3697,7 +3697,8 @@ spec: it (https://kubernetes.io/docs/concepts/configuration/overview/). When hostNetwork is enabled, this will set the DNS policy to - `ClusterFirstWithHostNet` automatically. + `ClusterFirstWithHostNet` automatically (unless `.spec.DNSPolicy` is set + to a different value). type: boolean ignoreNamespaceSelectors: description: |- @@ -5214,7 +5215,7 @@ spec: otlp: description: |- Settings related to the OTLP receiver feature. - It requires Prometheus >= v2.54.0. + It requires Prometheus >= v2.55.0. properties: promoteResourceAttributes: description: List of OpenTelemetry Attributes that should be promoted to metric labels, defaults to none. @@ -7484,6 +7485,17 @@ spec: type: string type: object type: object + runtime: + description: RuntimeConfig configures the values for the Prometheus process behavior + properties: + goGC: + description: |- + The Go garbage collection target percentage. Lowering this number may increase the CPU usage. + See: https://tip.golang.org/doc/gc-guide#GOGC + format: int32 + minimum: -1 + type: integer + type: object sampleLimit: description: |- SampleLimit defines per-scrape limit on number of scraped samples that will be accepted. diff --git a/manifests/setup/0prometheusagentCustomResourceDefinition.yaml b/manifests/setup/0prometheusagentCustomResourceDefinition.yaml index d1744ae389..60b7394032 100644 --- a/manifests/setup/0prometheusagentCustomResourceDefinition.yaml +++ b/manifests/setup/0prometheusagentCustomResourceDefinition.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.3 + controller-gen.kubebuilder.io/version: v0.16.4 operator.prometheus.io/version: 0.77.1 name: prometheusagents.monitoring.coreos.com spec: @@ -3021,7 +3021,8 @@ spec: it (https://kubernetes.io/docs/concepts/configuration/overview/). When hostNetwork is enabled, this will set the DNS policy to - `ClusterFirstWithHostNet` automatically. + `ClusterFirstWithHostNet` automatically (unless `.spec.DNSPolicy` is set + to a different value). type: boolean ignoreNamespaceSelectors: description: |- @@ -4548,7 +4549,7 @@ spec: otlp: description: |- Settings related to the OTLP receiver feature. - It requires Prometheus >= v2.54.0. + It requires Prometheus >= v2.55.0. properties: promoteResourceAttributes: description: List of OpenTelemetry Attributes that should be promoted to metric labels, defaults to none. diff --git a/manifests/setup/0prometheusruleCustomResourceDefinition.yaml b/manifests/setup/0prometheusruleCustomResourceDefinition.yaml index 0295845713..8545316aa5 100644 --- a/manifests/setup/0prometheusruleCustomResourceDefinition.yaml +++ b/manifests/setup/0prometheusruleCustomResourceDefinition.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.3 + controller-gen.kubebuilder.io/version: v0.16.4 operator.prometheus.io/version: 0.77.1 name: prometheusrules.monitoring.coreos.com spec: diff --git a/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml b/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml index 1d9cd28d20..02719afcb5 100644 --- a/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml +++ b/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.3 + controller-gen.kubebuilder.io/version: v0.16.4 operator.prometheus.io/version: 0.77.1 name: scrapeconfigs.monitoring.coreos.com spec: @@ -10457,9 +10457,15 @@ spec: targets: description: List of targets for this static configuration. items: - description: Target represents a target for Prometheus to scrape + description: |- + Target represents a target for Prometheus to scrape + kubebuilder:validation:MinLength:=1 type: string + minItems: 1 type: array + x-kubernetes-list-type: set + required: + - targets type: object type: array targetLimit: diff --git a/manifests/setup/0servicemonitorCustomResourceDefinition.yaml b/manifests/setup/0servicemonitorCustomResourceDefinition.yaml index 4fc36e9da3..43e3d12240 100644 --- a/manifests/setup/0servicemonitorCustomResourceDefinition.yaml +++ b/manifests/setup/0servicemonitorCustomResourceDefinition.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.3 + controller-gen.kubebuilder.io/version: v0.16.4 operator.prometheus.io/version: 0.77.1 name: servicemonitors.monitoring.coreos.com spec: diff --git a/manifests/setup/0thanosrulerCustomResourceDefinition.yaml b/manifests/setup/0thanosrulerCustomResourceDefinition.yaml index 22127f9363..5761f83da0 100644 --- a/manifests/setup/0thanosrulerCustomResourceDefinition.yaml +++ b/manifests/setup/0thanosrulerCustomResourceDefinition.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.3 + controller-gen.kubebuilder.io/version: v0.16.4 operator.prometheus.io/version: 0.77.1 name: thanosrulers.monitoring.coreos.com spec: