From c523c26a33f9018e6171c1b7c002e5128dfa83a4 Mon Sep 17 00:00:00 2001
From: PromOperatorBot <85787986+prom-op-bot@users.noreply.github.com>
Date: Mon, 20 May 2024 10:57:23 +0200
Subject: [PATCH] [bot] [main] Automated version update (#2432)
Co-authored-by: Prometheus Operator Bot <prom-op-bot@users.noreply.github.com>
---
jsonnet/kube-prometheus/versions.json | 6 +-
jsonnetfile.lock.json | 28 +-
manifests/grafana-config.yaml | 2 +-
manifests/grafana-dashboardDatasources.yaml | 2 +-
manifests/grafana-dashboardDefinitions.yaml | 52 +--
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/prometheusAdapter-apiService.yaml | 2 +-
manifests/prometheusAdapter-clusterRole.yaml | 2 +-
...er-clusterRoleAggregatedMetricsReader.yaml | 2 +-
.../prometheusAdapter-clusterRoleBinding.yaml | 2 +-
...usAdapter-clusterRoleBindingDelegator.yaml | 2 +-
...eusAdapter-clusterRoleServerResources.yaml | 2 +-
manifests/prometheusAdapter-configMap.yaml | 2 +-
manifests/prometheusAdapter-deployment.yaml | 6 +-
.../prometheusAdapter-networkPolicy.yaml | 2 +-
...prometheusAdapter-podDisruptionBudget.yaml | 2 +-
...ometheusAdapter-roleBindingAuthReader.yaml | 2 +-
manifests/prometheusAdapter-service.yaml | 2 +-
.../prometheusAdapter-serviceAccount.yaml | 2 +-
.../prometheusAdapter-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 | 2 +-
...0alertmanagerCustomResourceDefinition.yaml | 2 +-
.../0podmonitorCustomResourceDefinition.yaml | 2 +-
.../setup/0probeCustomResourceDefinition.yaml | 2 +-
.../0prometheusCustomResourceDefinition.yaml | 221 +++++++++-
...ometheusagentCustomResourceDefinition.yaml | 35 +-
...rometheusruleCustomResourceDefinition.yaml | 2 +-
...0scrapeconfigCustomResourceDefinition.yaml | 387 ++++++++++--------
...ervicemonitorCustomResourceDefinition.yaml | 2 +-
.../0thanosrulerCustomResourceDefinition.yaml | 2 +-
44 files changed, 539 insertions(+), 288 deletions(-)
diff --git a/jsonnet/kube-prometheus/versions.json b/jsonnet/kube-prometheus/versions.json
index 9fd03ef8..2bbe0d5d 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": "10.4.2",
+ "grafana": "11.0.0",
"kubeStateMetrics": "2.12.0",
"nodeExporter": "1.8.0",
"prometheus": "2.52.0",
- "prometheusAdapter": "0.11.2",
- "prometheusOperator": "0.73.2",
+ "prometheusAdapter": "0.12.0",
+ "prometheusOperator": "0.74.0",
"kubeRbacProxy": "0.17.1",
"configmapReload": "0.5.0",
"pyrra": "0.6.4"
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index a75c714b..52389a91 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -18,7 +18,7 @@
"subdir": "contrib/mixin"
}
},
- "version": "333bd7bf7612a9f83cc94e8334565012e84f354f",
+ "version": "3d02cb36f5d1b04a82dd7aefcb0415071e604017",
"sum": "IXI3LQIT9NmTPJAk8WLUJd5+qZfcGpeNCyWIK7oEpws="
},
{
@@ -88,8 +88,8 @@
"subdir": "grafana-builder"
}
},
- "version": "02db06f540086fa3f67d487bd01e1b314853fb8f",
- "sum": "B49EzIY2WZsFxNMJcgRxE/gcZ9ltnS8pkOOV6Q5qioc="
+ "version": "60f98f603ffb2f88b360d9e31dafa5b0422914a7",
+ "sum": "5ku1Hd8UPnjmn8nWyaTFzMpT3Pa+VylBnmposMSVEuU="
},
{
"source": {
@@ -98,7 +98,7 @@
"subdir": "mixin-utils"
}
},
- "version": "54f7f74fe61f3bd05a35f2616505305b2ae1e19a",
+ "version": "60f98f603ffb2f88b360d9e31dafa5b0422914a7",
"sum": "A0f0G3aJEkdu5sqHXtizHDyU1jOSx6VuEXLRlI9Psp8="
},
{
@@ -138,7 +138,7 @@
"subdir": "jsonnet/kube-state-metrics"
}
},
- "version": "2b8eea4e270290520dfd616bdab5e6f2e13b86ad",
+ "version": "fa083b53d0dbe8ae2f0a93870689ad0f490428ff",
"sum": "msMZyUvcebzRILLzNlTIiSOwa1XgQKtP7jbZTkiqwM0="
},
{
@@ -148,7 +148,7 @@
"subdir": "jsonnet/kube-state-metrics-mixin"
}
},
- "version": "2b8eea4e270290520dfd616bdab5e6f2e13b86ad",
+ "version": "fa083b53d0dbe8ae2f0a93870689ad0f490428ff",
"sum": "qclI7LwucTjBef3PkGBkKxF0mfZPbHnn4rlNWKGtR4c="
},
{
@@ -158,7 +158,7 @@
"subdir": "jsonnet/mixin"
}
},
- "version": "11f8eb1665b7228d5752685379f24f64e658a19f",
+ "version": "cd506c4fb584f40b46163926f01ba24a91f5baf5",
"sum": "gi+knjdxs2T715iIQIntrimbHRgHnpM8IFBJDD1gYfs=",
"name": "prometheus-operator-mixin"
},
@@ -169,8 +169,8 @@
"subdir": "jsonnet/prometheus-operator"
}
},
- "version": "11f8eb1665b7228d5752685379f24f64e658a19f",
- "sum": "5Lu5550Raz3BpfO07ITkUMJAZ9wjKhjCOJ3GLstF5uw="
+ "version": "cd506c4fb584f40b46163926f01ba24a91f5baf5",
+ "sum": "XahuGOJRU3s3I+V9/IT4zo43rlA35XiAN7mdfUF/BoA="
},
{
"source": {
@@ -179,7 +179,7 @@
"subdir": "doc/alertmanager-mixin"
}
},
- "version": "c9f73e3ab7d90efa8e62733b3594bfff2a80f35e",
+ "version": "91a94f00f987048fa4f42856165d49370a3af568",
"sum": "IpF46ZXsm+0wJJAPtAre8+yxTNZA57mBqGpBP/r7/kw=",
"name": "alertmanager"
},
@@ -190,7 +190,7 @@
"subdir": "docs/node-mixin"
}
},
- "version": "2ecbe970668b4a6b7e528b6513ac545186a494fd",
+ "version": "3afc0a341e3c2c6605b18a882fb045318c18c444",
"sum": "R9ROsvpjZLgQJ78WAyD4HzrIq976Bpr4V2P2Fo2Kfns="
},
{
@@ -200,8 +200,8 @@
"subdir": "documentation/prometheus-mixin"
}
},
- "version": "3b8b57700c469c7cde84e1d8f9d383cb8fe11ab0",
- "sum": "u/Fpz2MPkezy71/q+c7mF0vc3hE9fWt2W/YbvF0LP/8=",
+ "version": "114dc5c393ce54ac663a2466a82571e1e0e0d03d",
+ "sum": "vGD+MxGadIBvvDC+/71BRKWEA8vHgcuBP5PcuCKZGEs=",
"name": "prometheus"
},
{
@@ -222,7 +222,7 @@
"subdir": "mixin"
}
},
- "version": "2d738f0dedb99adf2c89854935138114ecc37896",
+ "version": "9e6cbd9fdd9df17125e20ecf7a084198e4355b9a",
"sum": "HhSSbGGCNHCMy1ee5jElYDm0yS9Vesa7QB2/SHKdjsY=",
"name": "thanos-mixin"
},
diff --git a/manifests/grafana-config.yaml b/manifests/grafana-config.yaml
index 79615a79..9092902b 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: 10.4.2
+ app.kubernetes.io/version: 11.0.0
name: grafana-config
namespace: monitoring
stringData:
diff --git a/manifests/grafana-dashboardDatasources.yaml b/manifests/grafana-dashboardDatasources.yaml
index d1744c0d..9a2de82c 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: 10.4.2
+ app.kubernetes.io/version: 11.0.0
name: grafana-datasources
namespace: monitoring
stringData:
diff --git a/manifests/grafana-dashboardDefinitions.yaml b/manifests/grafana-dashboardDefinitions.yaml
index 5e8dd0a3..4446708e 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: 10.4.2
+ app.kubernetes.io/version: 11.0.0
name: grafana-dashboard-alertmanager-overview
namespace: monitoring
- apiVersion: v1
@@ -1469,7 +1469,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.4.2
+ app.kubernetes.io/version: 11.0.0
name: grafana-dashboard-apiserver
namespace: monitoring
- apiVersion: v1
@@ -2270,7 +2270,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.4.2
+ app.kubernetes.io/version: 11.0.0
name: grafana-dashboard-cluster-total
namespace: monitoring
- apiVersion: v1
@@ -2861,7 +2861,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.4.2
+ app.kubernetes.io/version: 11.0.0
name: grafana-dashboard-controller-manager
namespace: monitoring
- apiVersion: v1
@@ -3486,7 +3486,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.4.2
+ app.kubernetes.io/version: 11.0.0
name: grafana-dashboard-grafana-overview
namespace: monitoring
- apiVersion: v1
@@ -5060,7 +5060,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.4.2
+ app.kubernetes.io/version: 11.0.0
name: grafana-dashboard-k8s-resources-cluster
namespace: monitoring
- apiVersion: v1
@@ -5688,7 +5688,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.4.2
+ app.kubernetes.io/version: 11.0.0
name: grafana-dashboard-k8s-resources-multicluster
namespace: monitoring
- apiVersion: v1
@@ -7193,7 +7193,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.4.2
+ app.kubernetes.io/version: 11.0.0
name: grafana-dashboard-k8s-resources-namespace
namespace: monitoring
- apiVersion: v1
@@ -7758,7 +7758,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.4.2
+ app.kubernetes.io/version: 11.0.0
name: grafana-dashboard-k8s-resources-node
namespace: monitoring
- apiVersion: v1
@@ -9129,7 +9129,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.4.2
+ app.kubernetes.io/version: 11.0.0
name: grafana-dashboard-k8s-resources-pod
namespace: monitoring
- apiVersion: v1
@@ -10182,7 +10182,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.4.2
+ app.kubernetes.io/version: 11.0.0
name: grafana-dashboard-k8s-resources-workload
namespace: monitoring
- apiVersion: v1
@@ -11432,7 +11432,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.4.2
+ app.kubernetes.io/version: 11.0.0
name: grafana-dashboard-k8s-resources-workloads-namespace
namespace: monitoring
- apiVersion: v1
@@ -12672,7 +12672,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.4.2
+ app.kubernetes.io/version: 11.0.0
name: grafana-dashboard-kubelet
namespace: monitoring
- apiVersion: v1
@@ -13297,7 +13297,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.4.2
+ app.kubernetes.io/version: 11.0.0
name: grafana-dashboard-namespace-by-pod
namespace: monitoring
- apiVersion: v1
@@ -14080,7 +14080,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.4.2
+ app.kubernetes.io/version: 11.0.0
name: grafana-dashboard-namespace-by-workload
namespace: monitoring
- apiVersion: v1
@@ -15132,7 +15132,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.4.2
+ app.kubernetes.io/version: 11.0.0
name: grafana-dashboard-node-cluster-rsrc-use
namespace: monitoring
- apiVersion: v1
@@ -16210,7 +16210,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.4.2
+ app.kubernetes.io/version: 11.0.0
name: grafana-dashboard-node-rsrc-use
namespace: monitoring
- apiVersion: v1
@@ -17298,7 +17298,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.4.2
+ app.kubernetes.io/version: 11.0.0
name: grafana-dashboard-nodes-darwin
namespace: monitoring
- apiVersion: v1
@@ -18379,7 +18379,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.4.2
+ app.kubernetes.io/version: 11.0.0
name: grafana-dashboard-nodes
namespace: monitoring
- apiVersion: v1
@@ -18688,7 +18688,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.4.2
+ app.kubernetes.io/version: 11.0.0
name: grafana-dashboard-persistentvolumesusage
namespace: monitoring
- apiVersion: v1
@@ -19167,7 +19167,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.4.2
+ app.kubernetes.io/version: 11.0.0
name: grafana-dashboard-pod-total
namespace: monitoring
- apiVersion: v1
@@ -20826,7 +20826,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.4.2
+ app.kubernetes.io/version: 11.0.0
name: grafana-dashboard-prometheus-remote-write
namespace: monitoring
- apiVersion: v1
@@ -22067,7 +22067,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.4.2
+ app.kubernetes.io/version: 11.0.0
name: grafana-dashboard-prometheus
namespace: monitoring
- apiVersion: v1
@@ -22709,7 +22709,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.4.2
+ app.kubernetes.io/version: 11.0.0
name: grafana-dashboard-proxy
namespace: monitoring
- apiVersion: v1
@@ -23297,7 +23297,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.4.2
+ app.kubernetes.io/version: 11.0.0
name: grafana-dashboard-scheduler
namespace: monitoring
- apiVersion: v1
@@ -23866,7 +23866,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.4.2
+ app.kubernetes.io/version: 11.0.0
name: grafana-dashboard-workload-total
namespace: monitoring
kind: ConfigMapList
diff --git a/manifests/grafana-dashboardSources.yaml b/manifests/grafana-dashboardSources.yaml
index cd85d568..423ebc43 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: 10.4.2
+ app.kubernetes.io/version: 11.0.0
name: grafana-dashboards
namespace: monitoring
diff --git a/manifests/grafana-deployment.yaml b/manifests/grafana-deployment.yaml
index 1b65b4c6..e6e94ced 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: 10.4.2
+ app.kubernetes.io/version: 11.0.0
name: grafana
namespace: monitoring
spec:
@@ -18,19 +18,19 @@ spec:
template:
metadata:
annotations:
- checksum/grafana-config: ceccc477273d554debbf23572ff15ef4
- checksum/grafana-dashboardproviders: ab14296c6b92621a8ea4ee79ae009167
- checksum/grafana-datasources: cd5ab83f81c52af46197b4f367a85583
+ checksum/grafana-config: f3697c98a79fc4a11c1d616d869584f4
+ checksum/grafana-dashboardproviders: f4a0c73003700d26a752d804d0da0113
+ checksum/grafana-datasources: 6c462174ecc02c2103eca46c6c60cdee
labels:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.4.2
+ app.kubernetes.io/version: 11.0.0
spec:
automountServiceAccountToken: false
containers:
- env: []
- image: grafana/grafana:10.4.2
+ image: grafana/grafana:11.0.0
name: grafana
ports:
- containerPort: 3000
diff --git a/manifests/grafana-networkPolicy.yaml b/manifests/grafana-networkPolicy.yaml
index 19f85fdd..665d7244 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: 10.4.2
+ app.kubernetes.io/version: 11.0.0
name: grafana
namespace: monitoring
spec:
diff --git a/manifests/grafana-prometheusRule.yaml b/manifests/grafana-prometheusRule.yaml
index caf4bd29..833fda98 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: 10.4.2
+ app.kubernetes.io/version: 11.0.0
prometheus: k8s
role: alert-rules
name: grafana-rules
diff --git a/manifests/grafana-service.yaml b/manifests/grafana-service.yaml
index 0bc05663..578ee918 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: 10.4.2
+ app.kubernetes.io/version: 11.0.0
name: grafana
namespace: monitoring
spec:
diff --git a/manifests/grafana-serviceAccount.yaml b/manifests/grafana-serviceAccount.yaml
index e0bab491..445b6f22 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: 10.4.2
+ app.kubernetes.io/version: 11.0.0
name: grafana
namespace: monitoring
diff --git a/manifests/grafana-serviceMonitor.yaml b/manifests/grafana-serviceMonitor.yaml
index b20fa237..5ea5b9e9 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: 10.4.2
+ app.kubernetes.io/version: 11.0.0
name: grafana
namespace: monitoring
spec:
diff --git a/manifests/prometheusAdapter-apiService.yaml b/manifests/prometheusAdapter-apiService.yaml
index 034d28e8..4618e9c1 100644
--- a/manifests/prometheusAdapter-apiService.yaml
+++ b/manifests/prometheusAdapter-apiService.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: metrics-adapter
app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.11.2
+ app.kubernetes.io/version: 0.12.0
name: v1beta1.metrics.k8s.io
spec:
group: metrics.k8s.io
diff --git a/manifests/prometheusAdapter-clusterRole.yaml b/manifests/prometheusAdapter-clusterRole.yaml
index 47ea9a28..d1af3163 100644
--- a/manifests/prometheusAdapter-clusterRole.yaml
+++ b/manifests/prometheusAdapter-clusterRole.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: metrics-adapter
app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.11.2
+ app.kubernetes.io/version: 0.12.0
name: prometheus-adapter
rules:
- apiGroups:
diff --git a/manifests/prometheusAdapter-clusterRoleAggregatedMetricsReader.yaml b/manifests/prometheusAdapter-clusterRoleAggregatedMetricsReader.yaml
index f5c4cdba..672c8c43 100644
--- a/manifests/prometheusAdapter-clusterRoleAggregatedMetricsReader.yaml
+++ b/manifests/prometheusAdapter-clusterRoleAggregatedMetricsReader.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: metrics-adapter
app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.11.2
+ app.kubernetes.io/version: 0.12.0
rbac.authorization.k8s.io/aggregate-to-admin: "true"
rbac.authorization.k8s.io/aggregate-to-edit: "true"
rbac.authorization.k8s.io/aggregate-to-view: "true"
diff --git a/manifests/prometheusAdapter-clusterRoleBinding.yaml b/manifests/prometheusAdapter-clusterRoleBinding.yaml
index 41ce7954..1c6cb300 100644
--- a/manifests/prometheusAdapter-clusterRoleBinding.yaml
+++ b/manifests/prometheusAdapter-clusterRoleBinding.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: metrics-adapter
app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.11.2
+ app.kubernetes.io/version: 0.12.0
name: prometheus-adapter
roleRef:
apiGroup: rbac.authorization.k8s.io
diff --git a/manifests/prometheusAdapter-clusterRoleBindingDelegator.yaml b/manifests/prometheusAdapter-clusterRoleBindingDelegator.yaml
index 3cf636ed..63f7ccc7 100644
--- a/manifests/prometheusAdapter-clusterRoleBindingDelegator.yaml
+++ b/manifests/prometheusAdapter-clusterRoleBindingDelegator.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: metrics-adapter
app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.11.2
+ app.kubernetes.io/version: 0.12.0
name: resource-metrics:system:auth-delegator
roleRef:
apiGroup: rbac.authorization.k8s.io
diff --git a/manifests/prometheusAdapter-clusterRoleServerResources.yaml b/manifests/prometheusAdapter-clusterRoleServerResources.yaml
index 4d55aeb6..22eba1d0 100644
--- a/manifests/prometheusAdapter-clusterRoleServerResources.yaml
+++ b/manifests/prometheusAdapter-clusterRoleServerResources.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: metrics-adapter
app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.11.2
+ app.kubernetes.io/version: 0.12.0
name: resource-metrics-server-resources
rules:
- apiGroups:
diff --git a/manifests/prometheusAdapter-configMap.yaml b/manifests/prometheusAdapter-configMap.yaml
index 9e38cc81..a39a8743 100644
--- a/manifests/prometheusAdapter-configMap.yaml
+++ b/manifests/prometheusAdapter-configMap.yaml
@@ -64,6 +64,6 @@ metadata:
app.kubernetes.io/component: metrics-adapter
app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.11.2
+ app.kubernetes.io/version: 0.12.0
name: adapter-config
namespace: monitoring
diff --git a/manifests/prometheusAdapter-deployment.yaml b/manifests/prometheusAdapter-deployment.yaml
index d60fcc33..d97e02a5 100644
--- a/manifests/prometheusAdapter-deployment.yaml
+++ b/manifests/prometheusAdapter-deployment.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: metrics-adapter
app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.11.2
+ app.kubernetes.io/version: 0.12.0
name: prometheus-adapter
namespace: monitoring
spec:
@@ -27,7 +27,7 @@ spec:
app.kubernetes.io/component: metrics-adapter
app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.11.2
+ app.kubernetes.io/version: 0.12.0
spec:
automountServiceAccountToken: true
containers:
@@ -38,7 +38,7 @@ spec:
- --prometheus-url=http://prometheus-k8s.monitoring.svc:9090/
- --secure-port=6443
- --tls-cipher-suites=TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,TLS_RSA_WITH_AES_128_GCM_SHA256,TLS_RSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_256_CBC_SHA
- image: registry.k8s.io/prometheus-adapter/prometheus-adapter:v0.11.2
+ image: registry.k8s.io/prometheus-adapter/prometheus-adapter:v0.12.0
livenessProbe:
failureThreshold: 5
httpGet:
diff --git a/manifests/prometheusAdapter-networkPolicy.yaml b/manifests/prometheusAdapter-networkPolicy.yaml
index 77589c53..df8c6644 100644
--- a/manifests/prometheusAdapter-networkPolicy.yaml
+++ b/manifests/prometheusAdapter-networkPolicy.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: metrics-adapter
app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.11.2
+ app.kubernetes.io/version: 0.12.0
name: prometheus-adapter
namespace: monitoring
spec:
diff --git a/manifests/prometheusAdapter-podDisruptionBudget.yaml b/manifests/prometheusAdapter-podDisruptionBudget.yaml
index 6998768a..09348f7e 100644
--- a/manifests/prometheusAdapter-podDisruptionBudget.yaml
+++ b/manifests/prometheusAdapter-podDisruptionBudget.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: metrics-adapter
app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.11.2
+ app.kubernetes.io/version: 0.12.0
name: prometheus-adapter
namespace: monitoring
spec:
diff --git a/manifests/prometheusAdapter-roleBindingAuthReader.yaml b/manifests/prometheusAdapter-roleBindingAuthReader.yaml
index 91bc3b12..c21491a5 100644
--- a/manifests/prometheusAdapter-roleBindingAuthReader.yaml
+++ b/manifests/prometheusAdapter-roleBindingAuthReader.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: metrics-adapter
app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.11.2
+ app.kubernetes.io/version: 0.12.0
name: resource-metrics-auth-reader
namespace: kube-system
roleRef:
diff --git a/manifests/prometheusAdapter-service.yaml b/manifests/prometheusAdapter-service.yaml
index 11c42df5..033f93eb 100644
--- a/manifests/prometheusAdapter-service.yaml
+++ b/manifests/prometheusAdapter-service.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: metrics-adapter
app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.11.2
+ app.kubernetes.io/version: 0.12.0
name: prometheus-adapter
namespace: monitoring
spec:
diff --git a/manifests/prometheusAdapter-serviceAccount.yaml b/manifests/prometheusAdapter-serviceAccount.yaml
index f7601e89..04ab1787 100644
--- a/manifests/prometheusAdapter-serviceAccount.yaml
+++ b/manifests/prometheusAdapter-serviceAccount.yaml
@@ -6,6 +6,6 @@ metadata:
app.kubernetes.io/component: metrics-adapter
app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.11.2
+ app.kubernetes.io/version: 0.12.0
name: prometheus-adapter
namespace: monitoring
diff --git a/manifests/prometheusAdapter-serviceMonitor.yaml b/manifests/prometheusAdapter-serviceMonitor.yaml
index 1038954e..0fe1e8a9 100644
--- a/manifests/prometheusAdapter-serviceMonitor.yaml
+++ b/manifests/prometheusAdapter-serviceMonitor.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: metrics-adapter
app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.11.2
+ app.kubernetes.io/version: 0.12.0
name: prometheus-adapter
namespace: monitoring
spec:
diff --git a/manifests/prometheusOperator-clusterRole.yaml b/manifests/prometheusOperator-clusterRole.yaml
index 0eb04d0d..1c2c9bf3 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.73.2
+ app.kubernetes.io/version: 0.74.0
name: prometheus-operator
rules:
- apiGroups:
diff --git a/manifests/prometheusOperator-clusterRoleBinding.yaml b/manifests/prometheusOperator-clusterRoleBinding.yaml
index 88b3095f..1f664719 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.73.2
+ app.kubernetes.io/version: 0.74.0
name: prometheus-operator
roleRef:
apiGroup: rbac.authorization.k8s.io
diff --git a/manifests/prometheusOperator-deployment.yaml b/manifests/prometheusOperator-deployment.yaml
index 9b164f6a..2572d5b7 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.73.2
+ app.kubernetes.io/version: 0.74.0
name: prometheus-operator
namespace: monitoring
spec:
@@ -23,17 +23,17 @@ spec:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.73.2
+ app.kubernetes.io/version: 0.74.0
spec:
automountServiceAccountToken: true
containers:
- args:
- --kubelet-service=kube-system/kubelet
- - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.73.2
+ - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.74.0
env:
- name: GOGC
value: "30"
- image: quay.io/prometheus-operator/prometheus-operator:v0.73.2
+ image: quay.io/prometheus-operator/prometheus-operator:v0.74.0
name: prometheus-operator
ports:
- containerPort: 8080
diff --git a/manifests/prometheusOperator-networkPolicy.yaml b/manifests/prometheusOperator-networkPolicy.yaml
index 3be10d3f..6fb04d22 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.73.2
+ app.kubernetes.io/version: 0.74.0
name: prometheus-operator
namespace: monitoring
spec:
diff --git a/manifests/prometheusOperator-prometheusRule.yaml b/manifests/prometheusOperator-prometheusRule.yaml
index 8fb179f9..d63df60b 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.73.2
+ app.kubernetes.io/version: 0.74.0
prometheus: k8s
role: alert-rules
name: prometheus-operator-rules
diff --git a/manifests/prometheusOperator-service.yaml b/manifests/prometheusOperator-service.yaml
index fefa24f2..a58d824f 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.73.2
+ app.kubernetes.io/version: 0.74.0
name: prometheus-operator
namespace: monitoring
spec:
diff --git a/manifests/prometheusOperator-serviceAccount.yaml b/manifests/prometheusOperator-serviceAccount.yaml
index 01d100dd..3746e6bf 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.73.2
+ app.kubernetes.io/version: 0.74.0
name: prometheus-operator
namespace: monitoring
diff --git a/manifests/prometheusOperator-serviceMonitor.yaml b/manifests/prometheusOperator-serviceMonitor.yaml
index 4b464b41..967761bf 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.73.2
+ app.kubernetes.io/version: 0.74.0
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.73.2
+ app.kubernetes.io/version: 0.74.0
diff --git a/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml b/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml
index 58cb34b4..b011c55b 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.14.0
- operator.prometheus.io/version: 0.73.2
+ operator.prometheus.io/version: 0.74.0
name: alertmanagerconfigs.monitoring.coreos.com
spec:
group: monitoring.coreos.com
diff --git a/manifests/setup/0alertmanagerCustomResourceDefinition.yaml b/manifests/setup/0alertmanagerCustomResourceDefinition.yaml
index 5933a7d1..1ed7607b 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.14.0
- operator.prometheus.io/version: 0.73.2
+ operator.prometheus.io/version: 0.74.0
name: alertmanagers.monitoring.coreos.com
spec:
group: monitoring.coreos.com
diff --git a/manifests/setup/0podmonitorCustomResourceDefinition.yaml b/manifests/setup/0podmonitorCustomResourceDefinition.yaml
index 617526a5..11dab464 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.14.0
- operator.prometheus.io/version: 0.73.2
+ operator.prometheus.io/version: 0.74.0
name: podmonitors.monitoring.coreos.com
spec:
group: monitoring.coreos.com
diff --git a/manifests/setup/0probeCustomResourceDefinition.yaml b/manifests/setup/0probeCustomResourceDefinition.yaml
index 77d20bc0..a0a4a5b2 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.14.0
- operator.prometheus.io/version: 0.73.2
+ operator.prometheus.io/version: 0.74.0
name: probes.monitoring.coreos.com
spec:
group: monitoring.coreos.com
diff --git a/manifests/setup/0prometheusCustomResourceDefinition.yaml b/manifests/setup/0prometheusCustomResourceDefinition.yaml
index 74971d27..c07bfe89 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.14.0
- operator.prometheus.io/version: 0.73.2
+ operator.prometheus.io/version: 0.74.0
name: prometheuses.monitoring.coreos.com
spec:
group: monitoring.coreos.com
@@ -1059,6 +1059,100 @@ spec:
AlertmanagerEndpoints defines a selection of a single Endpoints object
containing Alertmanager IPs to fire alerts against.
properties:
+ alertRelabelings:
+ description: |-
+ Relabeling configs applied before sending alerts to a specific Alertmanager.
+ It requires Prometheus >= v2.51.0.
+ items:
+ description: |-
+ RelabelConfig allows dynamic rewriting of the label set for targets, alerts,
+ scraped samples and remote write samples.
+
+
+ More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config
+ properties:
+ action:
+ default: replace
+ description: |-
+ Action to perform based on the regex matching.
+
+
+ `Uppercase` and `Lowercase` actions require Prometheus >= v2.36.0.
+ `DropEqual` and `KeepEqual` actions require Prometheus >= v2.41.0.
+
+
+ Default: "Replace"
+ 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.
+
+
+ Only applicable when the action is `HashMod`.
+ format: int64
+ type: integer
+ regex:
+ description: Regular expression against which the extracted value is matched.
+ type: string
+ replacement:
+ description: |-
+ Replacement value against which a Replace action is performed if the
+ regular expression matches.
+
+
+ Regex capture groups are available.
+ type: string
+ separator:
+ description: Separator is the string between concatenated SourceLabels.
+ 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.
+ 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 string is written in a replacement.
+
+
+ It is mandatory for `Replace`, `HashMod`, `Lowercase`, `Uppercase`,
+ `KeepEqual` and `DropEqual` actions.
+
+
+ Regex capture groups are available.
+ type: string
+ type: object
+ type: array
apiVersion:
description: |-
Version of the Alertmanager API that Prometheus uses to send alerts.
@@ -1179,6 +1273,98 @@ spec:
- type: string
description: Port on which the Alertmanager API is exposed.
x-kubernetes-int-or-string: true
+ relabelings:
+ description: Relabel configuration applied to the discovered Alertmanagers.
+ items:
+ description: |-
+ RelabelConfig allows dynamic rewriting of the label set for targets, alerts,
+ scraped samples and remote write samples.
+
+
+ More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config
+ properties:
+ action:
+ default: replace
+ description: |-
+ Action to perform based on the regex matching.
+
+
+ `Uppercase` and `Lowercase` actions require Prometheus >= v2.36.0.
+ `DropEqual` and `KeepEqual` actions require Prometheus >= v2.41.0.
+
+
+ Default: "Replace"
+ 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.
+
+
+ Only applicable when the action is `HashMod`.
+ format: int64
+ type: integer
+ regex:
+ description: Regular expression against which the extracted value is matched.
+ type: string
+ replacement:
+ description: |-
+ Replacement value against which a Replace action is performed if the
+ regular expression matches.
+
+
+ Regex capture groups are available.
+ type: string
+ separator:
+ description: Separator is the string between concatenated SourceLabels.
+ 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.
+ 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 string is written in a replacement.
+
+
+ It is mandatory for `Replace`, `HashMod`, `Lowercase`, `Uppercase`,
+ `KeepEqual` and `DropEqual` actions.
+
+
+ Regex capture groups are available.
+ type: string
+ type: object
+ type: array
scheme:
description: Scheme to use when firing alerts.
type: string
@@ -5495,7 +5681,7 @@ spec:
managedIdentity:
description: |-
ManagedIdentity defines the Azure User-assigned Managed identity.
- Cannot be set at the same time as `oauth`.
+ Cannot be set at the same time as `oauth` or `sdk`.
properties:
clientId:
description: The client id
@@ -5506,7 +5692,7 @@ spec:
oauth:
description: |-
OAuth defines the oauth config that is being used to authenticate.
- Cannot be set at the same time as `managedIdentity`.
+ Cannot be set at the same time as `managedIdentity` or `sdk`.
It requires Prometheus >= v2.48.0.
@@ -5535,7 +5721,7 @@ spec:
type: object
x-kubernetes-map-type: atomic
tenantId:
- description: '`tenantID` is the tenant ID of the Azure Active Directory application that is being used to authenticate.'
+ description: '`tenantId` is the tenant ID of the Azure Active Directory application that is being used to authenticate.'
minLength: 1
pattern: ^[0-9a-zA-Z-.]+$
type: string
@@ -5544,6 +5730,20 @@ spec:
- clientSecret
- tenantId
type: object
+ sdk:
+ description: |-
+ SDK defines the Azure SDK config that is being used to authenticate.
+ See https://learn.microsoft.com/en-us/azure/developer/go/azure-sdk-authentication
+ Cannot be set at the same time as `oauth` or `managedIdentity`.
+
+
+ It requires Prometheus >= 2.52.0.
+ properties:
+ tenantId:
+ description: '`tenantId` is the tenant ID of the azure active directory application that is being used to authenticate.'
+ pattern: ^[0-9a-zA-Z-.]+$
+ type: string
+ type: object
type: object
basicAuth:
description: |-
@@ -6326,10 +6526,11 @@ spec:
properties:
default:
description: |-
- Default indicates that the scrape applies to all scrape objects that don't configure an explicit scrape class name.
+ Default indicates that the scrape applies to all scrape objects that
+ don't configure an explicit scrape class name.
- Only one scrape class can be set as default.
+ Only one scrape class can be set as the default.
type: boolean
name:
description: Name of the scrape class.
@@ -6438,7 +6639,13 @@ spec:
type: object
type: array
tlsConfig:
- description: TLSConfig section for scrapes.
+ description: |-
+ TLSConfig defines the TLS settings to use for the scrape. When the
+ scrape objects define their own CA, certificate and/or key, they take
+ precedence over the corresponding scrape class fields.
+
+
+ For now only the `caFile`, `certFile` and `keyFile` fields are supported.
properties:
ca:
description: Certificate authority used when verifying server certificates.
diff --git a/manifests/setup/0prometheusagentCustomResourceDefinition.yaml b/manifests/setup/0prometheusagentCustomResourceDefinition.yaml
index ff044849..3e9ac6b4 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.14.0
- operator.prometheus.io/version: 0.73.2
+ operator.prometheus.io/version: 0.74.0
name: prometheusagents.monitoring.coreos.com
spec:
group: monitoring.coreos.com
@@ -4588,7 +4588,7 @@ spec:
managedIdentity:
description: |-
ManagedIdentity defines the Azure User-assigned Managed identity.
- Cannot be set at the same time as `oauth`.
+ Cannot be set at the same time as `oauth` or `sdk`.
properties:
clientId:
description: The client id
@@ -4599,7 +4599,7 @@ spec:
oauth:
description: |-
OAuth defines the oauth config that is being used to authenticate.
- Cannot be set at the same time as `managedIdentity`.
+ Cannot be set at the same time as `managedIdentity` or `sdk`.
It requires Prometheus >= v2.48.0.
@@ -4628,7 +4628,7 @@ spec:
type: object
x-kubernetes-map-type: atomic
tenantId:
- description: '`tenantID` is the tenant ID of the Azure Active Directory application that is being used to authenticate.'
+ description: '`tenantId` is the tenant ID of the Azure Active Directory application that is being used to authenticate.'
minLength: 1
pattern: ^[0-9a-zA-Z-.]+$
type: string
@@ -4637,6 +4637,20 @@ spec:
- clientSecret
- tenantId
type: object
+ sdk:
+ description: |-
+ SDK defines the Azure SDK config that is being used to authenticate.
+ See https://learn.microsoft.com/en-us/azure/developer/go/azure-sdk-authentication
+ Cannot be set at the same time as `oauth` or `managedIdentity`.
+
+
+ It requires Prometheus >= 2.52.0.
+ properties:
+ tenantId:
+ description: '`tenantId` is the tenant ID of the azure active directory application that is being used to authenticate.'
+ pattern: ^[0-9a-zA-Z-.]+$
+ type: string
+ type: object
type: object
basicAuth:
description: |-
@@ -5287,10 +5301,11 @@ spec:
properties:
default:
description: |-
- Default indicates that the scrape applies to all scrape objects that don't configure an explicit scrape class name.
+ Default indicates that the scrape applies to all scrape objects that
+ don't configure an explicit scrape class name.
- Only one scrape class can be set as default.
+ Only one scrape class can be set as the default.
type: boolean
name:
description: Name of the scrape class.
@@ -5399,7 +5414,13 @@ spec:
type: object
type: array
tlsConfig:
- description: TLSConfig section for scrapes.
+ description: |-
+ TLSConfig defines the TLS settings to use for the scrape. When the
+ scrape objects define their own CA, certificate and/or key, they take
+ precedence over the corresponding scrape class fields.
+
+
+ For now only the `caFile`, `certFile` and `keyFile` fields are supported.
properties:
ca:
description: Certificate authority used when verifying server certificates.
diff --git a/manifests/setup/0prometheusruleCustomResourceDefinition.yaml b/manifests/setup/0prometheusruleCustomResourceDefinition.yaml
index 4f900a71..d210d11f 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.14.0
- operator.prometheus.io/version: 0.73.2
+ operator.prometheus.io/version: 0.74.0
name: prometheusrules.monitoring.coreos.com
spec:
group: monitoring.coreos.com
diff --git a/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml b/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml
index b6a6721c..a872cf9f 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.14.0
- operator.prometheus.io/version: 0.73.2
+ operator.prometheus.io/version: 0.74.0
name: scrapeconfigs.monitoring.coreos.com
spec:
group: monitoring.coreos.com
@@ -246,24 +246,26 @@ spec:
type: object
proxyConnectHeader:
additionalProperties:
- description: SecretKeySelector selects a key of a Secret.
- properties:
- key:
- description: The key of the secret to select from. Must be a valid secret key.
- type: string
- name:
- description: |-
- Name of the referent.
- More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
- TODO: Add other useful fields. apiVersion, kind, uid?
- type: string
- optional:
- description: Specify whether the Secret or its key must be defined
- type: boolean
- required:
- - key
- type: object
- x-kubernetes-map-type: atomic
+ items:
+ description: SecretKeySelector selects a key of a Secret.
+ properties:
+ key:
+ description: The key of the secret to select from. Must be a valid secret key.
+ type: string
+ name:
+ description: |-
+ Name of the referent.
+ More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ TODO: Add other useful fields. apiVersion, kind, uid?
+ type: string
+ optional:
+ description: Specify whether the Secret or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ type: array
description: |-
ProxyConnectHeader optionally specifies headers to send to
proxies during CONNECT requests.
@@ -461,11 +463,14 @@ spec:
properties:
authenticationMethod:
description: |-
- # The authentication method, either OAuth or ManagedIdentity.
+ # The authentication method, either `OAuth` or `ManagedIdentity` or `SDK`.
See https://docs.microsoft.com/en-us/azure/active-directory/managed-identities-azure-resources/overview
+ SDK authentication method uses environment variables by default.
+ See https://learn.microsoft.com/en-us/azure/developer/go/azure-sdk-authentication
enum:
- OAuth
- ManagedIdentity
+ - SDK
type: string
clientID:
description: Optional client ID. Only required with the OAuth authentication method.
@@ -779,24 +784,26 @@ spec:
type: string
proxyConnectHeader:
additionalProperties:
- description: SecretKeySelector selects a key of a Secret.
- properties:
- key:
- description: The key of the secret to select from. Must be a valid secret key.
- type: string
- name:
- description: |-
- Name of the referent.
- More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
- TODO: Add other useful fields. apiVersion, kind, uid?
- type: string
- optional:
- description: Specify whether the Secret or its key must be defined
- type: boolean
- required:
- - key
- type: object
- x-kubernetes-map-type: atomic
+ items:
+ description: SecretKeySelector selects a key of a Secret.
+ properties:
+ key:
+ description: The key of the secret to select from. Must be a valid secret key.
+ type: string
+ name:
+ description: |-
+ Name of the referent.
+ More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ TODO: Add other useful fields. apiVersion, kind, uid?
+ type: string
+ optional:
+ description: Specify whether the Secret or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ type: array
description: |-
ProxyConnectHeader optionally specifies headers to send to
proxies during CONNECT requests.
@@ -1145,24 +1152,26 @@ spec:
type: integer
proxyConnectHeader:
additionalProperties:
- description: SecretKeySelector selects a key of a Secret.
- properties:
- key:
- description: The key of the secret to select from. Must be a valid secret key.
- type: string
- name:
- description: |-
- Name of the referent.
- More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
- TODO: Add other useful fields. apiVersion, kind, uid?
- type: string
- optional:
- description: Specify whether the Secret or its key must be defined
- type: boolean
- required:
- - key
- type: object
- x-kubernetes-map-type: atomic
+ items:
+ description: SecretKeySelector selects a key of a Secret.
+ properties:
+ key:
+ description: The key of the secret to select from. Must be a valid secret key.
+ type: string
+ name:
+ description: |-
+ Name of the referent.
+ More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ TODO: Add other useful fields. apiVersion, kind, uid?
+ type: string
+ optional:
+ description: Specify whether the Secret or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ type: array
description: |-
ProxyConnectHeader optionally specifies headers to send to
proxies during CONNECT requests.
@@ -1573,24 +1582,26 @@ spec:
type: integer
proxyConnectHeader:
additionalProperties:
- description: SecretKeySelector selects a key of a Secret.
- properties:
- key:
- description: The key of the secret to select from. Must be a valid secret key.
- type: string
- name:
- description: |-
- Name of the referent.
- More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
- TODO: Add other useful fields. apiVersion, kind, uid?
- type: string
- optional:
- description: Specify whether the Secret or its key must be defined
- type: boolean
- required:
- - key
- type: object
- x-kubernetes-map-type: atomic
+ items:
+ description: SecretKeySelector selects a key of a Secret.
+ properties:
+ key:
+ description: The key of the secret to select from. Must be a valid secret key.
+ type: string
+ name:
+ description: |-
+ Name of the referent.
+ More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ TODO: Add other useful fields. apiVersion, kind, uid?
+ type: string
+ optional:
+ description: Specify whether the Secret or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ type: array
description: |-
ProxyConnectHeader optionally specifies headers to send to
proxies during CONNECT requests.
@@ -2025,24 +2036,26 @@ spec:
type: object
proxyConnectHeader:
additionalProperties:
- description: SecretKeySelector selects a key of a Secret.
- properties:
- key:
- description: The key of the secret to select from. Must be a valid secret key.
- type: string
- name:
- description: |-
- Name of the referent.
- More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
- TODO: Add other useful fields. apiVersion, kind, uid?
- type: string
- optional:
- description: Specify whether the Secret or its key must be defined
- type: boolean
- required:
- - key
- type: object
- x-kubernetes-map-type: atomic
+ items:
+ description: SecretKeySelector selects a key of a Secret.
+ properties:
+ key:
+ description: The key of the secret to select from. Must be a valid secret key.
+ type: string
+ name:
+ description: |-
+ Name of the referent.
+ More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ TODO: Add other useful fields. apiVersion, kind, uid?
+ type: string
+ optional:
+ description: Specify whether the Secret or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ type: array
description: |-
ProxyConnectHeader optionally specifies headers to send to
proxies during CONNECT requests.
@@ -2472,24 +2485,26 @@ spec:
type: integer
proxyConnectHeader:
additionalProperties:
- description: SecretKeySelector selects a key of a Secret.
- properties:
- key:
- description: The key of the secret to select from. Must be a valid secret key.
- type: string
- name:
- description: |-
- Name of the referent.
- More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
- TODO: Add other useful fields. apiVersion, kind, uid?
- type: string
- optional:
- description: Specify whether the Secret or its key must be defined
- type: boolean
- required:
- - key
- type: object
- x-kubernetes-map-type: atomic
+ items:
+ description: SecretKeySelector selects a key of a Secret.
+ properties:
+ key:
+ description: The key of the secret to select from. Must be a valid secret key.
+ type: string
+ name:
+ description: |-
+ Name of the referent.
+ More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ TODO: Add other useful fields. apiVersion, kind, uid?
+ type: string
+ optional:
+ description: Specify whether the Secret or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ type: array
description: |-
ProxyConnectHeader optionally specifies headers to send to
proxies during CONNECT requests.
@@ -2748,24 +2763,26 @@ spec:
type: string
proxyConnectHeader:
additionalProperties:
- description: SecretKeySelector selects a key of a Secret.
- properties:
- key:
- description: The key of the secret to select from. Must be a valid secret key.
- type: string
- name:
- description: |-
- Name of the referent.
- More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
- TODO: Add other useful fields. apiVersion, kind, uid?
- type: string
- optional:
- description: Specify whether the Secret or its key must be defined
- type: boolean
- required:
- - key
- type: object
- x-kubernetes-map-type: atomic
+ items:
+ description: SecretKeySelector selects a key of a Secret.
+ properties:
+ key:
+ description: The key of the secret to select from. Must be a valid secret key.
+ type: string
+ name:
+ description: |-
+ Name of the referent.
+ More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ TODO: Add other useful fields. apiVersion, kind, uid?
+ type: string
+ optional:
+ description: Specify whether the Secret or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ type: array
description: |-
ProxyConnectHeader optionally specifies headers to send to
proxies during CONNECT requests.
@@ -3161,24 +3178,26 @@ spec:
type: object
proxyConnectHeader:
additionalProperties:
- description: SecretKeySelector selects a key of a Secret.
- properties:
- key:
- description: The key of the secret to select from. Must be a valid secret key.
- type: string
- name:
- description: |-
- Name of the referent.
- More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
- TODO: Add other useful fields. apiVersion, kind, uid?
- type: string
- optional:
- description: Specify whether the Secret or its key must be defined
- type: boolean
- required:
- - key
- type: object
- x-kubernetes-map-type: atomic
+ items:
+ description: SecretKeySelector selects a key of a Secret.
+ properties:
+ key:
+ description: The key of the secret to select from. Must be a valid secret key.
+ type: string
+ name:
+ description: |-
+ Name of the referent.
+ More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ TODO: Add other useful fields. apiVersion, kind, uid?
+ type: string
+ optional:
+ description: Specify whether the Secret or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ type: array
description: |-
ProxyConnectHeader optionally specifies headers to send to
proxies during CONNECT requests.
@@ -3569,24 +3588,26 @@ spec:
type: object
proxyConnectHeader:
additionalProperties:
- description: SecretKeySelector selects a key of a Secret.
- properties:
- key:
- description: The key of the secret to select from. Must be a valid secret key.
- type: string
- name:
- description: |-
- Name of the referent.
- More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
- TODO: Add other useful fields. apiVersion, kind, uid?
- type: string
- optional:
- description: Specify whether the Secret or its key must be defined
- type: boolean
- required:
- - key
- type: object
- x-kubernetes-map-type: atomic
+ items:
+ description: SecretKeySelector selects a key of a Secret.
+ properties:
+ key:
+ description: The key of the secret to select from. Must be a valid secret key.
+ type: string
+ name:
+ description: |-
+ Name of the referent.
+ More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ TODO: Add other useful fields. apiVersion, kind, uid?
+ type: string
+ optional:
+ description: Specify whether the Secret or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ type: array
description: |-
ProxyConnectHeader optionally specifies headers to send to
proxies during CONNECT requests.
@@ -4114,24 +4135,26 @@ spec:
x-kubernetes-map-type: atomic
proxyConnectHeader:
additionalProperties:
- description: SecretKeySelector selects a key of a Secret.
- properties:
- key:
- description: The key of the secret to select from. Must be a valid secret key.
- type: string
- name:
- description: |-
- Name of the referent.
- More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
- TODO: Add other useful fields. apiVersion, kind, uid?
- type: string
- optional:
- description: Specify whether the Secret or its key must be defined
- type: boolean
- required:
- - key
- type: object
- x-kubernetes-map-type: atomic
+ items:
+ description: SecretKeySelector selects a key of a Secret.
+ properties:
+ key:
+ description: The key of the secret to select from. Must be a valid secret key.
+ type: string
+ name:
+ description: |-
+ Name of the referent.
+ More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ TODO: Add other useful fields. apiVersion, kind, uid?
+ type: string
+ optional:
+ description: Specify whether the Secret or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ type: array
description: |-
ProxyConnectHeader optionally specifies headers to send to
proxies during CONNECT requests.
diff --git a/manifests/setup/0servicemonitorCustomResourceDefinition.yaml b/manifests/setup/0servicemonitorCustomResourceDefinition.yaml
index 2c804a8c..85f4c3ee 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.14.0
- operator.prometheus.io/version: 0.73.2
+ operator.prometheus.io/version: 0.74.0
name: servicemonitors.monitoring.coreos.com
spec:
group: monitoring.coreos.com
diff --git a/manifests/setup/0thanosrulerCustomResourceDefinition.yaml b/manifests/setup/0thanosrulerCustomResourceDefinition.yaml
index 94b724ac..6fd58ff8 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.14.0
- operator.prometheus.io/version: 0.73.2
+ operator.prometheus.io/version: 0.74.0
name: thanosrulers.monitoring.coreos.com
spec:
group: monitoring.coreos.com
--
GitLab