From 9286a5e7dea8c802045dc5aba06356fbcff7056b Mon Sep 17 00:00:00 2001 From: PromOperatorBot <85787986+prom-op-bot@users.noreply.github.com> Date: Mon, 15 May 2023 12:32:29 +0200 Subject: [PATCH] [bot] [main] Automated version update (#2111) Co-authored-by: Prometheus Operator Bot --- jsonnet/kube-prometheus/versions.json | 4 +- jsonnetfile.lock.json | 28 +-- kustomization.yaml | 1 + 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 +- .../kubeStateMetrics-prometheusRule.yaml | 14 +- manifests/nodeExporter-prometheusRule.yaml | 2 +- manifests/prometheus-clusterRole.yaml | 2 +- manifests/prometheus-clusterRoleBinding.yaml | 2 +- manifests/prometheus-networkPolicy.yaml | 2 +- manifests/prometheus-podDisruptionBudget.yaml | 2 +- manifests/prometheus-prometheus.yaml | 8 +- manifests/prometheus-prometheusRule.yaml | 2 +- manifests/prometheus-roleBindingConfig.yaml | 2 +- ...metheus-roleBindingSpecificNamespaces.yaml | 6 +- manifests/prometheus-roleConfig.yaml | 2 +- .../prometheus-roleSpecificNamespaces.yaml | 6 +- manifests/prometheus-service.yaml | 2 +- manifests/prometheus-serviceAccount.yaml | 2 +- manifests/prometheus-serviceMonitor.yaml | 2 +- ...0alertmanagerCustomResourceDefinition.yaml | 3 + .../0prometheusCustomResourceDefinition.yaml | 3 + ...ometheusagentCustomResourceDefinition.yaml | 3 + ...0scrapeconfigCustomResourceDefinition.yaml | 166 ++++++++++++++++++ .../0thanosrulerCustomResourceDefinition.yaml | 28 +++ 33 files changed, 287 insertions(+), 83 deletions(-) create mode 100644 manifests/setup/0scrapeconfigCustomResourceDefinition.yaml diff --git a/jsonnet/kube-prometheus/versions.json b/jsonnet/kube-prometheus/versions.json index 8d16a14784..bd02857ec6 100644 --- a/jsonnet/kube-prometheus/versions.json +++ b/jsonnet/kube-prometheus/versions.json @@ -1,10 +1,10 @@ { "alertmanager": "0.25.0", "blackboxExporter": "0.23.0", - "grafana": "9.5.1", + "grafana": "9.5.2", "kubeStateMetrics": "2.8.2", "nodeExporter": "1.5.0", - "prometheus": "2.43.1", + "prometheus": "2.44.0", "prometheusAdapter": "0.10.0", "prometheusOperator": "0.65.1", "kubeRbacProxy": "0.14.1", diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json index 0861e5f081..7ae8bfa79e 100644 --- a/jsonnetfile.lock.json +++ b/jsonnetfile.lock.json @@ -18,7 +18,7 @@ "subdir": "contrib/mixin" } }, - "version": "0a7dd2186bb9a3d49724a5aa2f124c6230e0018c", + "version": "05ed91d76d17bb454237b6b0b50e63ac61f98ba2", "sum": "QTzBqwjnM6cGGVBhOiVJyA+ZVTkmCTuH6C6YW7XKRFw=" }, { @@ -58,7 +58,7 @@ "subdir": "grafana-builder" } }, - "version": "d303b2031264728728dd1e1c05f74f67027139f6", + "version": "e8e0f6f536f3397a22a49bd9014a7e0a1dfa151d", "sum": "tDR6yT2GVfw0wTU12iZH+m01HrbIr6g/xN+/8nzNkU0=" }, { @@ -78,7 +78,7 @@ "subdir": "jsonnet/kube-state-metrics" } }, - "version": "eb45f33a1eb9ba2b51d0677471f54bf211f2328e", + "version": "3b95dd1cf0822342d09408c444e6b1954352084b", "sum": "+dOzAK+fwsFf97uZpjcjTcEJEC1H8hh/j8f5uIQK/5g=" }, { @@ -88,8 +88,8 @@ "subdir": "jsonnet/kube-state-metrics-mixin" } }, - "version": "eb45f33a1eb9ba2b51d0677471f54bf211f2328e", - "sum": "u8gaydJoxEjzizQ8jY8xSjYgWooPmxw+wIWdDxifMAk=" + "version": "3b95dd1cf0822342d09408c444e6b1954352084b", + "sum": "qclI7LwucTjBef3PkGBkKxF0mfZPbHnn4rlNWKGtR4c=" }, { "source": { @@ -98,8 +98,8 @@ "subdir": "jsonnet/mixin" } }, - "version": "730d9d524d569dc0c5c83c2c12daf22d68ebe53e", - "sum": "GQmaVFJwKMiD/P4n3N2LrAZVcwutriWrP8joclDtBYQ=", + "version": "e8841ea9546b08693aefbb945bfebc11c8b33186", + "sum": "n3flMIzlADeyygb0uipZ4KPp2uNSjdtkrwgHjTC7Ca4=", "name": "prometheus-operator-mixin" }, { @@ -109,8 +109,8 @@ "subdir": "jsonnet/prometheus-operator" } }, - "version": "730d9d524d569dc0c5c83c2c12daf22d68ebe53e", - "sum": "SRfEucGBVUqm5KJ0cx5LyMJ4r5/MCrEHpxJkueQXCc8=" + "version": "e8841ea9546b08693aefbb945bfebc11c8b33186", + "sum": "cNcVEO+LVAJK7fGxfL8RAIo/G/9ZU/ZUhCzUpdcgytc=" }, { "source": { @@ -119,7 +119,7 @@ "subdir": "doc/alertmanager-mixin" } }, - "version": "9de8ef36755298a68b6ab20244d4369d38bdea99", + "version": "f67d03fe2854191bb36dbcb305ec507237583aa2", "sum": "PsK+V7oETCPKu2gLoPfqY0wwPKH9TzhNj6o2xezjjXc=", "name": "alertmanager" }, @@ -130,8 +130,8 @@ "subdir": "docs/node-mixin" } }, - "version": "c8129fadd660ae90598b84791d8915a995a27815", - "sum": "TwdaTm0Z++diiLyaKAAimmC6hBL7XbrJc0RHhBCpAdU=" + "version": "184a4e0893dd5c28e540ca3070f2e3a07f939f11", + "sum": "aFUI56y6Y8EpniS4cfYqrSaHFnxeomIw4S4+Sz8yPtQ=" }, { "source": { @@ -140,7 +140,7 @@ "subdir": "documentation/prometheus-mixin" } }, - "version": "f5fcaa3872ce03808567fabc56afc9cf61c732cb", + "version": "b727e69b7601b069ded5c34348dca41b80988f4b", "sum": "LRx0tbMnoE1p8KEn+i81j2YsA5Sgt3itE5Y6jBf5eOQ=", "name": "prometheus" }, @@ -161,7 +161,7 @@ "subdir": "mixin" } }, - "version": "9d0562bf95fb0bf70ce89e2b7f88f817fdb1e9a1", + "version": "cdb395a7100be554e804d61c735b8d4a4b678f11", "sum": "zSLNV/0bN4DcVKojzCqjmhfjtzTY4pDKZXqbAUzw5R0=", "name": "thanos-mixin" }, diff --git a/kustomization.yaml b/kustomization.yaml index 29c39ade44..e0d8039ed7 100644 --- a/kustomization.yaml +++ b/kustomization.yaml @@ -92,6 +92,7 @@ resources: - ./manifests/setup/0prometheusCustomResourceDefinition.yaml - ./manifests/setup/0prometheusagentCustomResourceDefinition.yaml - ./manifests/setup/0prometheusruleCustomResourceDefinition.yaml +- ./manifests/setup/0scrapeconfigCustomResourceDefinition.yaml - ./manifests/setup/0servicemonitorCustomResourceDefinition.yaml - ./manifests/setup/0thanosrulerCustomResourceDefinition.yaml - ./manifests/setup/namespace.yaml diff --git a/manifests/grafana-config.yaml b/manifests/grafana-config.yaml index f065cc13e8..84312a36c3 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.5.1 + app.kubernetes.io/version: 9.5.2 name: grafana-config namespace: monitoring stringData: diff --git a/manifests/grafana-dashboardDatasources.yaml b/manifests/grafana-dashboardDatasources.yaml index 8cbde81948..a3d015d342 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.5.1 + app.kubernetes.io/version: 9.5.2 name: grafana-datasources namespace: monitoring stringData: diff --git a/manifests/grafana-dashboardDefinitions.yaml b/manifests/grafana-dashboardDefinitions.yaml index 7737c2079b..3aa24a3fbb 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.5.1 + app.kubernetes.io/version: 9.5.2 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.5.1 + app.kubernetes.io/version: 9.5.2 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.5.1 + app.kubernetes.io/version: 9.5.2 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.5.1 + app.kubernetes.io/version: 9.5.2 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.5.1 + app.kubernetes.io/version: 9.5.2 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.5.1 + app.kubernetes.io/version: 9.5.2 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.5.1 + app.kubernetes.io/version: 9.5.2 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.5.1 + app.kubernetes.io/version: 9.5.2 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.5.1 + app.kubernetes.io/version: 9.5.2 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.5.1 + app.kubernetes.io/version: 9.5.2 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.5.1 + app.kubernetes.io/version: 9.5.2 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.5.1 + app.kubernetes.io/version: 9.5.2 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.5.1 + app.kubernetes.io/version: 9.5.2 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.5.1 + app.kubernetes.io/version: 9.5.2 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.5.1 + app.kubernetes.io/version: 9.5.2 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.5.1 + app.kubernetes.io/version: 9.5.2 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.5.1 + app.kubernetes.io/version: 9.5.2 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.5.1 + app.kubernetes.io/version: 9.5.2 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.5.1 + app.kubernetes.io/version: 9.5.2 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.5.1 + app.kubernetes.io/version: 9.5.2 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.5.1 + app.kubernetes.io/version: 9.5.2 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.5.1 + app.kubernetes.io/version: 9.5.2 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.5.1 + app.kubernetes.io/version: 9.5.2 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.5.1 + app.kubernetes.io/version: 9.5.2 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.5.1 + app.kubernetes.io/version: 9.5.2 name: grafana-dashboard-workload-total namespace: monitoring kind: ConfigMapList diff --git a/manifests/grafana-dashboardSources.yaml b/manifests/grafana-dashboardSources.yaml index d396af6c4a..10626de335 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.5.1 + app.kubernetes.io/version: 9.5.2 name: grafana-dashboards namespace: monitoring diff --git a/manifests/grafana-deployment.yaml b/manifests/grafana-deployment.yaml index 49074ccb7b..3adbfdbe70 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.5.1 + app.kubernetes.io/version: 9.5.2 name: grafana namespace: monitoring spec: @@ -18,19 +18,19 @@ spec: template: metadata: annotations: - checksum/grafana-config: f805a0d1e7014f25b3f279b441f7ddb6 - checksum/grafana-dashboardproviders: 2a8ea760174905071284a3ef78c00713 - checksum/grafana-datasources: cf58daa2c3fa7a806fe54170c2cca6c4 + checksum/grafana-config: f6c93c986d2c50845c10914e382be89d + checksum/grafana-dashboardproviders: d745af05a8a365888f1900debe97c976 + checksum/grafana-datasources: ce571e301f5c58c0119e126342cdf81c labels: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 9.5.1 + app.kubernetes.io/version: 9.5.2 spec: automountServiceAccountToken: false containers: - env: [] - image: grafana/grafana:9.5.1 + image: grafana/grafana:9.5.2 name: grafana ports: - containerPort: 3000 diff --git a/manifests/grafana-networkPolicy.yaml b/manifests/grafana-networkPolicy.yaml index 3801fca08e..7fef158d0f 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.5.1 + app.kubernetes.io/version: 9.5.2 name: grafana namespace: monitoring spec: diff --git a/manifests/grafana-prometheusRule.yaml b/manifests/grafana-prometheusRule.yaml index c40a6a9680..03618a714a 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.5.1 + app.kubernetes.io/version: 9.5.2 prometheus: k8s role: alert-rules name: grafana-rules diff --git a/manifests/grafana-service.yaml b/manifests/grafana-service.yaml index c861f9f720..8baf8a1662 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.5.1 + app.kubernetes.io/version: 9.5.2 name: grafana namespace: monitoring spec: diff --git a/manifests/grafana-serviceAccount.yaml b/manifests/grafana-serviceAccount.yaml index 7d84acdebb..1962c94502 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.5.1 + app.kubernetes.io/version: 9.5.2 name: grafana namespace: monitoring diff --git a/manifests/grafana-serviceMonitor.yaml b/manifests/grafana-serviceMonitor.yaml index b8d89012f9..3569e65654 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.5.1 + app.kubernetes.io/version: 9.5.2 name: grafana namespace: monitoring spec: diff --git a/manifests/kubeStateMetrics-prometheusRule.yaml b/manifests/kubeStateMetrics-prometheusRule.yaml index e7286b197e..31f7676b8e 100644 --- a/manifests/kubeStateMetrics-prometheusRule.yaml +++ b/manifests/kubeStateMetrics-prometheusRule.yaml @@ -20,9 +20,9 @@ spec: runbook_url: https://runbooks.prometheus-operator.dev/runbooks/kube-state-metrics/kubestatemetricslisterrors summary: kube-state-metrics is experiencing errors in list operations. expr: | - (sum(rate(kube_state_metrics_list_total{job="kube-state-metrics",result="error"}[5m])) + (sum(rate(kube_state_metrics_list_total{job="kube-state-metrics",result="error"}[5m])) by (cluster) / - sum(rate(kube_state_metrics_list_total{job="kube-state-metrics"}[5m]))) + sum(rate(kube_state_metrics_list_total{job="kube-state-metrics"}[5m])) by (cluster)) > 0.01 for: 15m labels: @@ -33,9 +33,9 @@ spec: runbook_url: https://runbooks.prometheus-operator.dev/runbooks/kube-state-metrics/kubestatemetricswatcherrors summary: kube-state-metrics is experiencing errors in watch operations. expr: | - (sum(rate(kube_state_metrics_watch_total{job="kube-state-metrics",result="error"}[5m])) + (sum(rate(kube_state_metrics_watch_total{job="kube-state-metrics",result="error"}[5m])) by (cluster) / - sum(rate(kube_state_metrics_watch_total{job="kube-state-metrics"}[5m]))) + sum(rate(kube_state_metrics_watch_total{job="kube-state-metrics"}[5m])) by (cluster)) > 0.01 for: 15m labels: @@ -46,7 +46,7 @@ spec: runbook_url: https://runbooks.prometheus-operator.dev/runbooks/kube-state-metrics/kubestatemetricsshardingmismatch summary: kube-state-metrics sharding is misconfigured. expr: | - stdvar (kube_state_metrics_total_shards{job="kube-state-metrics"}) != 0 + stdvar (kube_state_metrics_total_shards{job="kube-state-metrics"}) by (cluster) != 0 for: 15m labels: severity: critical @@ -56,9 +56,9 @@ spec: runbook_url: https://runbooks.prometheus-operator.dev/runbooks/kube-state-metrics/kubestatemetricsshardsmissing summary: kube-state-metrics shards are missing. expr: | - 2^max(kube_state_metrics_total_shards{job="kube-state-metrics"}) - 1 + 2^max(kube_state_metrics_total_shards{job="kube-state-metrics"}) by (cluster) - 1 - - sum( 2 ^ max by (shard_ordinal) (kube_state_metrics_shard_ordinal{job="kube-state-metrics"}) ) + sum( 2 ^ max by (cluster, shard_ordinal) (kube_state_metrics_shard_ordinal{job="kube-state-metrics"}) ) by (cluster) != 0 for: 15m labels: diff --git a/manifests/nodeExporter-prometheusRule.yaml b/manifests/nodeExporter-prometheusRule.yaml index 5e5e52c15f..9835aeef43 100644 --- a/manifests/nodeExporter-prometheusRule.yaml +++ b/manifests/nodeExporter-prometheusRule.yaml @@ -174,7 +174,7 @@ spec: severity: warning - alert: NodeClockSkewDetected annotations: - description: Clock on {{ $labels.instance }} is out of sync by more than 300s. Ensure NTP is configured correctly on this host. + description: Clock on {{ $labels.instance }} is out of sync by more than 0.05s. Ensure NTP is configured correctly on this host. runbook_url: https://runbooks.prometheus-operator.dev/runbooks/node/nodeclockskewdetected summary: Clock skew detected. expr: | diff --git a/manifests/prometheus-clusterRole.yaml b/manifests/prometheus-clusterRole.yaml index 33db956b2c..5b67f6ea35 100644 --- a/manifests/prometheus-clusterRole.yaml +++ b/manifests/prometheus-clusterRole.yaml @@ -6,7 +6,7 @@ metadata: app.kubernetes.io/instance: k8s app.kubernetes.io/name: prometheus app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 2.43.1 + app.kubernetes.io/version: 2.44.0 name: prometheus-k8s rules: - apiGroups: diff --git a/manifests/prometheus-clusterRoleBinding.yaml b/manifests/prometheus-clusterRoleBinding.yaml index b4537ccdb9..343a66754a 100644 --- a/manifests/prometheus-clusterRoleBinding.yaml +++ b/manifests/prometheus-clusterRoleBinding.yaml @@ -6,7 +6,7 @@ metadata: app.kubernetes.io/instance: k8s app.kubernetes.io/name: prometheus app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 2.43.1 + app.kubernetes.io/version: 2.44.0 name: prometheus-k8s roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/manifests/prometheus-networkPolicy.yaml b/manifests/prometheus-networkPolicy.yaml index 996308d2d8..3314f6acca 100644 --- a/manifests/prometheus-networkPolicy.yaml +++ b/manifests/prometheus-networkPolicy.yaml @@ -6,7 +6,7 @@ metadata: app.kubernetes.io/instance: k8s app.kubernetes.io/name: prometheus app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 2.43.1 + app.kubernetes.io/version: 2.44.0 name: prometheus-k8s namespace: monitoring spec: diff --git a/manifests/prometheus-podDisruptionBudget.yaml b/manifests/prometheus-podDisruptionBudget.yaml index 96cee60ac3..e22644e255 100644 --- a/manifests/prometheus-podDisruptionBudget.yaml +++ b/manifests/prometheus-podDisruptionBudget.yaml @@ -6,7 +6,7 @@ metadata: app.kubernetes.io/instance: k8s app.kubernetes.io/name: prometheus app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 2.43.1 + app.kubernetes.io/version: 2.44.0 name: prometheus-k8s namespace: monitoring spec: diff --git a/manifests/prometheus-prometheus.yaml b/manifests/prometheus-prometheus.yaml index b2c2f617ea..2939d0cc14 100644 --- a/manifests/prometheus-prometheus.yaml +++ b/manifests/prometheus-prometheus.yaml @@ -6,7 +6,7 @@ metadata: app.kubernetes.io/instance: k8s app.kubernetes.io/name: prometheus app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 2.43.1 + app.kubernetes.io/version: 2.44.0 name: k8s namespace: monitoring spec: @@ -18,7 +18,7 @@ spec: port: web enableFeatures: [] externalLabels: {} - image: quay.io/prometheus/prometheus:v2.43.1 + image: quay.io/prometheus/prometheus:v2.44.0 nodeSelector: kubernetes.io/os: linux podMetadata: @@ -27,7 +27,7 @@ spec: app.kubernetes.io/instance: k8s app.kubernetes.io/name: prometheus app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 2.43.1 + app.kubernetes.io/version: 2.44.0 podMonitorNamespaceSelector: {} podMonitorSelector: {} probeNamespaceSelector: {} @@ -45,4 +45,4 @@ spec: serviceAccountName: prometheus-k8s serviceMonitorNamespaceSelector: {} serviceMonitorSelector: {} - version: 2.43.1 + version: 2.44.0 diff --git a/manifests/prometheus-prometheusRule.yaml b/manifests/prometheus-prometheusRule.yaml index d95c2a67af..5fd4d48ca8 100644 --- a/manifests/prometheus-prometheusRule.yaml +++ b/manifests/prometheus-prometheusRule.yaml @@ -6,7 +6,7 @@ metadata: app.kubernetes.io/instance: k8s app.kubernetes.io/name: prometheus app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 2.43.1 + app.kubernetes.io/version: 2.44.0 prometheus: k8s role: alert-rules name: prometheus-k8s-prometheus-rules diff --git a/manifests/prometheus-roleBindingConfig.yaml b/manifests/prometheus-roleBindingConfig.yaml index 377815bf46..f3b1631182 100644 --- a/manifests/prometheus-roleBindingConfig.yaml +++ b/manifests/prometheus-roleBindingConfig.yaml @@ -6,7 +6,7 @@ metadata: app.kubernetes.io/instance: k8s app.kubernetes.io/name: prometheus app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 2.43.1 + app.kubernetes.io/version: 2.44.0 name: prometheus-k8s-config namespace: monitoring roleRef: diff --git a/manifests/prometheus-roleBindingSpecificNamespaces.yaml b/manifests/prometheus-roleBindingSpecificNamespaces.yaml index 844037dcb9..3c428d0832 100644 --- a/manifests/prometheus-roleBindingSpecificNamespaces.yaml +++ b/manifests/prometheus-roleBindingSpecificNamespaces.yaml @@ -8,7 +8,7 @@ items: app.kubernetes.io/instance: k8s app.kubernetes.io/name: prometheus app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 2.43.1 + app.kubernetes.io/version: 2.44.0 name: prometheus-k8s namespace: default roleRef: @@ -27,7 +27,7 @@ items: app.kubernetes.io/instance: k8s app.kubernetes.io/name: prometheus app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 2.43.1 + app.kubernetes.io/version: 2.44.0 name: prometheus-k8s namespace: kube-system roleRef: @@ -46,7 +46,7 @@ items: app.kubernetes.io/instance: k8s app.kubernetes.io/name: prometheus app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 2.43.1 + app.kubernetes.io/version: 2.44.0 name: prometheus-k8s namespace: monitoring roleRef: diff --git a/manifests/prometheus-roleConfig.yaml b/manifests/prometheus-roleConfig.yaml index 8c351489c4..c8828f6bab 100644 --- a/manifests/prometheus-roleConfig.yaml +++ b/manifests/prometheus-roleConfig.yaml @@ -6,7 +6,7 @@ metadata: app.kubernetes.io/instance: k8s app.kubernetes.io/name: prometheus app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 2.43.1 + app.kubernetes.io/version: 2.44.0 name: prometheus-k8s-config namespace: monitoring rules: diff --git a/manifests/prometheus-roleSpecificNamespaces.yaml b/manifests/prometheus-roleSpecificNamespaces.yaml index 620d0bbfd9..97b70325ef 100644 --- a/manifests/prometheus-roleSpecificNamespaces.yaml +++ b/manifests/prometheus-roleSpecificNamespaces.yaml @@ -8,7 +8,7 @@ items: app.kubernetes.io/instance: k8s app.kubernetes.io/name: prometheus app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 2.43.1 + app.kubernetes.io/version: 2.44.0 name: prometheus-k8s namespace: default rules: @@ -46,7 +46,7 @@ items: app.kubernetes.io/instance: k8s app.kubernetes.io/name: prometheus app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 2.43.1 + app.kubernetes.io/version: 2.44.0 name: prometheus-k8s namespace: kube-system rules: @@ -84,7 +84,7 @@ items: app.kubernetes.io/instance: k8s app.kubernetes.io/name: prometheus app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 2.43.1 + app.kubernetes.io/version: 2.44.0 name: prometheus-k8s namespace: monitoring rules: diff --git a/manifests/prometheus-service.yaml b/manifests/prometheus-service.yaml index 281354143d..50fffbc784 100644 --- a/manifests/prometheus-service.yaml +++ b/manifests/prometheus-service.yaml @@ -6,7 +6,7 @@ metadata: app.kubernetes.io/instance: k8s app.kubernetes.io/name: prometheus app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 2.43.1 + app.kubernetes.io/version: 2.44.0 name: prometheus-k8s namespace: monitoring spec: diff --git a/manifests/prometheus-serviceAccount.yaml b/manifests/prometheus-serviceAccount.yaml index 2295101bc9..f2ac3c9e68 100644 --- a/manifests/prometheus-serviceAccount.yaml +++ b/manifests/prometheus-serviceAccount.yaml @@ -7,6 +7,6 @@ metadata: app.kubernetes.io/instance: k8s app.kubernetes.io/name: prometheus app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 2.43.1 + app.kubernetes.io/version: 2.44.0 name: prometheus-k8s namespace: monitoring diff --git a/manifests/prometheus-serviceMonitor.yaml b/manifests/prometheus-serviceMonitor.yaml index 0dbe6c6fef..8eded28c6d 100644 --- a/manifests/prometheus-serviceMonitor.yaml +++ b/manifests/prometheus-serviceMonitor.yaml @@ -6,7 +6,7 @@ metadata: app.kubernetes.io/instance: k8s app.kubernetes.io/name: prometheus app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 2.43.1 + app.kubernetes.io/version: 2.44.0 name: prometheus-k8s namespace: monitoring spec: diff --git a/manifests/setup/0alertmanagerCustomResourceDefinition.yaml b/manifests/setup/0alertmanagerCustomResourceDefinition.yaml index 21c35520ad..2a65e5f72e 100644 --- a/manifests/setup/0alertmanagerCustomResourceDefinition.yaml +++ b/manifests/setup/0alertmanagerCustomResourceDefinition.yaml @@ -906,6 +906,9 @@ spec: - key type: object x-kubernetes-map-type: atomic + pagerdutyUrl: + description: The default Pagerduty URL. + type: string resolveTimeout: description: ResolveTimeout is the default value used by alertmanager if the alert does not include EndsAt, after this time passes it can declare the alert as resolved if it has not been updated. This has no impact on alerts from Prometheus, as they always include EndsAt. pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$ diff --git a/manifests/setup/0prometheusCustomResourceDefinition.yaml b/manifests/setup/0prometheusCustomResourceDefinition.yaml index c07abdbbb4..0280022f8c 100644 --- a/manifests/setup/0prometheusCustomResourceDefinition.yaml +++ b/manifests/setup/0prometheusCustomResourceDefinition.yaml @@ -3516,6 +3516,9 @@ spec: sendExemplars: description: Enables sending of exemplars over remote write. Note that exemplar-storage itself must be enabled using the enableFeature option for exemplars to be scraped in the first place. Only valid in Prometheus versions 2.27.0 and newer. type: boolean + sendNativeHistograms: + description: Enables sending of native histograms, also known as sparse histograms over remote write. Only valid in Prometheus versions 2.40.0 and newer. + type: boolean sigv4: description: Sigv4 allows to configures AWS's Signature Verification 4 properties: diff --git a/manifests/setup/0prometheusagentCustomResourceDefinition.yaml b/manifests/setup/0prometheusagentCustomResourceDefinition.yaml index 61633d6280..92cd8fc970 100644 --- a/manifests/setup/0prometheusagentCustomResourceDefinition.yaml +++ b/manifests/setup/0prometheusagentCustomResourceDefinition.yaml @@ -2919,6 +2919,9 @@ spec: sendExemplars: description: Enables sending of exemplars over remote write. Note that exemplar-storage itself must be enabled using the enableFeature option for exemplars to be scraped in the first place. Only valid in Prometheus versions 2.27.0 and newer. type: boolean + sendNativeHistograms: + description: Enables sending of native histograms, also known as sparse histograms over remote write. Only valid in Prometheus versions 2.40.0 and newer. + type: boolean sigv4: description: Sigv4 allows to configures AWS's Signature Verification 4 properties: diff --git a/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml b/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml new file mode 100644 index 0000000000..75acc75bbf --- /dev/null +++ b/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml @@ -0,0 +1,166 @@ +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + annotations: + controller-gen.kubebuilder.io/version: v0.11.1 + creationTimestamp: null + name: scrapeconfigs.monitoring.coreos.com +spec: + group: monitoring.coreos.com + names: + categories: + - prometheus-operator + kind: ScrapeConfig + listKind: ScrapeConfigList + plural: scrapeconfigs + shortNames: + - scfg + singular: scrapeconfig + scope: Namespaced + versions: + - name: v1alpha1 + schema: + openAPIV3Schema: + description: ScrapeConfig defines a namespaced Prometheus scrape_config to be aggregated across multiple namespaces into the Prometheus configuration. + properties: + apiVersion: + description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + type: string + kind: + description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + type: string + metadata: + type: object + spec: + description: ScrapeConfigSpec is a specification of the desired configuration for a scrape configuration. + properties: + fileSDConfigs: + description: FileSDConfigs defines a list of file service discovery configurations. + items: + description: FileSDConfig defines a Prometheus file service discovery configuration See https://prometheus.io/docs/prometheus/latest/configuration/configuration/#file_sd_config + properties: + files: + description: 'List of files to be used for file discovery. Recommendation: use absolute paths. While relative paths work, the prometheus-operator project makes no guarantees about the working directory where the configuration file is stored. Files must be mounted using Prometheus.ConfigMaps or Prometheus.Secrets.' + items: + description: SDFile represents a file used for service discovery + pattern: ^[^*]*(\*[^/]*)?\.(json|yml|yaml|JSON|YML|YAML)$ + type: string + minItems: 1 + type: array + refreshInterval: + description: RefreshInterval configures the refresh interval at which Prometheus will reload the content of the files. + pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$ + type: string + required: + - files + type: object + type: array + honorLabels: + description: HonorLabels chooses the metric's labels on collisions with target labels. + type: boolean + honorTimestamps: + description: HonorTimestamps controls whether Prometheus respects the timestamps present in scraped data. + type: boolean + httpSDConfigs: + description: HTTPSDConfigs defines a list of HTTP service discovery configurations. + items: + description: HTTPSDConfig defines a prometheus HTTP service discovery configuration See https://prometheus.io/docs/prometheus/latest/configuration/configuration/#http_sd_config + properties: + refreshInterval: + description: RefreshInterval configures the refresh interval at which Prometheus will re-query the endpoint to update the target list. + pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$ + type: string + url: + description: URL from which the targets are fetched. + minLength: 1 + pattern: ^http(s)?://.+$ + type: string + required: + - url + type: object + type: array + metricsPath: + description: MetricsPath HTTP path to scrape for metrics. If empty, Prometheus uses the default value (e.g. /metrics). + type: string + relabelings: + description: 'RelabelConfigs defines how to rewrite the target''s labels before scraping. Prometheus Operator automatically adds relabelings for a few standard Kubernetes fields. The original scrape job''s name is available via the `__tmp_prometheus_job_name` label. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config' + items: + description: 'RelabelConfig allows dynamic rewriting of the label set, being applied to samples before ingestion. It defines ``-section of Prometheus configuration. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs' + properties: + action: + default: replace + description: Action to perform based on regex matching. Default is 'replace'. uppercase and lowercase actions require Prometheus >= 2.36. + enum: + - replace + - Replace + - keep + - Keep + - drop + - Drop + - hashmod + - HashMod + - labelmap + - LabelMap + - labeldrop + - LabelDrop + - labelkeep + - LabelKeep + - lowercase + - Lowercase + - uppercase + - Uppercase + - keepequal + - KeepEqual + - dropequal + - DropEqual + type: string + modulus: + description: Modulus to take of the hash of the source label values. + format: int64 + type: integer + regex: + description: Regular expression against which the extracted value is matched. Default is '(.*)' + type: string + replacement: + description: Replacement value against which a regex replace is performed if the regular expression matches. Regex capture groups are available. Default is '$1' + type: string + separator: + description: Separator placed between concatenated source label values. default is ';'. + type: string + sourceLabels: + description: The source labels select values from existing labels. Their content is concatenated using the configured separator and matched against the configured regular expression for the replace, keep, and drop actions. + items: + description: LabelName is a valid Prometheus label name which may only contain ASCII letters, numbers, as well as underscores. + pattern: ^[a-zA-Z_][a-zA-Z0-9_]*$ + type: string + type: array + targetLabel: + description: Label to which the resulting value is written in a replace action. It is mandatory for replace actions. Regex capture groups are available. + type: string + type: object + type: array + staticConfigs: + description: StaticConfigs defines a list of static targets with a common label set. + items: + description: StaticConfig defines a Prometheus static configuration. See https://prometheus.io/docs/prometheus/latest/configuration/configuration/#scrape_config + properties: + labels: + additionalProperties: + type: string + description: Labels assigned to all metrics scraped from the targets. + type: object + x-kubernetes-map-type: atomic + targets: + description: List of targets for this static configuration. + items: + description: Target represents a target for Prometheus to scrape + type: string + type: array + type: object + type: array + type: object + required: + - spec + type: object + served: true + storage: true diff --git a/manifests/setup/0thanosrulerCustomResourceDefinition.yaml b/manifests/setup/0thanosrulerCustomResourceDefinition.yaml index 80c5949b56..1ba84dffd0 100644 --- a/manifests/setup/0thanosrulerCustomResourceDefinition.yaml +++ b/manifests/setup/0thanosrulerCustomResourceDefinition.yaml @@ -3223,6 +3223,34 @@ spec: version: description: Version of Thanos to be deployed. type: string + volumeMounts: + description: VolumeMounts allows configuration of additional VolumeMounts on the output StatefulSet definition. VolumeMounts specified will be appended to other VolumeMounts in the ruler container, that are generated as a result of StorageSpec objects. + items: + description: VolumeMount describes a mounting of a Volume within a container. + properties: + mountPath: + description: Path within the container at which the volume should be mounted. Must not contain ':'. + type: string + mountPropagation: + description: mountPropagation determines how mounts are propagated from the host to container and the other way around. When not set, MountPropagationNone is used. This field is beta in 1.10. + type: string + name: + description: This must match the Name of a Volume. + type: string + readOnly: + description: Mounted read-only if true, read-write otherwise (false or unspecified). Defaults to false. + type: boolean + subPath: + description: Path within the volume from which the container's volume should be mounted. Defaults to "" (volume's root). + type: string + subPathExpr: + description: Expanded path within the volume from which the container's volume should be mounted. Behaves similarly to SubPath but environment variable references $(VAR_NAME) are expanded using the container's environment. Defaults to "" (volume's root). SubPathExpr and SubPath are mutually exclusive. + type: string + required: + - mountPath + - name + type: object + type: array volumes: description: Volumes allows configuration of additional volumes on the output StatefulSet definition. Volumes specified will be appended to other volumes that are generated as a result of StorageSpec objects. items: