From fa9a3fdd5c24f32fffc717b19bdf281e830db364 Mon Sep 17 00:00:00 2001 From: PromOperatorBot <85787986+prom-op-bot@users.noreply.github.com> Date: Mon, 25 Nov 2024 11:20:09 +0100 Subject: [PATCH] [bot] [main] Automated version update (#2559) Co-authored-by: Prometheus Operator Bot --- jsonnet/kube-prometheus/versions.json | 6 +- jsonnetfile.lock.json | 24 ++-- manifests/grafana-config.yaml | 2 +- manifests/grafana-dashboardDatasources.yaml | 2 +- manifests/grafana-dashboardDefinitions.yaml | 54 ++++---- 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 +- 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 +- manifests/prometheusOperator-clusterRole.yaml | 2 +- ...prometheusOperator-clusterRoleBinding.yaml | 2 +- manifests/prometheusOperator-deployment.yaml | 8 +- .../prometheusOperator-networkPolicy.yaml | 2 +- .../prometheusOperator-prometheusRule.yaml | 2 +- manifests/prometheusOperator-service.yaml | 2 +- .../prometheusOperator-serviceAccount.yaml | 2 +- .../prometheusOperator-serviceMonitor.yaml | 4 +- ...managerConfigCustomResourceDefinition.yaml | 74 ++++++++++- ...0alertmanagerCustomResourceDefinition.yaml | 2 +- .../0podmonitorCustomResourceDefinition.yaml | 14 ++- .../setup/0probeCustomResourceDefinition.yaml | 14 ++- .../0prometheusCustomResourceDefinition.yaml | 65 ++++++++-- ...ometheusagentCustomResourceDefinition.yaml | 59 +++++++-- ...rometheusruleCustomResourceDefinition.yaml | 2 +- ...0scrapeconfigCustomResourceDefinition.yaml | 67 ++++++++-- ...ervicemonitorCustomResourceDefinition.yaml | 14 ++- .../0thanosrulerCustomResourceDefinition.yaml | 115 +++++++++++++----- 43 files changed, 450 insertions(+), 152 deletions(-) diff --git a/jsonnet/kube-prometheus/versions.json b/jsonnet/kube-prometheus/versions.json index ff101780a6..f1fc32d509 100644 --- a/jsonnet/kube-prometheus/versions.json +++ b/jsonnet/kube-prometheus/versions.json @@ -1,12 +1,12 @@ { "alertmanager": "0.27.0", "blackboxExporter": "0.25.0", - "grafana": "11.3.0", + "grafana": "11.3.1", "kubeStateMetrics": "2.14.0", "nodeExporter": "1.8.2", - "prometheus": "2.55.1", + "prometheus": "3.0.0", "prometheusAdapter": "0.12.0", - "prometheusOperator": "0.78.1", + "prometheusOperator": "0.78.2", "kubeRbacProxy": "0.18.1", "configmapReload": "0.14.0", "pyrra": "0.6.4" diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json index 85ed9ae69d..25bdaee5af 100644 --- a/jsonnetfile.lock.json +++ b/jsonnetfile.lock.json @@ -18,7 +18,7 @@ "subdir": "contrib/mixin" } }, - "version": "7ab761246cc449ddfc630001fb2caff160eb4ee3", + "version": "0fcf6e80b4059ca6bbc436b22fb8ef723df0469d", "sum": "IXI3LQIT9NmTPJAk8WLUJd5+qZfcGpeNCyWIK7oEpws=" }, { @@ -88,7 +88,7 @@ "subdir": "grafana-builder" } }, - "version": "a8fc2139d881ae632a8c956eb9dd4b84b24f362e", + "version": "51cad60013ea92f856a2ad9c3d676b0dd1fc0f3f", "sum": "yxqWcq/N3E/a/XreeU6EuE6X7kYPnG0AspAQFKOjASo=" }, { @@ -98,7 +98,7 @@ "subdir": "mixin-utils" } }, - "version": "a8fc2139d881ae632a8c956eb9dd4b84b24f362e", + "version": "51cad60013ea92f856a2ad9c3d676b0dd1fc0f3f", "sum": "LoYq5QxJmUXEtqkEG8CFUBLBhhzDDaNANHc7Gz36ZdM=" }, { @@ -138,7 +138,7 @@ "subdir": "jsonnet/kube-state-metrics" } }, - "version": "17151aca659e0659259b5e1f5675acf849281ade", + "version": "76308fc8b860384a4ca06f86702a1c1e13e0ea2c", "sum": "lO7jUSzAIy8Yk9pOWJIWgPRhubkWzVh56W6wtYfbVH4=" }, { @@ -148,7 +148,7 @@ "subdir": "jsonnet/kube-state-metrics-mixin" } }, - "version": "17151aca659e0659259b5e1f5675acf849281ade", + "version": "76308fc8b860384a4ca06f86702a1c1e13e0ea2c", "sum": "qclI7LwucTjBef3PkGBkKxF0mfZPbHnn4rlNWKGtR4c=" }, { @@ -158,7 +158,7 @@ "subdir": "jsonnet/mixin" } }, - "version": "5f512d21361a300889388c3a174f4349fef3604d", + "version": "328f8fbe19911261bbc729efca0042381557ed20", "sum": "gi+knjdxs2T715iIQIntrimbHRgHnpM8IFBJDD1gYfs=", "name": "prometheus-operator-mixin" }, @@ -169,8 +169,8 @@ "subdir": "jsonnet/prometheus-operator" } }, - "version": "5f512d21361a300889388c3a174f4349fef3604d", - "sum": "O/QbpfCV+3sx4egAAKeD6ZjaiYsixfLwRLboky1GGNw=" + "version": "328f8fbe19911261bbc729efca0042381557ed20", + "sum": "ASXVKW0VG+lhlrpG375lDQl4p2Rjna/NOBCOZLf36rE=" }, { "source": { @@ -179,7 +179,7 @@ "subdir": "doc/alertmanager-mixin" } }, - "version": "f6b942cf9b3a503d59192eada300d2ad97cba82f", + "version": "82b89dc769b324400edb88ad3384a6121f7c1468", "sum": "Mf4h1BYLle2nrgjf/HXrBbl0Zk8N+xaoEM017o0BC+k=", "name": "alertmanager" }, @@ -190,7 +190,7 @@ "subdir": "docs/node-mixin" } }, - "version": "a7b403a484b8a163ac7f536c1991e7d330358577", + "version": "49d177bf95417b117ab612a376e2434d5dd61c2d", "sum": "cQCW+1N0Xae5yXecCWDK2oAlN0luBS/5GrwBYSlaFms=" }, { @@ -200,7 +200,7 @@ "subdir": "documentation/prometheus-mixin" } }, - "version": "628bbd2682802d6774f7a20d8569c7790dac2e0b", + "version": "872e2db2a99b454498ec0278108978dcf66c28d2", "sum": "dYLcLzGH4yF3qB7OGC/7z4nqeTNjv42L7Q3BENU8XJI=", "name": "prometheus" }, @@ -222,7 +222,7 @@ "subdir": "mixin" } }, - "version": "bfbabbb89a3119e904d48028fb2534446e31a642", + "version": "b144ebac208fb0eb1171d39e29ffb37e51f589c4", "sum": "ieCD4eMgGbOlrI8GmckGPHBGQDcLasE1rULYq56W/bs=", "name": "thanos-mixin" }, diff --git a/manifests/grafana-config.yaml b/manifests/grafana-config.yaml index e2f8e8f924..abe3514f2e 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.3.0 + app.kubernetes.io/version: 11.3.1 name: grafana-config namespace: monitoring stringData: diff --git a/manifests/grafana-dashboardDatasources.yaml b/manifests/grafana-dashboardDatasources.yaml index 2684df94ab..298bb66722 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.3.0 + app.kubernetes.io/version: 11.3.1 name: grafana-datasources namespace: monitoring stringData: diff --git a/manifests/grafana-dashboardDefinitions.yaml b/manifests/grafana-dashboardDefinitions.yaml index dee25ff81f..04d3fc0d7d 100644 --- a/manifests/grafana-dashboardDefinitions.yaml +++ b/manifests/grafana-dashboardDefinitions.yaml @@ -360,7 +360,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 11.3.0 + app.kubernetes.io/version: 11.3.1 name: grafana-dashboard-alertmanager-overview namespace: monitoring - apiVersion: v1 @@ -1242,7 +1242,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 11.3.0 + app.kubernetes.io/version: 11.3.1 name: grafana-dashboard-apiserver namespace: monitoring - apiVersion: v1 @@ -2056,7 +2056,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 11.3.0 + app.kubernetes.io/version: 11.3.1 name: grafana-dashboard-cluster-total namespace: monitoring - apiVersion: v1 @@ -2660,7 +2660,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 11.3.0 + app.kubernetes.io/version: 11.3.1 name: grafana-dashboard-controller-manager namespace: monitoring - apiVersion: v1 @@ -3285,7 +3285,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 11.3.0 + app.kubernetes.io/version: 11.3.1 name: grafana-dashboard-grafana-overview namespace: monitoring - apiVersion: v1 @@ -4872,7 +4872,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 11.3.0 + app.kubernetes.io/version: 11.3.1 name: grafana-dashboard-k8s-resources-cluster namespace: monitoring - apiVersion: v1 @@ -5513,7 +5513,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 11.3.0 + app.kubernetes.io/version: 11.3.1 name: grafana-dashboard-k8s-resources-multicluster namespace: monitoring - apiVersion: v1 @@ -7031,7 +7031,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 11.3.0 + app.kubernetes.io/version: 11.3.1 name: grafana-dashboard-k8s-resources-namespace namespace: monitoring - apiVersion: v1 @@ -7609,7 +7609,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 11.3.0 + app.kubernetes.io/version: 11.3.1 name: grafana-dashboard-k8s-resources-node namespace: monitoring - apiVersion: v1 @@ -8993,7 +8993,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 11.3.0 + app.kubernetes.io/version: 11.3.1 name: grafana-dashboard-k8s-resources-pod namespace: monitoring - apiVersion: v1 @@ -10059,7 +10059,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 11.3.0 + app.kubernetes.io/version: 11.3.1 name: grafana-dashboard-k8s-resources-workload namespace: monitoring - apiVersion: v1 @@ -11322,7 +11322,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 11.3.0 + app.kubernetes.io/version: 11.3.1 name: grafana-dashboard-k8s-resources-workloads-namespace namespace: monitoring - apiVersion: v1 @@ -12575,7 +12575,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 11.3.0 + app.kubernetes.io/version: 11.3.1 name: grafana-dashboard-kubelet namespace: monitoring - apiVersion: v1 @@ -13213,7 +13213,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 11.3.0 + app.kubernetes.io/version: 11.3.1 name: grafana-dashboard-namespace-by-pod namespace: monitoring - apiVersion: v1 @@ -14009,7 +14009,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 11.3.0 + app.kubernetes.io/version: 11.3.1 name: grafana-dashboard-namespace-by-workload namespace: monitoring - apiVersion: v1 @@ -15062,7 +15062,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 11.3.0 + app.kubernetes.io/version: 11.3.1 name: grafana-dashboard-node-cluster-rsrc-use namespace: monitoring - apiVersion: v1 @@ -16141,7 +16141,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 11.3.0 + app.kubernetes.io/version: 11.3.1 name: grafana-dashboard-node-rsrc-use namespace: monitoring - apiVersion: v1 @@ -17209,7 +17209,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 11.3.0 + app.kubernetes.io/version: 11.3.1 name: grafana-dashboard-nodes-aix namespace: monitoring - apiVersion: v1 @@ -18298,7 +18298,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 11.3.0 + app.kubernetes.io/version: 11.3.1 name: grafana-dashboard-nodes-darwin namespace: monitoring - apiVersion: v1 @@ -19380,7 +19380,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 11.3.0 + app.kubernetes.io/version: 11.3.1 name: grafana-dashboard-nodes namespace: monitoring - apiVersion: v1 @@ -19702,7 +19702,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 11.3.0 + app.kubernetes.io/version: 11.3.1 name: grafana-dashboard-persistentvolumesusage namespace: monitoring - apiVersion: v1 @@ -20194,7 +20194,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 11.3.0 + app.kubernetes.io/version: 11.3.1 name: grafana-dashboard-pod-total namespace: monitoring - apiVersion: v1 @@ -21853,7 +21853,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 11.3.0 + app.kubernetes.io/version: 11.3.1 name: grafana-dashboard-prometheus-remote-write namespace: monitoring - apiVersion: v1 @@ -23094,7 +23094,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 11.3.0 + app.kubernetes.io/version: 11.3.1 name: grafana-dashboard-prometheus namespace: monitoring - apiVersion: v1 @@ -23749,7 +23749,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 11.3.0 + app.kubernetes.io/version: 11.3.1 name: grafana-dashboard-proxy namespace: monitoring - apiVersion: v1 @@ -24350,7 +24350,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 11.3.0 + app.kubernetes.io/version: 11.3.1 name: grafana-dashboard-scheduler namespace: monitoring - apiVersion: v1 @@ -24932,7 +24932,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 11.3.0 + app.kubernetes.io/version: 11.3.1 name: grafana-dashboard-workload-total namespace: monitoring kind: ConfigMapList diff --git a/manifests/grafana-dashboardSources.yaml b/manifests/grafana-dashboardSources.yaml index 6925c671aa..c8ac79aa15 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.3.0 + app.kubernetes.io/version: 11.3.1 name: grafana-dashboards namespace: monitoring diff --git a/manifests/grafana-deployment.yaml b/manifests/grafana-deployment.yaml index 9bebd8a232..5d82063868 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.3.0 + app.kubernetes.io/version: 11.3.1 name: grafana namespace: monitoring spec: @@ -18,19 +18,19 @@ spec: template: metadata: annotations: - checksum/grafana-config: 180f708f38f309636e0dae018ca8903b - checksum/grafana-dashboardproviders: a1769babb2d00b8c530e506d07ace613 - checksum/grafana-datasources: a614fd69c0e64486069e09f404bf7ea2 + checksum/grafana-config: 724c0753ae1d7516766049819dd8e2e2 + checksum/grafana-dashboardproviders: ad987bc8222933dd2ba828ba16a9f1ba + checksum/grafana-datasources: b80e59379cb2056a8e87d51e1d9312bc labels: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 11.3.0 + app.kubernetes.io/version: 11.3.1 spec: automountServiceAccountToken: false containers: - env: [] - image: grafana/grafana:11.3.0 + image: grafana/grafana:11.3.1 name: grafana ports: - containerPort: 3000 diff --git a/manifests/grafana-networkPolicy.yaml b/manifests/grafana-networkPolicy.yaml index 21f520aabb..46a74e2c7f 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.3.0 + app.kubernetes.io/version: 11.3.1 name: grafana namespace: monitoring spec: diff --git a/manifests/grafana-prometheusRule.yaml b/manifests/grafana-prometheusRule.yaml index 2a8a05f90d..3a31b3ff2c 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.3.0 + app.kubernetes.io/version: 11.3.1 prometheus: k8s role: alert-rules name: grafana-rules diff --git a/manifests/grafana-service.yaml b/manifests/grafana-service.yaml index 752f5c1bc2..c1ab85d73f 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.3.0 + app.kubernetes.io/version: 11.3.1 name: grafana namespace: monitoring spec: diff --git a/manifests/grafana-serviceAccount.yaml b/manifests/grafana-serviceAccount.yaml index bf8c38eb02..443639d4f5 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.3.0 + app.kubernetes.io/version: 11.3.1 name: grafana namespace: monitoring diff --git a/manifests/grafana-serviceMonitor.yaml b/manifests/grafana-serviceMonitor.yaml index a67a202e00..751bdfdc38 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.3.0 + app.kubernetes.io/version: 11.3.1 name: grafana namespace: monitoring spec: diff --git a/manifests/prometheus-clusterRole.yaml b/manifests/prometheus-clusterRole.yaml index 401f8cd449..f6a02a2010 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.55.1 + app.kubernetes.io/version: 3.0.0 name: prometheus-k8s rules: - apiGroups: diff --git a/manifests/prometheus-clusterRoleBinding.yaml b/manifests/prometheus-clusterRoleBinding.yaml index 0630718b24..260e1299c3 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.55.1 + app.kubernetes.io/version: 3.0.0 name: prometheus-k8s roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/manifests/prometheus-networkPolicy.yaml b/manifests/prometheus-networkPolicy.yaml index c760e43d16..9a71ef2c52 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.55.1 + app.kubernetes.io/version: 3.0.0 name: prometheus-k8s namespace: monitoring spec: diff --git a/manifests/prometheus-podDisruptionBudget.yaml b/manifests/prometheus-podDisruptionBudget.yaml index da50169e3b..b062bb2e4a 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.55.1 + app.kubernetes.io/version: 3.0.0 name: prometheus-k8s namespace: monitoring spec: diff --git a/manifests/prometheus-prometheus.yaml b/manifests/prometheus-prometheus.yaml index 426c2f97d7..66c56823ad 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.55.1 + app.kubernetes.io/version: 3.0.0 name: k8s namespace: monitoring spec: @@ -18,7 +18,7 @@ spec: port: web enableFeatures: [] externalLabels: {} - image: quay.io/prometheus/prometheus:v2.55.1 + image: quay.io/prometheus/prometheus:v3.0.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.55.1 + app.kubernetes.io/version: 3.0.0 podMonitorNamespaceSelector: {} podMonitorSelector: {} probeNamespaceSelector: {} @@ -47,4 +47,4 @@ spec: serviceAccountName: prometheus-k8s serviceMonitorNamespaceSelector: {} serviceMonitorSelector: {} - version: 2.55.1 + version: 3.0.0 diff --git a/manifests/prometheus-prometheusRule.yaml b/manifests/prometheus-prometheusRule.yaml index e9230058a9..6b41760bfb 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.55.1 + app.kubernetes.io/version: 3.0.0 prometheus: k8s role: alert-rules name: prometheus-k8s-prometheus-rules diff --git a/manifests/prometheus-roleBindingConfig.yaml b/manifests/prometheus-roleBindingConfig.yaml index bdd5442b33..e1fe284387 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.55.1 + app.kubernetes.io/version: 3.0.0 name: prometheus-k8s-config namespace: monitoring roleRef: diff --git a/manifests/prometheus-roleBindingSpecificNamespaces.yaml b/manifests/prometheus-roleBindingSpecificNamespaces.yaml index 5a9c1c898e..7dcdfed224 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.55.1 + app.kubernetes.io/version: 3.0.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.55.1 + app.kubernetes.io/version: 3.0.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.55.1 + app.kubernetes.io/version: 3.0.0 name: prometheus-k8s namespace: monitoring roleRef: diff --git a/manifests/prometheus-roleConfig.yaml b/manifests/prometheus-roleConfig.yaml index 067b8e7f18..ddda27b380 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.55.1 + app.kubernetes.io/version: 3.0.0 name: prometheus-k8s-config namespace: monitoring rules: diff --git a/manifests/prometheus-roleSpecificNamespaces.yaml b/manifests/prometheus-roleSpecificNamespaces.yaml index 3e8740e511..c08f5dcfa5 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.55.1 + app.kubernetes.io/version: 3.0.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.55.1 + app.kubernetes.io/version: 3.0.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.55.1 + app.kubernetes.io/version: 3.0.0 name: prometheus-k8s namespace: monitoring rules: diff --git a/manifests/prometheus-service.yaml b/manifests/prometheus-service.yaml index 99ffb145c9..c0f0264c7e 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.55.1 + app.kubernetes.io/version: 3.0.0 name: prometheus-k8s namespace: monitoring spec: diff --git a/manifests/prometheus-serviceAccount.yaml b/manifests/prometheus-serviceAccount.yaml index 69221e995b..e397dd1f80 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.55.1 + app.kubernetes.io/version: 3.0.0 name: prometheus-k8s namespace: monitoring diff --git a/manifests/prometheus-serviceMonitor.yaml b/manifests/prometheus-serviceMonitor.yaml index cb2e67bce1..45e8cb1b66 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.55.1 + app.kubernetes.io/version: 3.0.0 name: prometheus-k8s namespace: monitoring spec: diff --git a/manifests/prometheusOperator-clusterRole.yaml b/manifests/prometheusOperator-clusterRole.yaml index 07e2ddf08f..5bc725c091 100644 --- a/manifests/prometheusOperator-clusterRole.yaml +++ b/manifests/prometheusOperator-clusterRole.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.78.1 + app.kubernetes.io/version: 0.78.2 name: prometheus-operator rules: - apiGroups: diff --git a/manifests/prometheusOperator-clusterRoleBinding.yaml b/manifests/prometheusOperator-clusterRoleBinding.yaml index 49fe2004ef..76ee810065 100644 --- a/manifests/prometheusOperator-clusterRoleBinding.yaml +++ b/manifests/prometheusOperator-clusterRoleBinding.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.78.1 + app.kubernetes.io/version: 0.78.2 name: prometheus-operator roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/manifests/prometheusOperator-deployment.yaml b/manifests/prometheusOperator-deployment.yaml index 1f138cfa81..0e8d3305cd 100644 --- a/manifests/prometheusOperator-deployment.yaml +++ b/manifests/prometheusOperator-deployment.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.78.1 + app.kubernetes.io/version: 0.78.2 name: prometheus-operator namespace: monitoring spec: @@ -23,19 +23,19 @@ spec: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.78.1 + app.kubernetes.io/version: 0.78.2 spec: automountServiceAccountToken: true containers: - args: - --kubelet-service=kube-system/kubelet - - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.78.1 + - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.78.2 - --kubelet-endpoints=true - --kubelet-endpointslice=false env: - name: GOGC value: "30" - image: quay.io/prometheus-operator/prometheus-operator:v0.78.1 + image: quay.io/prometheus-operator/prometheus-operator:v0.78.2 name: prometheus-operator ports: - containerPort: 8080 diff --git a/manifests/prometheusOperator-networkPolicy.yaml b/manifests/prometheusOperator-networkPolicy.yaml index 840db500f5..2da3b5d9a3 100644 --- a/manifests/prometheusOperator-networkPolicy.yaml +++ b/manifests/prometheusOperator-networkPolicy.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.78.1 + app.kubernetes.io/version: 0.78.2 name: prometheus-operator namespace: monitoring spec: diff --git a/manifests/prometheusOperator-prometheusRule.yaml b/manifests/prometheusOperator-prometheusRule.yaml index cb4bd703d3..18df44da8f 100644 --- a/manifests/prometheusOperator-prometheusRule.yaml +++ b/manifests/prometheusOperator-prometheusRule.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.78.1 + app.kubernetes.io/version: 0.78.2 prometheus: k8s role: alert-rules name: prometheus-operator-rules diff --git a/manifests/prometheusOperator-service.yaml b/manifests/prometheusOperator-service.yaml index c299a3f158..7a7905821f 100644 --- a/manifests/prometheusOperator-service.yaml +++ b/manifests/prometheusOperator-service.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.78.1 + app.kubernetes.io/version: 0.78.2 name: prometheus-operator namespace: monitoring spec: diff --git a/manifests/prometheusOperator-serviceAccount.yaml b/manifests/prometheusOperator-serviceAccount.yaml index eb208c1408..786370542e 100644 --- a/manifests/prometheusOperator-serviceAccount.yaml +++ b/manifests/prometheusOperator-serviceAccount.yaml @@ -6,6 +6,6 @@ metadata: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.78.1 + app.kubernetes.io/version: 0.78.2 name: prometheus-operator namespace: monitoring diff --git a/manifests/prometheusOperator-serviceMonitor.yaml b/manifests/prometheusOperator-serviceMonitor.yaml index 41e065e51c..1bbb9e7348 100644 --- a/manifests/prometheusOperator-serviceMonitor.yaml +++ b/manifests/prometheusOperator-serviceMonitor.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.78.1 + app.kubernetes.io/version: 0.78.2 name: prometheus-operator namespace: monitoring spec: @@ -21,4 +21,4 @@ spec: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.78.1 + app.kubernetes.io/version: 0.78.2 diff --git a/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml b/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml index d5616b3693..33628863e7 100644 --- a/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml +++ b/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml @@ -3,7 +3,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.16.5 - operator.prometheus.io/version: 0.78.1 + operator.prometheus.io/version: 0.78.2 name: alertmanagerconfigs.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -718,6 +718,12 @@ spec: It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0. type: boolean + proxyURL: + description: |- + Optional proxy URL. + + If defined, this field takes precedence over `proxyUrl`. + type: string proxyUrl: description: '`proxyURL` defines the HTTP proxy server to use.' pattern: ^http(s)?://.+$ @@ -1621,6 +1627,12 @@ spec: It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0. type: boolean + proxyURL: + description: |- + Optional proxy URL. + + If defined, this field takes precedence over `proxyUrl`. + type: string proxyUrl: description: '`proxyURL` defines the HTTP proxy server to use.' pattern: ^http(s)?://.+$ @@ -2349,6 +2361,12 @@ spec: It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0. type: boolean + proxyURL: + description: |- + Optional proxy URL. + + If defined, this field takes precedence over `proxyUrl`. + type: string proxyUrl: description: '`proxyURL` defines the HTTP proxy server to use.' pattern: ^http(s)?://.+$ @@ -3063,6 +3081,12 @@ spec: It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0. type: boolean + proxyURL: + description: |- + Optional proxy URL. + + If defined, this field takes precedence over `proxyUrl`. + type: string proxyUrl: description: '`proxyURL` defines the HTTP proxy server to use.' pattern: ^http(s)?://.+$ @@ -3801,6 +3825,12 @@ spec: It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0. type: boolean + proxyURL: + description: |- + Optional proxy URL. + + If defined, this field takes precedence over `proxyUrl`. + type: string proxyUrl: description: '`proxyURL` defines the HTTP proxy server to use.' pattern: ^http(s)?://.+$ @@ -4634,6 +4664,12 @@ spec: It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0. type: boolean + proxyURL: + description: |- + Optional proxy URL. + + If defined, this field takes precedence over `proxyUrl`. + type: string proxyUrl: description: '`proxyURL` defines the HTTP proxy server to use.' pattern: ^http(s)?://.+$ @@ -5305,6 +5341,12 @@ spec: It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0. type: boolean + proxyURL: + description: |- + Optional proxy URL. + + If defined, this field takes precedence over `proxyUrl`. + type: string proxyUrl: description: '`proxyURL` defines the HTTP proxy server to use.' pattern: ^http(s)?://.+$ @@ -6068,6 +6110,12 @@ spec: It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0. type: boolean + proxyURL: + description: |- + Optional proxy URL. + + If defined, this field takes precedence over `proxyUrl`. + type: string proxyUrl: description: '`proxyURL` defines the HTTP proxy server to use.' pattern: ^http(s)?://.+$ @@ -6769,6 +6817,12 @@ spec: It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0. type: boolean + proxyURL: + description: |- + Optional proxy URL. + + If defined, this field takes precedence over `proxyUrl`. + type: string proxyUrl: description: '`proxyURL` defines the HTTP proxy server to use.' pattern: ^http(s)?://.+$ @@ -7424,6 +7478,12 @@ spec: It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0. type: boolean + proxyURL: + description: |- + Optional proxy URL. + + If defined, this field takes precedence over `proxyUrl`. + type: string proxyUrl: description: '`proxyURL` defines the HTTP proxy server to use.' pattern: ^http(s)?://.+$ @@ -8068,6 +8128,12 @@ spec: It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0. type: boolean + proxyURL: + description: |- + Optional proxy URL. + + If defined, this field takes precedence over `proxyUrl`. + type: string proxyUrl: description: '`proxyURL` defines the HTTP proxy server to use.' pattern: ^http(s)?://.+$ @@ -8773,6 +8839,12 @@ spec: It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0. type: boolean + proxyURL: + description: |- + Optional proxy URL. + + If defined, this field takes precedence over `proxyUrl`. + type: string proxyUrl: description: '`proxyURL` defines the HTTP proxy server to use.' pattern: ^http(s)?://.+$ diff --git a/manifests/setup/0alertmanagerCustomResourceDefinition.yaml b/manifests/setup/0alertmanagerCustomResourceDefinition.yaml index 12c6f36eb3..facaf38ca1 100644 --- a/manifests/setup/0alertmanagerCustomResourceDefinition.yaml +++ b/manifests/setup/0alertmanagerCustomResourceDefinition.yaml @@ -3,7 +3,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.16.5 - operator.prometheus.io/version: 0.78.1 + operator.prometheus.io/version: 0.78.2 name: alertmanagers.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/manifests/setup/0podmonitorCustomResourceDefinition.yaml b/manifests/setup/0podmonitorCustomResourceDefinition.yaml index 046c326b85..ca0ca00d48 100644 --- a/manifests/setup/0podmonitorCustomResourceDefinition.yaml +++ b/manifests/setup/0podmonitorCustomResourceDefinition.yaml @@ -3,7 +3,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.16.5 - operator.prometheus.io/version: 0.78.1 + operator.prometheus.io/version: 0.78.2 name: podmonitors.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -1033,6 +1033,18 @@ spec: Whether to scrape a classic histogram that is also exposed as a native histogram. It requires Prometheus >= v2.45.0. type: boolean + scrapeFallbackProtocol: + description: |- + The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type. + + It requires Prometheus >= v3.0.0. + enum: + - PrometheusProto + - OpenMetricsText0.0.1 + - OpenMetricsText1.0.0 + - PrometheusText0.0.4 + - PrometheusText1.0.0 + type: string scrapeProtocols: description: |- `scrapeProtocols` defines the protocols to negotiate during a scrape. It tells clients the diff --git a/manifests/setup/0probeCustomResourceDefinition.yaml b/manifests/setup/0probeCustomResourceDefinition.yaml index eaac00d257..8993f6c527 100644 --- a/manifests/setup/0probeCustomResourceDefinition.yaml +++ b/manifests/setup/0probeCustomResourceDefinition.yaml @@ -3,7 +3,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.16.5 - operator.prometheus.io/version: 0.78.1 + operator.prometheus.io/version: 0.78.2 name: probes.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -648,6 +648,18 @@ spec: Whether to scrape a classic histogram that is also exposed as a native histogram. It requires Prometheus >= v2.45.0. type: boolean + scrapeFallbackProtocol: + description: |- + The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type. + + It requires Prometheus >= v3.0.0. + enum: + - PrometheusProto + - OpenMetricsText0.0.1 + - OpenMetricsText1.0.0 + - PrometheusText0.0.4 + - PrometheusText1.0.0 + type: string scrapeProtocols: description: |- `scrapeProtocols` defines the protocols to negotiate during a scrape. It tells clients the diff --git a/manifests/setup/0prometheusCustomResourceDefinition.yaml b/manifests/setup/0prometheusCustomResourceDefinition.yaml index 470cbb9b80..aa060d4381 100644 --- a/manifests/setup/0prometheusCustomResourceDefinition.yaml +++ b/manifests/setup/0prometheusCustomResourceDefinition.yaml @@ -3,7 +3,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.16.5 - operator.prometheus.io/version: 0.78.1 + operator.prometheus.io/version: 0.78.2 name: prometheuses.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -1192,6 +1192,7 @@ spec: description: |- Version of the Alertmanager API that Prometheus uses to send alerts. It can be "v1" or "v2". + The field has no effect for Prometheus >= v3.0.0 because only the v2 API is supported. type: string authorization: description: |- @@ -3362,7 +3363,10 @@ spec: type: object type: array disableCompaction: - description: When true, the Prometheus compaction is disabled. + description: |- + When true, the Prometheus compaction is disabled. + When `spec.thanos.objectStorageConfig` or `spec.objectStorageConfigFile` are defined, the operator automatically + disables block compaction to avoid race conditions during block uploads (as the Thanos documentation recommends). type: boolean dnsConfig: description: Defines the DNS configuration for the pods. @@ -3443,6 +3447,14 @@ spec: type: string type: array x-kubernetes-list-type: set + enableOTLPReceiver: + description: |- + Enable Prometheus to be used as a receiver for the OTLP Metrics protocol. + + Note that the OTLP receiver endpoint is automatically enabled if `.spec.otlpConfig` is defined. + + It requires Prometheus >= v2.47.0. + type: boolean enableRemoteWriteReceiver: description: |- Enable Prometheus to be used as a receiver for the Prometheus remote @@ -5207,6 +5219,12 @@ spec: enabling the StatefulSetMinReadySeconds feature gate. format: int32 type: integer + nameValidationScheme: + description: Specifies the validation scheme for metric and label names. + enum: + - UTF8 + - Legacy + type: string nodeSelector: additionalProperties: type: string @@ -5225,6 +5243,16 @@ spec: minItems: 1 type: array x-kubernetes-list-type: set + translationStrategy: + description: |- + Configures how the OTLP receiver endpoint translates the incoming metrics. + If unset, Prometheus uses its default value. + + It requires Prometheus >= v3.0.0. + enum: + - NoUTF8EscapingWithSuffixes + - UnderscoreEscapingWithSuffixes + type: string type: object overrideHonorLabels: description: |- @@ -8035,6 +8063,18 @@ spec: type: object type: object x-kubernetes-map-type: atomic + scrapeFallbackProtocol: + description: |- + The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type. + + It requires Prometheus >= v3.0.0. + enum: + - PrometheusProto + - OpenMetricsText0.0.1 + - OpenMetricsText1.0.0 + - PrometheusText0.0.4 + - PrometheusText1.0.0 + type: string scrapeInterval: default: 30s description: |- @@ -8411,19 +8451,28 @@ spec: type: string shards: description: |- - Number of shards to distribute targets onto. `spec.replicas` - multiplied by `spec.shards` is the total number of Pods created. + Number of shards to distribute scraped targets onto. + + `spec.replicas` multiplied by `spec.shards` is the total number of Pods + being created. - Note that scaling down shards will not reshard data onto remaining + When not defined, the operator assumes only one shard. + + Note that scaling down shards will not reshard data onto the remaining instances, it must be manually moved. Increasing shards will not reshard data either but it will continue to be available from the same instances. To query globally, use Thanos sidecar and Thanos querier or remote write data to a central location. + Alerting and recording rules - Sharding is performed on the content of the `__address__` target meta-label - for PodMonitors and ServiceMonitors and `__param_target__` for Probes. + By default, the sharding is performed on: + * The `__address__` target's metadata label for PodMonitor, + ServiceMonitor and ScrapeConfig resources. + * The `__param_target__` label for Probe resources. - Default: 1 + Users can define their own sharding implementation by setting the + `__tmp_hash` label during the target discovery with relabeling + configuration (either in the monitoring resources or via scrape class). format: int32 type: integer storage: diff --git a/manifests/setup/0prometheusagentCustomResourceDefinition.yaml b/manifests/setup/0prometheusagentCustomResourceDefinition.yaml index 4cd9d14047..94744e69da 100644 --- a/manifests/setup/0prometheusagentCustomResourceDefinition.yaml +++ b/manifests/setup/0prometheusagentCustomResourceDefinition.yaml @@ -3,7 +3,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.16.5 - operator.prometheus.io/version: 0.78.1 + operator.prometheus.io/version: 0.78.2 name: prometheusagents.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -2791,6 +2791,14 @@ spec: type: string type: array x-kubernetes-list-type: set + enableOTLPReceiver: + description: |- + Enable Prometheus to be used as a receiver for the OTLP Metrics protocol. + + Note that the OTLP receiver endpoint is automatically enabled if `.spec.otlpConfig` is defined. + + It requires Prometheus >= v2.47.0. + type: boolean enableRemoteWriteReceiver: description: |- Enable Prometheus to be used as a receiver for the Prometheus remote @@ -4541,6 +4549,12 @@ spec: - StatefulSet - DaemonSet type: string + nameValidationScheme: + description: Specifies the validation scheme for metric and label names. + enum: + - UTF8 + - Legacy + type: string nodeSelector: additionalProperties: type: string @@ -4559,6 +4573,16 @@ spec: minItems: 1 type: array x-kubernetes-list-type: set + translationStrategy: + description: |- + Configures how the OTLP receiver endpoint translates the incoming metrics. + If unset, Prometheus uses its default value. + + It requires Prometheus >= v3.0.0. + enum: + - NoUTF8EscapingWithSuffixes + - UnderscoreEscapingWithSuffixes + type: string type: object overrideHonorLabels: description: |- @@ -6488,6 +6512,18 @@ spec: type: object type: object x-kubernetes-map-type: atomic + scrapeFallbackProtocol: + description: |- + The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type. + + It requires Prometheus >= v3.0.0. + enum: + - PrometheusProto + - OpenMetricsText0.0.1 + - OpenMetricsText1.0.0 + - PrometheusText0.0.4 + - PrometheusText1.0.0 + type: string scrapeInterval: default: 30s description: |- @@ -6861,19 +6897,28 @@ spec: x-kubernetes-map-type: atomic shards: description: |- - Number of shards to distribute targets onto. `spec.replicas` - multiplied by `spec.shards` is the total number of Pods created. + Number of shards to distribute scraped targets onto. - Note that scaling down shards will not reshard data onto remaining + `spec.replicas` multiplied by `spec.shards` is the total number of Pods + being created. + + When not defined, the operator assumes only one shard. + + Note that scaling down shards will not reshard data onto the remaining instances, it must be manually moved. Increasing shards will not reshard data either but it will continue to be available from the same instances. To query globally, use Thanos sidecar and Thanos querier or remote write data to a central location. + Alerting and recording rules - Sharding is performed on the content of the `__address__` target meta-label - for PodMonitors and ServiceMonitors and `__param_target__` for Probes. + By default, the sharding is performed on: + * The `__address__` target's metadata label for PodMonitor, + ServiceMonitor and ScrapeConfig resources. + * The `__param_target__` label for Probe resources. - Default: 1 + Users can define their own sharding implementation by setting the + `__tmp_hash` label during the target discovery with relabeling + configuration (either in the monitoring resources or via scrape class). format: int32 type: integer storage: diff --git a/manifests/setup/0prometheusruleCustomResourceDefinition.yaml b/manifests/setup/0prometheusruleCustomResourceDefinition.yaml index 1d0cbb8e7b..dced0c0c1f 100644 --- a/manifests/setup/0prometheusruleCustomResourceDefinition.yaml +++ b/manifests/setup/0prometheusruleCustomResourceDefinition.yaml @@ -3,7 +3,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.16.5 - operator.prometheus.io/version: 0.78.1 + operator.prometheus.io/version: 0.78.2 name: prometheusrules.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml b/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml index 04eb9e5754..883a75a19a 100644 --- a/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml +++ b/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml @@ -3,7 +3,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.16.5 - operator.prometheus.io/version: 0.78.1 + operator.prometheus.io/version: 0.78.2 name: scrapeconfigs.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -213,7 +213,9 @@ spec: If unset, Prometheus uses its default value. type: boolean authorization: - description: Authorization header configuration to authenticate against the Consul Server. + description: |- + Optional Authorization header configuration to authenticate against the Consul Server. + Cannot be set at the same time as `basicAuth`, or `oauth2`. properties: credentials: description: Selects a key of a Secret in the namespace that contains the credentials for authentication. @@ -248,8 +250,9 @@ spec: type: object basicAuth: description: |- - BasicAuth information to authenticate against the Consul Server. + Optional BasicAuth information to authenticate against the Consul Server. More info: https://prometheus.io/docs/operating/configuration/#endpoints + Cannot be set at the same time as `authorization`, or `oauth2`. properties: password: description: |- @@ -302,19 +305,31 @@ spec: type: object datacenter: description: Consul Datacenter name, if not provided it will use the local Consul Agent Datacenter. + minLength: 1 type: string enableHTTP2: description: |- Whether to enable HTTP2. If unset, Prometheus uses its default value. type: boolean + filter: + description: |- + Filter expression used to filter the catalog results. + See https://www.consul.io/api-docs/catalog#list-services + It requires Prometheus >= 3.0.0. + minLength: 1 + type: string followRedirects: description: |- Configure whether HTTP requests follow HTTP 3xx redirects. If unset, Prometheus uses its default value. type: boolean namespace: - description: Namespaces are only supported in Consul Enterprise. + description: |- + Namespaces are only supported in Consul Enterprise. + + It requires Prometheus >= 2.28.0. + minLength: 1 type: string noProxy: description: |- @@ -327,11 +342,15 @@ spec: nodeMeta: additionalProperties: type: string - description: Node metadata key/value pairs to filter nodes for a given service. + description: |- + Node metadata key/value pairs to filter nodes for a given service. + Starting with Consul 1.14, it is recommended to use `filter` with the `NodeMeta` selector instead. type: object x-kubernetes-map-type: atomic oauth2: - description: Optional OAuth 2.0 configuration. + description: |- + Optional OAuth2.0 configuration. + Cannot be set at the same time as `basicAuth`, or `authorization`. properties: clientId: description: |- @@ -632,6 +651,14 @@ spec: type: object partition: description: Admin Partitions are only supported in Consul Enterprise. + minLength: 1 + type: string + pathPrefix: + description: |- + Prefix for URIs for when consul is behind an API gateway (reverse proxy). + + It requires Prometheus >= 2.45.0. + minLength: 1 type: string proxyConnectHeader: additionalProperties: @@ -689,7 +716,7 @@ spec: - HTTPS type: string server: - description: A valid string consisting of a hostname or IP followed by an optional port number. + description: Consul server address. A valid string consisting of a hostname or IP followed by an optional port number. minLength: 1 type: string services: @@ -697,20 +724,23 @@ spec: items: type: string type: array - x-kubernetes-list-type: atomic + x-kubernetes-list-type: set tagSeparator: description: |- The string by which Consul tags are joined into the tag label. If unset, Prometheus uses its default value. + minLength: 1 type: string tags: - description: An optional list of tags used to filter nodes for a given service. Services must contain all tags in the list. + description: |- + An optional list of tags used to filter nodes for a given service. Services must contain all tags in the list. + Starting with Consul 1.14, it is recommended to use `filter` with the `ServiceTags` selector instead. items: type: string type: array - x-kubernetes-list-type: atomic + x-kubernetes-list-type: set tlsConfig: - description: TLS Config + description: TLS configuration to connect to the Consul API. properties: ca: description: Certificate authority used when verifying server certificates. @@ -1247,6 +1277,9 @@ spec: type: object port: description: The port to scrape metrics from. + format: int32 + maximum: 65535 + minimum: 0 type: integer proxyConnectHeader: additionalProperties: @@ -10433,6 +10466,18 @@ spec: Whether to scrape a classic histogram that is also exposed as a native histogram. It requires Prometheus >= v2.45.0. type: boolean + scrapeFallbackProtocol: + description: |- + The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type. + + It requires Prometheus >= v3.0.0. + enum: + - PrometheusProto + - OpenMetricsText0.0.1 + - OpenMetricsText1.0.0 + - PrometheusText0.0.4 + - PrometheusText1.0.0 + type: string scrapeInterval: description: ScrapeInterval is the interval between consecutive scrapes. 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/0servicemonitorCustomResourceDefinition.yaml b/manifests/setup/0servicemonitorCustomResourceDefinition.yaml index 58d56e994c..98a4349ad6 100644 --- a/manifests/setup/0servicemonitorCustomResourceDefinition.yaml +++ b/manifests/setup/0servicemonitorCustomResourceDefinition.yaml @@ -3,7 +3,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.16.5 - operator.prometheus.io/version: 0.78.1 + operator.prometheus.io/version: 0.78.2 name: servicemonitors.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -1051,6 +1051,18 @@ spec: Whether to scrape a classic histogram that is also exposed as a native histogram. It requires Prometheus >= v2.45.0. type: boolean + scrapeFallbackProtocol: + description: |- + The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type. + + It requires Prometheus >= v3.0.0. + enum: + - PrometheusProto + - OpenMetricsText0.0.1 + - OpenMetricsText1.0.0 + - PrometheusText0.0.4 + - PrometheusText1.0.0 + type: string scrapeProtocols: description: |- `scrapeProtocols` defines the protocols to negotiate during a scrape. It tells clients the diff --git a/manifests/setup/0thanosrulerCustomResourceDefinition.yaml b/manifests/setup/0thanosrulerCustomResourceDefinition.yaml index 0815a81ea6..494f9345ca 100644 --- a/manifests/setup/0thanosrulerCustomResourceDefinition.yaml +++ b/manifests/setup/0thanosrulerCustomResourceDefinition.yaml @@ -3,7 +3,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.16.5 - operator.prometheus.io/version: 0.78.1 + operator.prometheus.io/version: 0.78.2 name: thanosrulers.monitoring.coreos.com spec: group: monitoring.coreos.com @@ -984,8 +984,10 @@ spec: type: object alertDropLabels: description: |- - AlertDropLabels configure the label names which should be dropped in ThanosRuler alerts. - The replica label `thanos_ruler_replica` will always be dropped in alerts. + Configures the label names which should be dropped in Thanos Ruler + alerts. + + The replica label `thanos_ruler_replica` will always be dropped from the alerts. items: type: string type: array @@ -997,15 +999,27 @@ spec: type: string alertRelabelConfigFile: description: |- - AlertRelabelConfigFile specifies the path of the alert relabeling configuration file. - When used alongside with AlertRelabelConfigs, alertRelabelConfigFile takes precedence. + Configures the path to the alert relabeling configuration file. + + Alert relabel configuration must have the form as specified in the + official Prometheus documentation: + https://prometheus.io/docs/prometheus/latest/configuration/configuration/#alert_relabel_configs + + The operator performs no validation of the configuration file. + + This field takes precedence over `alertRelabelConfig`. type: string alertRelabelConfigs: description: |- - AlertRelabelConfigs configures alert relabeling in ThanosRuler. - Alert relabel configurations must have the form as specified in the official Prometheus documentation: + Configures alert relabeling in Thanos Ruler. + + Alert relabel configuration must have the form as specified in the + official Prometheus documentation: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#alert_relabel_configs - Alternative to AlertRelabelConfigFile, and lower order priority. + + The operator performs no validation of the configuration. + + `alertRelabelConfigFile` takes precedence over this field. properties: key: description: The key of the secret to select from. Must be a valid secret key. @@ -1028,8 +1042,15 @@ spec: x-kubernetes-map-type: atomic alertmanagersConfig: description: |- - Define configuration for connecting to alertmanager. Only available with thanos v0.10.0 - and higher. Maps to the `alertmanagers.config` arg. + Configures the list of Alertmanager endpoints to send alerts to. + + The configuration format is defined at https://thanos.io/tip/components/rule.md/#alertmanager. + + It requires Thanos >= v0.10.0. + + The operator performs no validation of the configuration. + + This field takes precedence over `alertmanagersUrl`. properties: key: description: The key of the secret to select from. Must be a valid secret key. @@ -1052,10 +1073,11 @@ spec: x-kubernetes-map-type: atomic alertmanagersUrl: description: |- - Define URLs to send alerts to Alertmanager. For Thanos v0.10.0 and higher, - AlertManagersConfig should be used instead. Note: this field will be ignored - if AlertManagersConfig is specified. - Maps to the `alertmanagers.url` arg. + Configures the list of Alertmanager endpoints to send alerts to. + + For Thanos >= v0.10.0, it is recommended to use `alertmanagersConfig` instead. + + `alertmanagersConfig` takes precedence over this field. items: type: string type: array @@ -4135,8 +4157,10 @@ spec: additionalProperties: type: string description: |- - Labels configure the external label pairs to ThanosRuler. A default replica label - `thanos_ruler_replica` will be always added as a label with the value of the pod's name and it will be dropped in the alerts. + Configures the external label pairs of the ThanosRuler resource. + + A default replica label `thanos_ruler_replica` will be always added as a + label with the value of the pod's name. type: object listenLocal: description: |- @@ -4174,8 +4198,13 @@ spec: type: object objectStorageConfig: description: |- - ObjectStorageConfig configures object storage in Thanos. - Alternative to ObjectStorageConfigFile, and lower order priority. + Configures object storage. + + The configuration format is defined at https://thanos.io/tip/thanos/storage.md/#configuring-access-to-object-storage + + The operator performs no validation of the configuration. + + `objectStorageConfigFile` takes precedence over this field. properties: key: description: The key of the secret to select from. Must be a valid secret key. @@ -4198,8 +4227,13 @@ spec: x-kubernetes-map-type: atomic objectStorageConfigFile: description: |- - ObjectStorageConfigFile specifies the path of the object storage configuration file. - When used alongside with ObjectStorageConfig, ObjectStorageConfigFile takes precedence. + Configures the path of the object storage configuration file. + + The configuration format is defined at https://thanos.io/tip/thanos/storage.md/#configuring-access-to-object-storage + + The operator performs no validation of the configuration file. + + This field takes precedence over `objectStorageConfig`. type: string paused: description: |- @@ -4279,10 +4313,15 @@ spec: type: array queryConfig: description: |- - Define configuration for connecting to thanos query instances. - If this is defined, the QueryEndpoints field will be ignored. - Maps to the `query.config` CLI argument. - Only available with thanos v0.11.0 and higher. + Configures the list of Thanos Query endpoints from which to query metrics. + + The configuration format is defined at https://thanos.io/tip/components/rule.md/#query-api + + It requires Thanos >= v0.11.0. + + The operator performs no validation of the configuration. + + This field takes precedence over `queryEndpoints`. properties: key: description: The key of the secret to select from. Must be a valid secret key. @@ -4305,8 +4344,11 @@ spec: x-kubernetes-map-type: atomic queryEndpoints: description: |- - QueryEndpoints defines Thanos querier endpoints from which to query metrics. - Maps to the --query flag of thanos ruler. + Configures the list of Thanos Query endpoints from which to query metrics. + + For Thanos >= v0.11.0, it is recommended to use `queryConfig` instead. + + `queryConfig` takes precedence over this field. items: type: string type: array @@ -4433,8 +4475,9 @@ spec: x-kubernetes-map-type: atomic ruleSelector: description: |- - A label selector to select which PrometheusRules to mount for alerting and - recording. + PrometheusRule objects to be selected for rule evaluation. An empty + label selector matches all objects. A null label selector matches no + objects. properties: matchExpressions: description: matchExpressions is a list of label selector requirements. The requirements are ANDed. @@ -5529,12 +5572,16 @@ spec: type: array tracingConfig: description: |- - TracingConfig configures tracing in Thanos. + Configures tracing. - `tracingConfigFile` takes precedence over this field. + The configuration format is defined at https://thanos.io/tip/thanos/tracing.md/#configuration This is an *experimental feature*, it may change in any upcoming release in a breaking way. + + The operator performs no validation of the configuration. + + `tracingConfigFile` takes precedence over this field. properties: key: description: The key of the secret to select from. Must be a valid secret key. @@ -5557,12 +5604,16 @@ spec: x-kubernetes-map-type: atomic tracingConfigFile: description: |- - TracingConfig specifies the path of the tracing configuration file. + Configures the path of the tracing configuration file. - This field takes precedence over `tracingConfig`. + The configuration format is defined at https://thanos.io/tip/thanos/tracing.md/#configuration This is an *experimental feature*, it may change in any upcoming release in a breaking way. + + The operator performs no validation of the configuration file. + + This field takes precedence over `tracingConfig`. type: string version: description: Version of Thanos to be deployed.