diff --git a/jsonnet/kube-prometheus/versions.json b/jsonnet/kube-prometheus/versions.json
index cd9040c9c8b11cd9ed345a1fd2d9b9e37644bba6..fdfc967c452d0ccab359fd40684c51c4254a63de 100644
--- a/jsonnet/kube-prometheus/versions.json
+++ b/jsonnet/kube-prometheus/versions.json
@@ -1,12 +1,12 @@
{
"alertmanager": "0.27.0",
"blackboxExporter": "0.25.0",
- "grafana": "11.0.0",
+ "grafana": "11.1.0",
"kubeStateMetrics": "2.12.0",
"nodeExporter": "1.8.1",
"prometheus": "2.53.0",
"prometheusAdapter": "0.12.0",
- "prometheusOperator": "0.74.0",
+ "prometheusOperator": "0.75.1",
"kubeRbacProxy": "0.18.0",
"configmapReload": "0.13.1",
"pyrra": "0.6.4"
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index 4b15b03c989fb6099a5bc01c18e5830c009c55e5..c76736d25b2ca8e4cad89b74ddae2cf3073b9521 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -18,7 +18,7 @@
"subdir": "contrib/mixin"
}
},
- "version": "67a6dbdb7c0f15c5610936edbe62224bb76dff70",
+ "version": "24e05998c68f481af2bd567ee104cf89879bbf89",
"sum": "IXI3LQIT9NmTPJAk8WLUJd5+qZfcGpeNCyWIK7oEpws="
},
{
@@ -98,8 +98,8 @@
"subdir": "mixin-utils"
}
},
- "version": "a49eaa8de3eb6c22818418fdd4b9aed2f40a15a5",
- "sum": "A0f0G3aJEkdu5sqHXtizHDyU1jOSx6VuEXLRlI9Psp8="
+ "version": "0c35fcfb35658ed16fb73d5b5546a36cbdf73f7a",
+ "sum": "Qg992ZB0jkrS+YLq0Q7RV1fSHa8+hQT0jbpTyCGE2NI="
},
{
"source": {
@@ -138,8 +138,8 @@
"subdir": "jsonnet/kube-state-metrics"
}
},
- "version": "086af0cbafb5e8c2b882181a3a622f720147d8ff",
- "sum": "msMZyUvcebzRILLzNlTIiSOwa1XgQKtP7jbZTkiqwM0="
+ "version": "85d1423b5b896f4fbce8394afed20cfe17371251",
+ "sum": "vR59KSqhRDBmKpYbia5VBs/1QFNFXud47G3+RfWSGnQ="
},
{
"source": {
@@ -148,7 +148,7 @@
"subdir": "jsonnet/kube-state-metrics-mixin"
}
},
- "version": "086af0cbafb5e8c2b882181a3a622f720147d8ff",
+ "version": "85d1423b5b896f4fbce8394afed20cfe17371251",
"sum": "qclI7LwucTjBef3PkGBkKxF0mfZPbHnn4rlNWKGtR4c="
},
{
@@ -158,7 +158,7 @@
"subdir": "jsonnet/mixin"
}
},
- "version": "94823a886f2b835a1248059283ddbedf837269bf",
+ "version": "cf96bf6e95aab9985b58be61ebd278d0c171fec6",
"sum": "gi+knjdxs2T715iIQIntrimbHRgHnpM8IFBJDD1gYfs=",
"name": "prometheus-operator-mixin"
},
@@ -169,8 +169,8 @@
"subdir": "jsonnet/prometheus-operator"
}
},
- "version": "94823a886f2b835a1248059283ddbedf837269bf",
- "sum": "uL7mkBVkxqnDpr4oSrm+dto2eSZrsIbZ4gV5CbLsC4c="
+ "version": "cf96bf6e95aab9985b58be61ebd278d0c171fec6",
+ "sum": "z2/5LjQpWC7snhT+n/mtQqoy5986uI95sTqcKQziwGU="
},
{
"source": {
@@ -179,7 +179,7 @@
"subdir": "doc/alertmanager-mixin"
}
},
- "version": "36d653ab9f2c8784c8ea99563abc743735bb2843",
+ "version": "eb8369ec510d76f63901379a8437c4b55885d6c5",
"sum": "IpF46ZXsm+0wJJAPtAre8+yxTNZA57mBqGpBP/r7/kw=",
"name": "alertmanager"
},
@@ -190,7 +190,7 @@
"subdir": "docs/node-mixin"
}
},
- "version": "4f7bd3544d312477d3e144d4ac2300248219f313",
+ "version": "4cc1c177d05e80176f26fe1ca2a1f193c03c67a0",
"sum": "R9ROsvpjZLgQJ78WAyD4HzrIq976Bpr4V2P2Fo2Kfns="
},
{
@@ -200,7 +200,7 @@
"subdir": "documentation/prometheus-mixin"
}
},
- "version": "00b110c65c7af446e675ee27cb06b7971afc6e18",
+ "version": "8849b7dcadc2960c70467734efce35d737be25f5",
"sum": "dYLcLzGH4yF3qB7OGC/7z4nqeTNjv42L7Q3BENU8XJI=",
"name": "prometheus"
},
@@ -222,7 +222,7 @@
"subdir": "mixin"
}
},
- "version": "ddcdeebebe4326b3ee029510e34ad05ab9d10a67",
+ "version": "cb27548cc43553033d179cec76a13b9f52c5c927",
"sum": "HhSSbGGCNHCMy1ee5jElYDm0yS9Vesa7QB2/SHKdjsY=",
"name": "thanos-mixin"
},
diff --git a/manifests/grafana-config.yaml b/manifests/grafana-config.yaml
index 9092902b051be5c486fefa9c754e1015c09786d9..1f713e8bae5b8c69db63b0c4eda77ba44a8e2fbf 100644
--- a/manifests/grafana-config.yaml
+++ b/manifests/grafana-config.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.0.0
+ app.kubernetes.io/version: 11.1.0
name: grafana-config
namespace: monitoring
stringData:
diff --git a/manifests/grafana-dashboardDatasources.yaml b/manifests/grafana-dashboardDatasources.yaml
index 9a2de82cfb5f695af28b4e4f7fbccd07be977b78..8e43a200cdab411803b4db4ad0f976839cab32c7 100644
--- a/manifests/grafana-dashboardDatasources.yaml
+++ b/manifests/grafana-dashboardDatasources.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.0.0
+ app.kubernetes.io/version: 11.1.0
name: grafana-datasources
namespace: monitoring
stringData:
diff --git a/manifests/grafana-dashboardDefinitions.yaml b/manifests/grafana-dashboardDefinitions.yaml
index 69c407e278e587b669f4b6d0910b42fdb3838f08..dcaa67d9828c5fc086b827b3af222564b76139f7 100644
--- a/manifests/grafana-dashboardDefinitions.yaml
+++ b/manifests/grafana-dashboardDefinitions.yaml
@@ -600,7 +600,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.0.0
+ app.kubernetes.io/version: 11.1.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: 11.0.0
+ app.kubernetes.io/version: 11.1.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: 11.0.0
+ app.kubernetes.io/version: 11.1.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: 11.0.0
+ app.kubernetes.io/version: 11.1.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: 11.0.0
+ app.kubernetes.io/version: 11.1.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: 11.0.0
+ app.kubernetes.io/version: 11.1.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: 11.0.0
+ app.kubernetes.io/version: 11.1.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: 11.0.0
+ app.kubernetes.io/version: 11.1.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: 11.0.0
+ app.kubernetes.io/version: 11.1.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: 11.0.0
+ app.kubernetes.io/version: 11.1.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: 11.0.0
+ app.kubernetes.io/version: 11.1.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: 11.0.0
+ app.kubernetes.io/version: 11.1.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: 11.0.0
+ app.kubernetes.io/version: 11.1.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: 11.0.0
+ app.kubernetes.io/version: 11.1.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: 11.0.0
+ app.kubernetes.io/version: 11.1.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: 11.0.0
+ app.kubernetes.io/version: 11.1.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: 11.0.0
+ app.kubernetes.io/version: 11.1.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: 11.0.0
+ app.kubernetes.io/version: 11.1.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: 11.0.0
+ app.kubernetes.io/version: 11.1.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: 11.0.0
+ app.kubernetes.io/version: 11.1.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: 11.0.0
+ app.kubernetes.io/version: 11.1.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: 11.0.0
+ app.kubernetes.io/version: 11.1.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: 11.0.0
+ app.kubernetes.io/version: 11.1.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: 11.0.0
+ app.kubernetes.io/version: 11.1.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: 11.0.0
+ app.kubernetes.io/version: 11.1.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: 11.0.0
+ app.kubernetes.io/version: 11.1.0
name: grafana-dashboard-workload-total
namespace: monitoring
kind: ConfigMapList
diff --git a/manifests/grafana-dashboardSources.yaml b/manifests/grafana-dashboardSources.yaml
index 423ebc43e95cd17e9152c6d971727d35e5067c59..8b55713f3fd4072cf126b9bfa13d2f699741f383 100644
--- a/manifests/grafana-dashboardSources.yaml
+++ b/manifests/grafana-dashboardSources.yaml
@@ -22,6 +22,6 @@ metadata:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.0.0
+ app.kubernetes.io/version: 11.1.0
name: grafana-dashboards
namespace: monitoring
diff --git a/manifests/grafana-deployment.yaml b/manifests/grafana-deployment.yaml
index e6e94ced7e92b8dc5d6335da039118df917aa59a..f14d0b90a8fdbf1f44568062dd554d8ac4fb99f7 100644
--- a/manifests/grafana-deployment.yaml
+++ b/manifests/grafana-deployment.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.0.0
+ app.kubernetes.io/version: 11.1.0
name: grafana
namespace: monitoring
spec:
@@ -18,19 +18,19 @@ spec:
template:
metadata:
annotations:
- checksum/grafana-config: f3697c98a79fc4a11c1d616d869584f4
- checksum/grafana-dashboardproviders: f4a0c73003700d26a752d804d0da0113
- checksum/grafana-datasources: 6c462174ecc02c2103eca46c6c60cdee
+ checksum/grafana-config: 86c4d5c801e0f38accccf18250fde365
+ checksum/grafana-dashboardproviders: 48996fe080b140eafdac4078ddb865b4
+ checksum/grafana-datasources: 6f0e17a0edd00de0ba09358a6b23c0f8
labels:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.0.0
+ app.kubernetes.io/version: 11.1.0
spec:
automountServiceAccountToken: false
containers:
- env: []
- image: grafana/grafana:11.0.0
+ image: grafana/grafana:11.1.0
name: grafana
ports:
- containerPort: 3000
diff --git a/manifests/grafana-networkPolicy.yaml b/manifests/grafana-networkPolicy.yaml
index 665d72442262037b28fcc972ba1d4021aa0ef034..e0623d2312300bd35a1aba4a85b58a1fb2e07147 100644
--- a/manifests/grafana-networkPolicy.yaml
+++ b/manifests/grafana-networkPolicy.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.0.0
+ app.kubernetes.io/version: 11.1.0
name: grafana
namespace: monitoring
spec:
diff --git a/manifests/grafana-prometheusRule.yaml b/manifests/grafana-prometheusRule.yaml
index 833fda982bafd22d3abb2ecf5b702817e38b0bf2..b70852180b2cebf31f60e6508ece40e5e112b79d 100644
--- a/manifests/grafana-prometheusRule.yaml
+++ b/manifests/grafana-prometheusRule.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.0.0
+ app.kubernetes.io/version: 11.1.0
prometheus: k8s
role: alert-rules
name: grafana-rules
diff --git a/manifests/grafana-service.yaml b/manifests/grafana-service.yaml
index 578ee918a064cd76ced959da05a653eff2934662..623fcb5091e7e1daf65524eb17263e1da76adebd 100644
--- a/manifests/grafana-service.yaml
+++ b/manifests/grafana-service.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.0.0
+ app.kubernetes.io/version: 11.1.0
name: grafana
namespace: monitoring
spec:
diff --git a/manifests/grafana-serviceAccount.yaml b/manifests/grafana-serviceAccount.yaml
index 445b6f2205e5e45a5bf067ae72b450fb2d521298..7226ab6cffa049fa7e2866abffb286819a3483b7 100644
--- a/manifests/grafana-serviceAccount.yaml
+++ b/manifests/grafana-serviceAccount.yaml
@@ -6,6 +6,6 @@ metadata:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.0.0
+ app.kubernetes.io/version: 11.1.0
name: grafana
namespace: monitoring
diff --git a/manifests/grafana-serviceMonitor.yaml b/manifests/grafana-serviceMonitor.yaml
index 5ea5b9e941838d33cc7816f687d45766b84465de..72cedd204c8038848d8c5525019ea9c97d722c47 100644
--- a/manifests/grafana-serviceMonitor.yaml
+++ b/manifests/grafana-serviceMonitor.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.0.0
+ app.kubernetes.io/version: 11.1.0
name: grafana
namespace: monitoring
spec:
diff --git a/manifests/prometheusOperator-clusterRole.yaml b/manifests/prometheusOperator-clusterRole.yaml
index 1c2c9bf3488aa6acb974cfdfcc1e77341db4c393..5e312525da2b3ff60e06ecd025ad79cf3979b5c8 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.74.0
+ app.kubernetes.io/version: 0.75.1
name: prometheus-operator
rules:
- apiGroups:
diff --git a/manifests/prometheusOperator-clusterRoleBinding.yaml b/manifests/prometheusOperator-clusterRoleBinding.yaml
index 1f664719a945d911e26eeb0a5bdfa1d42394488a..54ed6b83bdf47d930b3de270c46ca0d44efe2566 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.74.0
+ app.kubernetes.io/version: 0.75.1
name: prometheus-operator
roleRef:
apiGroup: rbac.authorization.k8s.io
diff --git a/manifests/prometheusOperator-deployment.yaml b/manifests/prometheusOperator-deployment.yaml
index a64ef32c94d63a337a02b186c32c001c8c62800f..92cbe1d276a4babc7436551b764e5f075321fe47 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.74.0
+ app.kubernetes.io/version: 0.75.1
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.74.0
+ app.kubernetes.io/version: 0.75.1
spec:
automountServiceAccountToken: true
containers:
- args:
- --kubelet-service=kube-system/kubelet
- - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.74.0
+ - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.75.1
env:
- name: GOGC
value: "30"
- image: quay.io/prometheus-operator/prometheus-operator:v0.74.0
+ image: quay.io/prometheus-operator/prometheus-operator:v0.75.1
name: prometheus-operator
ports:
- containerPort: 8080
diff --git a/manifests/prometheusOperator-networkPolicy.yaml b/manifests/prometheusOperator-networkPolicy.yaml
index 6fb04d220d3da6d210048d428799ccee3990956a..a6b3f3ec34ba7ef782afddd7fc02c295a14c6d8b 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.74.0
+ app.kubernetes.io/version: 0.75.1
name: prometheus-operator
namespace: monitoring
spec:
diff --git a/manifests/prometheusOperator-prometheusRule.yaml b/manifests/prometheusOperator-prometheusRule.yaml
index d63df60bb96c8d9ef0d7755c730c6a380058e77a..4f39f132020b8db047def2812c0f044df7cfd94c 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.74.0
+ app.kubernetes.io/version: 0.75.1
prometheus: k8s
role: alert-rules
name: prometheus-operator-rules
diff --git a/manifests/prometheusOperator-service.yaml b/manifests/prometheusOperator-service.yaml
index a58d824f1f0f631fa8e79c0f68a7d5c4c6c7e847..5879c6308a6a163a01404f4f6b26c232fc846be0 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.74.0
+ app.kubernetes.io/version: 0.75.1
name: prometheus-operator
namespace: monitoring
spec:
diff --git a/manifests/prometheusOperator-serviceAccount.yaml b/manifests/prometheusOperator-serviceAccount.yaml
index 3746e6bf6c6063bbf766b32704f36181dcb9a0d8..385d1d0ef933d7eaebe05c8ff1799d859bda62e9 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.74.0
+ app.kubernetes.io/version: 0.75.1
name: prometheus-operator
namespace: monitoring
diff --git a/manifests/prometheusOperator-serviceMonitor.yaml b/manifests/prometheusOperator-serviceMonitor.yaml
index 967761bf65f152b8d68ed34026b7d4ba5d92a126..3201303c75cba43a72bcb15b95ef964de28e8fff 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.74.0
+ app.kubernetes.io/version: 0.75.1
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.74.0
+ app.kubernetes.io/version: 0.75.1
diff --git a/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml b/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml
index 33b421b114155f25abaef70dd8332ccd80d676c2..bfa9b96dc34027b9adbbdddc0512624c0fcfba28 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.15.0
- operator.prometheus.io/version: 0.74.0
+ operator.prometheus.io/version: 0.75.1
name: alertmanagerconfigs.monitoring.coreos.com
spec:
group: monitoring.coreos.com
diff --git a/manifests/setup/0alertmanagerCustomResourceDefinition.yaml b/manifests/setup/0alertmanagerCustomResourceDefinition.yaml
index 5b13d50c72210a39906c899db74a852e0505828c..dd3f64c93a27ef0634f23a334c9f21a12b176862 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.15.0
- operator.prometheus.io/version: 0.74.0
+ operator.prometheus.io/version: 0.75.1
name: alertmanagers.monitoring.coreos.com
spec:
group: monitoring.coreos.com
@@ -48,7 +48,14 @@ spec:
name: v1
schema:
openAPIV3Schema:
- description: Alertmanager describes an Alertmanager cluster.
+ description: |-
+ The `Alertmanager` custom resource definition (CRD) defines a desired [Alertmanager](https://prometheus.io/docs/alerting) setup to run in a Kubernetes cluster. It allows to specify many options such as the number of replicas, persistent storage and many more.
+
+
+ For each `Alertmanager` resource, the Operator deploys a `StatefulSet` in the same namespace. When there are two or more configured replicas, the Operator runs the Alertmanager instances in high-availability mode.
+
+
+ The resource defines via label and namespace selectors which `AlertmanagerConfig` objects should be associated to the deployed Alertmanager instances.
properties:
apiVersion:
description: |-
diff --git a/manifests/setup/0podmonitorCustomResourceDefinition.yaml b/manifests/setup/0podmonitorCustomResourceDefinition.yaml
index c03e9630a235189a3120cf554dcc8dcca6c76c87..6a6b561614188f79a460cfcf6a385908743f9d21 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.15.0
- operator.prometheus.io/version: 0.74.0
+ operator.prometheus.io/version: 0.75.1
name: podmonitors.monitoring.coreos.com
spec:
group: monitoring.coreos.com
@@ -21,7 +21,16 @@ spec:
- name: v1
schema:
openAPIV3Schema:
- description: PodMonitor defines monitoring for a set of pods.
+ description: |-
+ The `PodMonitor` custom resource definition (CRD) defines how `Prometheus` and `PrometheusAgent` can scrape metrics from a group of pods.
+ Among other things, it allows to specify:
+ * The pods to scrape via label selectors.
+ * The container ports to scrape.
+ * Authentication credentials to use.
+ * Target and metric relabeling.
+
+
+ `Prometheus` and `PrometheusAgent` objects select `PodMonitor` objects using label and namespace selectors.
properties:
apiVersion:
description: |-
@@ -116,8 +125,8 @@ spec:
type: integer
namespaceSelector:
description: |-
- Selector to select which namespaces the Kubernetes `Pods` objects
- are discovered from.
+ `namespaceSelector` defines in which namespace(s) Prometheus should discover the pods.
+ By default, the pods are discovered in the same namespace as the `PodMonitor` object but it is possible to select pods across different/all namespaces.
properties:
any:
description: |-
@@ -131,7 +140,7 @@ spec:
type: array
type: object
podMetricsEndpoints:
- description: List of endpoints part of this PodMonitor.
+ description: Defines how to scrape metrics from the selected pods.
items:
description: |-
PodMetricsEndpoint defines an endpoint serving Prometheus metrics to be scraped by
@@ -869,7 +878,7 @@ spec:
type: array
x-kubernetes-list-type: set
selector:
- description: Label selector to select the Kubernetes `Pod` objects.
+ description: Label selector to select the Kubernetes `Pod` objects to scrape metrics from.
properties:
matchExpressions:
description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
diff --git a/manifests/setup/0probeCustomResourceDefinition.yaml b/manifests/setup/0probeCustomResourceDefinition.yaml
index b380646166b29a12670c322889e992745041212c..92ef5589208e5dc9983a1c34964963103b774ce1 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.15.0
- operator.prometheus.io/version: 0.74.0
+ operator.prometheus.io/version: 0.75.1
name: probes.monitoring.coreos.com
spec:
group: monitoring.coreos.com
@@ -21,7 +21,16 @@ spec:
- name: v1
schema:
openAPIV3Schema:
- description: Probe defines monitoring for a set of static targets or ingresses.
+ description: |-
+ The `Probe` custom resource definition (CRD) defines how to scrape metrics from prober exporters such as the [blackbox exporter](https://github.com/prometheus/blackbox_exporter).
+
+
+ The `Probe` resource needs 2 pieces of information:
+ * The list of probed addresses which can be defined statically or by discovering Kubernetes Ingress objects.
+ * The prober which exposes the availability of probed endpoints (over various protocols such HTTP, TCP, ICMP, ...) as Prometheus metrics.
+
+
+ `Prometheus` and `PrometheusAgent` objects select `Probe` objects using label and namespace selectors.
properties:
apiVersion:
description: |-
diff --git a/manifests/setup/0prometheusCustomResourceDefinition.yaml b/manifests/setup/0prometheusCustomResourceDefinition.yaml
index 423e0799553e055cb7e5f0b817beccb39a54acf8..4b4735b4cc1b6d7c11fc8a7ef0bf127adefffed1 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.15.0
- operator.prometheus.io/version: 0.74.0
+ operator.prometheus.io/version: 0.75.1
name: prometheuses.monitoring.coreos.com
spec:
group: monitoring.coreos.com
@@ -48,7 +48,17 @@ spec:
name: v1
schema:
openAPIV3Schema:
- description: Prometheus defines a Prometheus deployment.
+ description: |-
+ The `Prometheus` custom resource definition (CRD) defines a desired [Prometheus](https://prometheus.io/docs/prometheus) setup to run in a Kubernetes cluster. It allows to specify many options such as the number of replicas, persistent storage, and Alertmanagers where firing alerts should be sent and many more.
+
+
+ For each `Prometheus` resource, the Operator deploys one or several `StatefulSet` objects in the same namespace. The number of StatefulSets is equal to the number of shards which is 1 by default.
+
+
+ The resource defines via label and namespace selectors which `ServiceMonitor`, `PodMonitor`, `Probe` and `PrometheusRule` objects should be associated to the deployed Prometheus instances.
+
+
+ The Operator continuously reconciles the scrape and rules configuration and a sidecar container running in the Prometheus pods triggers a reload of the configuration when needed.
properties:
apiVersion:
description: |-
diff --git a/manifests/setup/0prometheusagentCustomResourceDefinition.yaml b/manifests/setup/0prometheusagentCustomResourceDefinition.yaml
index 8e2b6019dc22cbcc064398fe15aadd50ec2e038c..0f88b734d1008076275a35a46650e668586f9867 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.15.0
- operator.prometheus.io/version: 0.74.0
+ operator.prometheus.io/version: 0.75.1
name: prometheusagents.monitoring.coreos.com
spec:
group: monitoring.coreos.com
@@ -48,7 +48,11 @@ spec:
name: v1alpha1
schema:
openAPIV3Schema:
- description: PrometheusAgent defines a Prometheus agent deployment.
+ description: |-
+ The `PrometheusAgent` custom resource definition (CRD) defines a desired [Prometheus Agent](https://prometheus.io/blog/2021/11/16/agent/) setup to run in a Kubernetes cluster.
+
+
+ The CRD is very similar to the `Prometheus` CRD except for features which aren't available in agent mode like rule evaluation, persistent storage and Thanos sidecar.
properties:
apiVersion:
description: |-
diff --git a/manifests/setup/0prometheusruleCustomResourceDefinition.yaml b/manifests/setup/0prometheusruleCustomResourceDefinition.yaml
index 3abfe6066e0954dd3739f2c614f97862bf5a4762..4c0e9314c0f39f382af1fa27b0b8e74afbcc93e2 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.15.0
- operator.prometheus.io/version: 0.74.0
+ operator.prometheus.io/version: 0.75.1
name: prometheusrules.monitoring.coreos.com
spec:
group: monitoring.coreos.com
@@ -21,7 +21,11 @@ spec:
- name: v1
schema:
openAPIV3Schema:
- description: PrometheusRule defines recording and alerting rules for a Prometheus instance
+ description: |-
+ The `PrometheusRule` custom resource definition (CRD) defines [alerting](https://prometheus.io/docs/prometheus/latest/configuration/alerting_rules/) and [recording](https://prometheus.io/docs/prometheus/latest/configuration/recording_rules/) rules to be evaluated by `Prometheus` or `ThanosRuler` objects.
+
+
+ `Prometheus` and `ThanosRuler` objects select `PrometheusRule` objects using label and namespace selectors.
properties:
apiVersion:
description: |-
diff --git a/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml b/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml
index e2abd112b3862f0840950a944b11fecd79c50b14..5dcd5c8d3314cb4415b88c4f627975c3a208e8fe 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.15.0
- operator.prometheus.io/version: 0.74.0
+ operator.prometheus.io/version: 0.75.1
name: scrapeconfigs.monitoring.coreos.com
spec:
group: monitoring.coreos.com
@@ -1664,19 +1664,25 @@ spec:
filters:
description: Optional filters to limit the discovery process to a subset of the available resources.
items:
- description: DockerFilter is the configuration to limit the discovery process to a subset of available resources.
+ description: Filter name and value pairs to limit the discovery process to a subset of available resources.
properties:
name:
+ description: Name of the Filter.
type: string
values:
+ description: Value to filter on.
items:
type: string
+ minItems: 1
type: array
required:
- name
- values
type: object
type: array
+ x-kubernetes-list-map-keys:
+ - name
+ x-kubernetes-list-type: map
followRedirects:
description: Configure whether HTTP requests follow HTTP 3xx redirects.
type: boolean
@@ -2005,6 +2011,9 @@ spec:
dockerSwarmSDConfigs:
description: DockerswarmSDConfigs defines a list of Dockerswarm service discovery configurations.
items:
+ description: |-
+ DockerSwarmSDConfig configurations allow retrieving scrape targets from Docker Swarm engine.
+ See https://prometheus.io/docs/prometheus/latest/configuration/configuration/#dockerswarm_sd_config
properties:
authorization:
description: Authorization header configuration to authenticate against the target HTTP endpoint.
@@ -2112,13 +2121,13 @@ spec:
Tasks: https://docs.docker.com/engine/api/v1.40/#operation/TaskList
Nodes: https://docs.docker.com/engine/api/v1.40/#operation/NodeList
items:
- description: Filter is the configuration to limit the discovery process to a subset of available resources.
+ description: Filter name and value pairs to limit the discovery process to a subset of available resources.
properties:
name:
- description: Name is the key of the field to check against.
+ description: Name of the Filter.
type: string
values:
- description: Values is the value or set of values to check for a match.
+ description: Value to filter on.
items:
type: string
minItems: 1
@@ -2128,6 +2137,9 @@ spec:
- values
type: object
type: array
+ x-kubernetes-list-map-keys:
+ - name
+ x-kubernetes-list-type: map
followRedirects:
description: Configure whether HTTP requests follow HTTP 3xx redirects.
type: boolean
@@ -2503,19 +2515,25 @@ spec:
https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeInstances.html
Filter API documentation: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_Filter.html
items:
- description: EC2Filter is the configuration for filtering EC2 instances.
+ description: Filter name and value pairs to limit the discovery process to a subset of available resources.
properties:
name:
+ description: Name of the Filter.
type: string
values:
+ description: Value to filter on.
items:
type: string
+ minItems: 1
type: array
required:
- name
- values
type: object
type: array
+ x-kubernetes-list-map-keys:
+ - name
+ x-kubernetes-list-type: map
port:
description: |-
The port to scrape metrics from. If using the public IP address, this must
@@ -4799,7 +4817,10 @@ spec:
lightSailSDConfigs:
description: LightsailSDConfigs defines a list of Lightsail service discovery configurations.
items:
- description: 'TODO: Need to document that we will not be supporting the `_file` fields.'
+ description: |-
+ LightSailSDConfig configurations allow retrieving scrape targets from AWS Lightsail instances.
+ See https://prometheus.io/docs/prometheus/latest/configuration/configuration/#lightsail_sd_config
+ TODO: Need to document that we will not be supporting the `_file` fields.
properties:
accessKey:
description: AccessKey is the AWS API key.
@@ -5285,6 +5306,9 @@ spec:
linodeSDConfigs:
description: LinodeSDConfigs defines a list of Linode service discovery configurations.
items:
+ description: |-
+ LinodeSDConfig configurations allow retrieving scrape targets from Linode's Linode APIv4.
+ See https://prometheus.io/docs/prometheus/latest/configuration/configuration/#linode_sd_config
properties:
authorization:
description: Authorization header configuration.
@@ -6039,6 +6063,90 @@ spec:
- role
type: object
type: array
+ ovhcloudSDConfigs:
+ description: OVHCloudSDConfigs defines a list of OVHcloud service discovery configurations.
+ items:
+ description: |-
+ OVHCloudSDConfig configurations allow retrieving scrape targets from OVHcloud's dedicated servers and VPS using their API.
+ See https://prometheus.io/docs/prometheus/latest/configuration/configuration/#ovhcloud_sd_config
+ properties:
+ applicationKey:
+ description: Access key to use. https://api.ovh.com.
+ minLength: 1
+ type: string
+ applicationSecret:
+ 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:
+ default: ""
+ description: |-
+ Name of the referent.
+ This field is effectively required, but due to backwards compatibility is
+ allowed to be empty. Instances of this type with an empty value here are
+ almost certainly wrong.
+ TODO: Add other useful fields. apiVersion, kind, uid?
+ More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
+ 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
+ consumerKey:
+ 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:
+ default: ""
+ description: |-
+ Name of the referent.
+ This field is effectively required, but due to backwards compatibility is
+ allowed to be empty. Instances of this type with an empty value here are
+ almost certainly wrong.
+ TODO: Add other useful fields. apiVersion, kind, uid?
+ More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
+ 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
+ endpoint:
+ description: Custom endpoint to be used.
+ minLength: 1
+ type: string
+ refreshInterval:
+ description: Refresh interval to re-read the resources list.
+ pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+ type: string
+ service:
+ allOf:
+ - enum:
+ - VPS
+ - DedicatedServer
+ - enum:
+ - VPS
+ - DedicatedServer
+ description: Service of the targets to retrieve. Must be `VPS` or `DedicatedServer`.
+ type: string
+ required:
+ - applicationKey
+ - applicationSecret
+ - consumerKey
+ - service
+ type: object
+ type: array
params:
additionalProperties:
items:
@@ -6101,6 +6209,9 @@ spec:
puppetDBSDConfigs:
description: PuppetDBSDConfigs defines a list of PuppetDB service discovery configurations.
items:
+ description: |-
+ PuppetDBSDConfig configurations allow retrieving scrape targets from PuppetDB resources.
+ See https://prometheus.io/docs/prometheus/latest/configuration/configuration/#puppetdb_sd_config
properties:
authorization:
description: |-
@@ -6642,6 +6753,291 @@ spec:
description: SampleLimit defines per-scrape limit on number of scraped samples that will be accepted.
format: int64
type: integer
+ scalewaySDConfigs:
+ description: ScalewaySDConfigs defines a list of Scaleway instances and baremetal service discovery configurations.
+ items:
+ description: |-
+ ScalewaySDConfig configurations allow retrieving scrape targets from Scaleway instances and baremetal services.
+ See https://prometheus.io/docs/prometheus/latest/configuration/configuration/#scaleway_sd_config
+ TODO: Need to document that we will not be supporting the `_file` fields.
+ properties:
+ accessKey:
+ description: Access key to use. https://console.scaleway.com/project/credentials
+ minLength: 1
+ type: string
+ apiURL:
+ description: API URL to use when doing the server listing requests.
+ pattern: ^http(s)?://.+$
+ type: string
+ enableHTTP2:
+ description: Whether to enable HTTP2.
+ type: boolean
+ followRedirects:
+ description: Configure whether HTTP requests follow HTTP 3xx redirects.
+ type: boolean
+ nameFilter:
+ description: NameFilter specify a name filter (works as a LIKE) to apply on the server listing request.
+ minLength: 1
+ type: string
+ noProxy:
+ description: |-
+ `noProxy` is a comma-separated string that can contain IPs, CIDR notation, domain names
+ that should be excluded from proxying. IP and domain names can
+ contain port numbers.
+
+
+ It requires Prometheus >= v2.43.0.
+ type: string
+ port:
+ description: The port to scrape metrics from.
+ format: int32
+ maximum: 65535
+ minimum: 0
+ type: integer
+ projectID:
+ description: Project ID of the targets.
+ minLength: 1
+ type: string
+ proxyConnectHeader:
+ additionalProperties:
+ 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:
+ default: ""
+ description: |-
+ Name of the referent.
+ This field is effectively required, but due to backwards compatibility is
+ allowed to be empty. Instances of this type with an empty value here are
+ almost certainly wrong.
+ TODO: Add other useful fields. apiVersion, kind, uid?
+ More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
+ 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.
+
+
+ It requires Prometheus >= v2.43.0.
+ type: object
+ x-kubernetes-map-type: atomic
+ proxyFromEnvironment:
+ description: |-
+ Whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+ If unset, Prometheus uses its default value.
+
+
+ It requires Prometheus >= v2.43.0.
+ type: boolean
+ proxyUrl:
+ description: |-
+ `proxyURL` defines the HTTP proxy server to use.
+
+
+ It requires Prometheus >= v2.43.0.
+ pattern: ^http(s)?://.+$
+ type: string
+ refreshInterval:
+ description: Refresh interval to re-read the list of instances.
+ pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+ type: string
+ role:
+ description: Service of the targets to retrieve. Must be `Instance` or `Baremetal`.
+ enum:
+ - Instance
+ - Baremetal
+ type: string
+ secretKey:
+ description: Secret key to use when listing targets.
+ properties:
+ key:
+ description: The key of the secret to select from. Must be a valid secret key.
+ type: string
+ name:
+ default: ""
+ description: |-
+ Name of the referent.
+ This field is effectively required, but due to backwards compatibility is
+ allowed to be empty. Instances of this type with an empty value here are
+ almost certainly wrong.
+ TODO: Add other useful fields. apiVersion, kind, uid?
+ More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
+ 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
+ tagsFilter:
+ description: TagsFilter specify a tag filter (a server needs to have all defined tags to be listed) to apply on the server listing request.
+ items:
+ type: string
+ minItems: 1
+ type: array
+ tlsConfig:
+ description: TLS configuration to use on every scrape request
+ properties:
+ ca:
+ description: Certificate authority used when verifying server certificates.
+ properties:
+ configMap:
+ description: ConfigMap containing data to use for the targets.
+ properties:
+ key:
+ description: The key to select.
+ type: string
+ name:
+ default: ""
+ description: |-
+ Name of the referent.
+ This field is effectively required, but due to backwards compatibility is
+ allowed to be empty. Instances of this type with an empty value here are
+ almost certainly wrong.
+ TODO: Add other useful fields. apiVersion, kind, uid?
+ More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
+ type: string
+ optional:
+ description: Specify whether the ConfigMap or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ secret:
+ description: Secret containing data to use for the targets.
+ properties:
+ key:
+ description: The key of the secret to select from. Must be a valid secret key.
+ type: string
+ name:
+ default: ""
+ description: |-
+ Name of the referent.
+ This field is effectively required, but due to backwards compatibility is
+ allowed to be empty. Instances of this type with an empty value here are
+ almost certainly wrong.
+ TODO: Add other useful fields. apiVersion, kind, uid?
+ More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
+ 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: object
+ cert:
+ description: Client certificate to present when doing client-authentication.
+ properties:
+ configMap:
+ description: ConfigMap containing data to use for the targets.
+ properties:
+ key:
+ description: The key to select.
+ type: string
+ name:
+ default: ""
+ description: |-
+ Name of the referent.
+ This field is effectively required, but due to backwards compatibility is
+ allowed to be empty. Instances of this type with an empty value here are
+ almost certainly wrong.
+ TODO: Add other useful fields. apiVersion, kind, uid?
+ More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
+ type: string
+ optional:
+ description: Specify whether the ConfigMap or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ secret:
+ description: Secret containing data to use for the targets.
+ properties:
+ key:
+ description: The key of the secret to select from. Must be a valid secret key.
+ type: string
+ name:
+ default: ""
+ description: |-
+ Name of the referent.
+ This field is effectively required, but due to backwards compatibility is
+ allowed to be empty. Instances of this type with an empty value here are
+ almost certainly wrong.
+ TODO: Add other useful fields. apiVersion, kind, uid?
+ More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
+ 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: object
+ insecureSkipVerify:
+ description: Disable target certificate validation.
+ type: boolean
+ keySecret:
+ description: Secret containing the client key file for the targets.
+ properties:
+ key:
+ description: The key of the secret to select from. Must be a valid secret key.
+ type: string
+ name:
+ default: ""
+ description: |-
+ Name of the referent.
+ This field is effectively required, but due to backwards compatibility is
+ allowed to be empty. Instances of this type with an empty value here are
+ almost certainly wrong.
+ TODO: Add other useful fields. apiVersion, kind, uid?
+ More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
+ 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
+ serverName:
+ description: Used to verify the hostname for the targets.
+ type: string
+ type: object
+ zone:
+ description: Zone is the availability zone of your targets (e.g. fr-par-1).
+ minLength: 1
+ type: string
+ required:
+ - accessKey
+ - projectID
+ - role
+ - secretKey
+ type: object
+ type: array
scheme:
description: |-
Configures the protocol scheme used for requests.
diff --git a/manifests/setup/0servicemonitorCustomResourceDefinition.yaml b/manifests/setup/0servicemonitorCustomResourceDefinition.yaml
index ef86a88796fa027c6d3a0493668753415aa85889..49bb5ddcce2fd1144ae7cf4fc52398902971c67e 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.15.0
- operator.prometheus.io/version: 0.74.0
+ operator.prometheus.io/version: 0.75.1
name: servicemonitors.monitoring.coreos.com
spec:
group: monitoring.coreos.com
@@ -21,7 +21,16 @@ spec:
- name: v1
schema:
openAPIV3Schema:
- description: ServiceMonitor defines monitoring for a set of services.
+ description: |-
+ The `ServiceMonitor` custom resource definition (CRD) defines how `Prometheus` and `PrometheusAgent` can scrape metrics from a group of services.
+ Among other things, it allows to specify:
+ * The services to scrape via label selectors.
+ * The container ports to scrape.
+ * Authentication credentials to use.
+ * Target and metric relabeling.
+
+
+ `Prometheus` and `PrometheusAgent` objects select `ServiceMonitor` objects using label and namespace selectors.
properties:
apiVersion:
description: |-
@@ -69,7 +78,10 @@ spec:
pattern: (^0|([0-9]*[.])?[0-9]+((K|M|G|T|E|P)i?)?B)$
type: string
endpoints:
- description: List of endpoints part of this ServiceMonitor.
+ description: |-
+ List of endpoints part of this ServiceMonitor.
+ Defines how to scrape metrics from Kubernetes [Endpoints](https://kubernetes.io/docs/concepts/services-networking/service/#endpoints) objects.
+ In most cases, an Endpoints object is backed by a Kubernetes [Service](https://kubernetes.io/docs/concepts/services-networking/service/) object with the same name and labels.
items:
description: |-
Endpoint defines an endpoint serving Prometheus metrics to be scraped by
@@ -826,8 +838,8 @@ spec:
type: integer
namespaceSelector:
description: |-
- Selector to select which namespaces the Kubernetes `Endpoints` objects
- are discovered from.
+ `namespaceSelector` defines in which namespace(s) Prometheus should discover the services.
+ By default, the services are discovered in the same namespace as the `ServiceMonitor` object but it is possible to select pods across different/all namespaces.
properties:
any:
description: |-
@@ -884,7 +896,7 @@ spec:
type: array
x-kubernetes-list-type: set
selector:
- description: Label selector to select the Kubernetes `Endpoints` objects.
+ description: Label selector to select the Kubernetes `Endpoints` objects to scrape metrics from.
properties:
matchExpressions:
description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
@@ -941,6 +953,7 @@ spec:
format: int64
type: integer
required:
+ - endpoints
- selector
type: object
required:
diff --git a/manifests/setup/0thanosrulerCustomResourceDefinition.yaml b/manifests/setup/0thanosrulerCustomResourceDefinition.yaml
index fe8cb53d1aca4dcd5c01560e8430fffdf13120bd..e959838f02a6de89eb5f18b054e849624bc102cf 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.15.0
- operator.prometheus.io/version: 0.74.0
+ operator.prometheus.io/version: 0.75.1
name: thanosrulers.monitoring.coreos.com
spec:
group: monitoring.coreos.com
@@ -48,7 +48,14 @@ spec:
name: v1
schema:
openAPIV3Schema:
- description: ThanosRuler defines a ThanosRuler deployment.
+ description: |-
+ The `ThanosRuler` custom resource definition (CRD) defines a desired [Thanos Ruler](https://github.com/thanos-io/thanos/blob/main/docs/components/rule.md) setup to run in a Kubernetes cluster.
+
+
+ A `ThanosRuler` instance requires at least one compatible Prometheus API endpoint (either Thanos Querier or Prometheus services).
+
+
+ The resource defines via label and namespace selectors which `PrometheusRule` objects should be associated to the deployed Thanos Ruler instances.
properties:
apiVersion:
description: |-