diff --git a/jsonnet/kube-prometheus/versions.json b/jsonnet/kube-prometheus/versions.json index 9fd03ef861c32788bb2ea0f1e7710e39a4a4d467..2bbe0d5ddb4e3854671c1e760efb0ccfac811245 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 a75c714b66a76ace0da1843274103fce2cf7ab1a..52389a91f2f38b3db4dba2c7d09ec528790856ce 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 79615a7952c040a01a895711ec6a143385e57320..9092902b051be5c486fefa9c754e1015c09786d9 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 d1744c0d793a7a669f6f0c64e8c4d049012529c9..9a2de82cfb5f695af28b4e4f7fbccd07be977b78 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 5e8dd0a30e2ce1f70a66f4c8e30aa56ad8a3f4db..4446708ed00f652fcd353cbb33075737f552ba5a 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 cd85d568ff216cf8318a7a52b1bedb29b71a5e92..423ebc43e95cd17e9152c6d971727d35e5067c59 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 1b65b4c6b8ab66a6760069360411fc206ee195f9..e6e94ced7e92b8dc5d6335da039118df917aa59a 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 19f85fddac6c87071591a70ddd832fd85e87bd46..665d72442262037b28fcc972ba1d4021aa0ef034 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 caf4bd297a54f40dfdaf194f8eafbbe478899f59..833fda982bafd22d3abb2ecf5b702817e38b0bf2 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 0bc05663c7ea28dbe836c8528ad80b62a4161f67..578ee918a064cd76ced959da05a653eff2934662 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 e0bab4912f393c787441705cd0f237f587732498..445b6f2205e5e45a5bf067ae72b450fb2d521298 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 b20fa2376c06a00cea8a09958f26fb5fc1df26bc..5ea5b9e941838d33cc7816f687d45766b84465de 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 034d28e84876abd1995ecac4f36e3cdce41d4a6a..4618e9c1b58a9cf66f8934ad9ba6e96ad3492a53 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 47ea9a2877876637c28de6f1f03cd52e4d5e66e3..d1af3163f0e026d259b2ca630a44a6285885e11e 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 f5c4cdbae6df97daedceaa0242b9f199381c575b..672c8c43b90fab386911ffdf73ac1af24a22625f 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 41ce79544fb1939264a6097db76ac19eb2f7b047..1c6cb3000797b98252873080d615360b454274bd 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 3cf636ed39bff176be16a4fb5958ef8c33459c78..63f7ccc7eba6a0fd5941d9c36a1d93001443b1ee 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 4d55aeb6b9848f3ef5aca354e69cb0031ab79e43..22eba1d0291f5869fc7ab2fcdb5cf6a5e017e7cd 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 9e38cc81c58f9970733315cb140f04fe31677198..a39a87430eed66ce83f448cdbd43a628d16b0501 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 d60fcc3391307de92d953cff19df92bf25fb0cb2..d97e02a582bdc04f947eaf935c0691fa924f0683 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 77589c53203346ffad96195d3324c77f920a6bf6..df8c6644acc550e810bbcdda486418c859b0c660 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 6998768aacfaa0012046b4a3f5fb82e57a53bd49..09348f7e95fee182292b1e9ab172a4cd3cc44c06 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 91bc3b127b0cc743d7c46acf99003675179b177c..c21491a51bc365f4d9b30a2930254c2ac7c7080d 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 11c42df5ebc826402dd8098b58309a3af7446dda..033f93eb9eb29e22236169b83720b6ee23bf8a1c 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 f7601e8984e58a2a529814313ca3255ee4a4f842..04ab178745408e6b494f8b2297100c6620acb8f3 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 1038954e72f8bbd859e7ab961cc5611bdb238422..0fe1e8a9d6822821bcfd53a5c2769fd95db1017b 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 0eb04d0da128df4d711f7490ece4774002e5be2e..1c2c9bf3488aa6acb974cfdfcc1e77341db4c393 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 88b3095fbca367c9f7d3ee31960c42a76efaae8e..1f664719a945d911e26eeb0a5bdfa1d42394488a 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 9b164f6aaa9e45b9d00c7ed382e139b853e22576..2572d5b7b6533860f47ec7745bc9aa9802e82469 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 3be10d3fb0e3315c51f315657e107d8342c322a4..6fb04d220d3da6d210048d428799ccee3990956a 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 8fb179f9b67a57e8e6469536cd18327df1a9538b..d63df60bb96c8d9ef0d7755c730c6a380058e77a 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 fefa24f26fb147feaca9300325302e4ccc654633..a58d824f1f0f631fa8e79c0f68a7d5c4c6c7e847 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 01d100dd29f96d2d7246a99bbcad8685e730f1c4..3746e6bf6c6063bbf766b32704f36181dcb9a0d8 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 4b464b4199c5f025769f2fb5d438e938a78285d8..967761bf65f152b8d68ed34026b7d4ba5d92a126 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 58cb34b49edbae1fc09ef7e319b72c0cc8f0d94f..b011c55b21cfe82fbeca03c4fdebdff75333d384 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 5933a7d17c2d6ab0d03b14f00217add28ded6060..1ed7607b88d7ae8ebf038c43318f9c4523cf739e 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 617526a57a8abf6f34db6d2063cc7d09ae0a1b60..11dab4640af9ad0868e1fcdf4c499f3e0c880f4e 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 77d20bc023e49dd0b8421508e7d8bf24c6224cae..a0a4a5b266a3ffc3a5a62e589cd40dc2aabe414d 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 74971d274837be85ac5c4bccec6961c47a137c74..c07bfe8983d74feb4d6b0442d728b8b2f66fb6f4 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 ff0448491ed9ae7fd8ac49b1c46e062546b73d8c..3e9ac6b491c80cbe3c9a30df8ea8d1a509d69e58 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 4f900a712ab6fba0d12eb5ce629af2c03af975e3..d210d11f1cd0b225ac62cdff9c47045a96428898 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 b6a6721c9a24c05630ffde66f83fd22e8ec2e232..a872cf9feecc46ce3171a78a9d8761368b196781 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 2c804a8c69e0d622082f14e869afdd671f3fa34c..85f4c3eed0dfc2dc0d74d8f6a14e06eb14cdc2dc 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 94b724ac5a1d38582a1147402497fd8bbcc1a1f8..6fd58ff8bf68b3e0dd9f93d203cc995ea2e20169 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