diff --git a/jsonnet/kube-prometheus/versions.json b/jsonnet/kube-prometheus/versions.json
index f56a82931c70fdf645402049dbea2d169d2dadef..6a9380d61df6e61135538c1cd3618ccff2608ccb 100644
--- a/jsonnet/kube-prometheus/versions.json
+++ b/jsonnet/kube-prometheus/versions.json
@@ -1,12 +1,12 @@
{
"alertmanager": "0.26.0",
"blackboxExporter": "0.24.0",
- "grafana": "10.2.3",
+ "grafana": "10.3.1",
"kubeStateMetrics": "2.10.1",
"nodeExporter": "1.7.0",
"prometheus": "2.49.1",
"prometheusAdapter": "0.11.2",
- "prometheusOperator": "0.71.0",
+ "prometheusOperator": "0.71.2",
"kubeRbacProxy": "0.15.0",
"configmapReload": "0.5.0",
"pyrra": "0.6.4"
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index eeb055416f4023b54adcf642a21c1f78bb7975c0..c1aa3e92119b61b8c1f282d9695e16b60ea22686 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -18,7 +18,7 @@
"subdir": "contrib/mixin"
}
},
- "version": "15f95ec49b90fbfd09bc1315cf71d4c1167ee873",
+ "version": "58846bd8f3bedee3260623301d1c02a99580a2a9",
"sum": "xuUBd2vqF7asyVDe5CE08uPT/RxAdy8O75EjFJoMXXU="
},
{
@@ -68,7 +68,7 @@
"subdir": "grafana-builder"
}
},
- "version": "07b4fefc47db2aad8b355eb78734cdef427d960a",
+ "version": "328cd1e1b8978755706c695de6b6dd5a92f064d3",
"sum": "B49EzIY2WZsFxNMJcgRxE/gcZ9ltnS8pkOOV6Q5qioc="
},
{
@@ -98,8 +98,8 @@
"subdir": ""
}
},
- "version": "c72ac0392998343d53bd73343467f8bf2aa4e333",
- "sum": "VWD9c9I1Q2252HgV/Ao/4mvdATy5GAyZASO30ituyJU="
+ "version": "bf3acbdd48da8d246f35d198bfe79dd7ec59824d",
+ "sum": "bT3Zz4l1K/MrN6K0C/iZSjCIsbmK5Qcc0JexalwSU9g="
},
{
"source": {
@@ -108,7 +108,7 @@
"subdir": "jsonnet/kube-state-metrics"
}
},
- "version": "90bd24f27c618ce916db4cd9da34d854d49db5b6",
+ "version": "0fb6eee2af82b5b45667d7a5b1f2b9bb3dd2c632",
"sum": "msMZyUvcebzRILLzNlTIiSOwa1XgQKtP7jbZTkiqwM0="
},
{
@@ -118,7 +118,7 @@
"subdir": "jsonnet/kube-state-metrics-mixin"
}
},
- "version": "90bd24f27c618ce916db4cd9da34d854d49db5b6",
+ "version": "0fb6eee2af82b5b45667d7a5b1f2b9bb3dd2c632",
"sum": "qclI7LwucTjBef3PkGBkKxF0mfZPbHnn4rlNWKGtR4c="
},
{
@@ -128,7 +128,7 @@
"subdir": "jsonnet/mixin"
}
},
- "version": "57e4f8f5763b83b7e8e730b2dc061530688a44ad",
+ "version": "81b409d0db7956213e4bf95881e672c4e5e96cd0",
"sum": "gi+knjdxs2T715iIQIntrimbHRgHnpM8IFBJDD1gYfs=",
"name": "prometheus-operator-mixin"
},
@@ -139,8 +139,8 @@
"subdir": "jsonnet/prometheus-operator"
}
},
- "version": "57e4f8f5763b83b7e8e730b2dc061530688a44ad",
- "sum": "xV51OVpk3WXjHNjpwXf5Ve0pUDiZkvkzpeA6u2YjtmE="
+ "version": "81b409d0db7956213e4bf95881e672c4e5e96cd0",
+ "sum": "tr81OyVVhhAsBeROJha6y90XI3vPJHFRufw4GMOXA+Y="
},
{
"source": {
@@ -149,7 +149,7 @@
"subdir": "doc/alertmanager-mixin"
}
},
- "version": "f92a08d073863b7e3731e503c45c81065c4b2910",
+ "version": "1da134aa30c81e656c5156df1499a77d5df92269",
"sum": "IpF46ZXsm+0wJJAPtAre8+yxTNZA57mBqGpBP/r7/kw=",
"name": "alertmanager"
},
@@ -160,7 +160,7 @@
"subdir": "docs/node-mixin"
}
},
- "version": "e22174ca8e47993dbc8c3aab8c2e6906f06926b5",
+ "version": "4db443e5a62aed2dd3607de5131f12971c083a5d",
"sum": "QZwFBpulndqo799gkR5rP2/WdcQKQkNnaBwhaOI8Jeg="
},
{
@@ -170,7 +170,7 @@
"subdir": "documentation/prometheus-mixin"
}
},
- "version": "65cf528403b9cd2f6e4b526ee2c29d2e84c76178",
+ "version": "bdc3cfdd5dff0e076e1a5778289b36b3fe5962f3",
"sum": "GORLOoG6efKxGuj57d06LiqwtVkRhllDfqWQS7c+j1w=",
"name": "prometheus"
},
@@ -192,7 +192,7 @@
"subdir": "mixin"
}
},
- "version": "058f92070ffe2a322c99685141a4ff53c0c1d4ca",
+ "version": "1cf333e28df1b4e15845fee20b93606eb6f33713",
"sum": "HhSSbGGCNHCMy1ee5jElYDm0yS9Vesa7QB2/SHKdjsY=",
"name": "thanos-mixin"
},
diff --git a/manifests/grafana-config.yaml b/manifests/grafana-config.yaml
index aedf1afea47e5150b722387aa0b7065d8609ad31..dca4f6127caa4935c0ba419a52db862ab159a925 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.2.3
+ app.kubernetes.io/version: 10.3.1
name: grafana-config
namespace: monitoring
stringData:
diff --git a/manifests/grafana-dashboardDatasources.yaml b/manifests/grafana-dashboardDatasources.yaml
index 6a90578f2729d8675da561fe577503f48df01422..755b15fa22e8d3ea2a59c6df737bc8f04d254532 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.2.3
+ app.kubernetes.io/version: 10.3.1
name: grafana-datasources
namespace: monitoring
stringData:
diff --git a/manifests/grafana-dashboardDefinitions.yaml b/manifests/grafana-dashboardDefinitions.yaml
index 1de1ac30338e9ffb00f12e3ef6e3fc0e22bcebdf..0dd32d97839e161ed2a9c2194d22be9048254c3a 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.2.3
+ app.kubernetes.io/version: 10.3.1
name: grafana-dashboard-alertmanager-overview
namespace: monitoring
- apiVersion: v1
@@ -2362,7 +2362,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.2.3
+ app.kubernetes.io/version: 10.3.1
name: grafana-dashboard-apiserver
namespace: monitoring
- apiVersion: v1
@@ -4234,7 +4234,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.2.3
+ app.kubernetes.io/version: 10.3.1
name: grafana-dashboard-cluster-total
namespace: monitoring
- apiVersion: v1
@@ -5414,7 +5414,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.2.3
+ app.kubernetes.io/version: 10.3.1
name: grafana-dashboard-controller-manager
namespace: monitoring
- apiVersion: v1
@@ -6039,7 +6039,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.2.3
+ app.kubernetes.io/version: 10.3.1
name: grafana-dashboard-grafana-overview
namespace: monitoring
- apiVersion: v1
@@ -9034,7 +9034,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.2.3
+ app.kubernetes.io/version: 10.3.1
name: grafana-dashboard-k8s-resources-cluster
namespace: monitoring
- apiVersion: v1
@@ -10379,7 +10379,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.2.3
+ app.kubernetes.io/version: 10.3.1
name: grafana-dashboard-k8s-resources-multicluster
namespace: monitoring
- apiVersion: v1
@@ -13083,7 +13083,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.2.3
+ app.kubernetes.io/version: 10.3.1
name: grafana-dashboard-k8s-resources-namespace
namespace: monitoring
- apiVersion: v1
@@ -14064,7 +14064,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.2.3
+ app.kubernetes.io/version: 10.3.1
name: grafana-dashboard-k8s-resources-node
namespace: monitoring
- apiVersion: v1
@@ -16446,7 +16446,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.2.3
+ app.kubernetes.io/version: 10.3.1
name: grafana-dashboard-k8s-resources-pod
namespace: monitoring
- apiVersion: v1
@@ -18407,7 +18407,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.2.3
+ app.kubernetes.io/version: 10.3.1
name: grafana-dashboard-k8s-resources-workload
namespace: monitoring
- apiVersion: v1
@@ -20521,7 +20521,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.2.3
+ app.kubernetes.io/version: 10.3.1
name: grafana-dashboard-k8s-resources-workloads-namespace
namespace: monitoring
- apiVersion: v1
@@ -22765,7 +22765,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.2.3
+ app.kubernetes.io/version: 10.3.1
name: grafana-dashboard-kubelet
namespace: monitoring
- apiVersion: v1
@@ -24219,7 +24219,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.2.3
+ app.kubernetes.io/version: 10.3.1
name: grafana-dashboard-namespace-by-pod
namespace: monitoring
- apiVersion: v1
@@ -25945,7 +25945,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.2.3
+ app.kubernetes.io/version: 10.3.1
name: grafana-dashboard-namespace-by-workload
namespace: monitoring
- apiVersion: v1
@@ -26997,7 +26997,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.2.3
+ app.kubernetes.io/version: 10.3.1
name: grafana-dashboard-node-cluster-rsrc-use
namespace: monitoring
- apiVersion: v1
@@ -28075,7 +28075,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.2.3
+ app.kubernetes.io/version: 10.3.1
name: grafana-dashboard-node-rsrc-use
namespace: monitoring
- apiVersion: v1
@@ -29137,7 +29137,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.2.3
+ app.kubernetes.io/version: 10.3.1
name: grafana-dashboard-nodes-darwin
namespace: monitoring
- apiVersion: v1
@@ -30192,7 +30192,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.2.3
+ app.kubernetes.io/version: 10.3.1
name: grafana-dashboard-nodes
namespace: monitoring
- apiVersion: v1
@@ -30769,7 +30769,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.2.3
+ app.kubernetes.io/version: 10.3.1
name: grafana-dashboard-persistentvolumesusage
namespace: monitoring
- apiVersion: v1
@@ -31987,7 +31987,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.2.3
+ app.kubernetes.io/version: 10.3.1
name: grafana-dashboard-pod-total
namespace: monitoring
- apiVersion: v1
@@ -33646,7 +33646,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.2.3
+ app.kubernetes.io/version: 10.3.1
name: grafana-dashboard-prometheus-remote-write
namespace: monitoring
- apiVersion: v1
@@ -34887,7 +34887,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.2.3
+ app.kubernetes.io/version: 10.3.1
name: grafana-dashboard-prometheus
namespace: monitoring
- apiVersion: v1
@@ -36148,7 +36148,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.2.3
+ app.kubernetes.io/version: 10.3.1
name: grafana-dashboard-proxy
namespace: monitoring
- apiVersion: v1
@@ -37250,7 +37250,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.2.3
+ app.kubernetes.io/version: 10.3.1
name: grafana-dashboard-scheduler
namespace: monitoring
- apiVersion: v1
@@ -38678,7 +38678,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.2.3
+ app.kubernetes.io/version: 10.3.1
name: grafana-dashboard-workload-total
namespace: monitoring
kind: ConfigMapList
diff --git a/manifests/grafana-dashboardSources.yaml b/manifests/grafana-dashboardSources.yaml
index 72357a00be06d67cada304951a3fb59f01da09cd..812cb53ffbc06794847cebe6d72cec9b24d330cd 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.2.3
+ app.kubernetes.io/version: 10.3.1
name: grafana-dashboards
namespace: monitoring
diff --git a/manifests/grafana-deployment.yaml b/manifests/grafana-deployment.yaml
index 69c55be2ee2f6772ec146183ca419dd3feb7fae7..1201d19f20f97a9d1c7351552acbb98416fb39a3 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.2.3
+ app.kubernetes.io/version: 10.3.1
name: grafana
namespace: monitoring
spec:
@@ -18,19 +18,19 @@ spec:
template:
metadata:
annotations:
- checksum/grafana-config: ef9ed672b6924d4f870a80fe2248c140
- checksum/grafana-dashboardproviders: 16be5cb7f2538e273c531f895df45240
- checksum/grafana-datasources: f25077f845af465acb8f35e4f1582565
+ checksum/grafana-config: e2215f27e32c5ea1f643c4640fc3c721
+ checksum/grafana-dashboardproviders: e6d5142140a8bd2ef0096a81530ce38e
+ checksum/grafana-datasources: 957433784430dab766018ee555b4e099
labels:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.2.3
+ app.kubernetes.io/version: 10.3.1
spec:
automountServiceAccountToken: false
containers:
- env: []
- image: grafana/grafana:10.2.3
+ image: grafana/grafana:10.3.1
name: grafana
ports:
- containerPort: 3000
diff --git a/manifests/grafana-networkPolicy.yaml b/manifests/grafana-networkPolicy.yaml
index faabffbcdaed72171984d7642f0ca08b8ce08363..fc5002de7b270a66e9fc2bc07a54a7a9395a3d5d 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.2.3
+ app.kubernetes.io/version: 10.3.1
name: grafana
namespace: monitoring
spec:
diff --git a/manifests/grafana-prometheusRule.yaml b/manifests/grafana-prometheusRule.yaml
index e2dc31fe4bf55a259e72f990fba6bceccce5d3d5..20a913a54eb0405e9bdb42495e7fa6aa68ef353c 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.2.3
+ app.kubernetes.io/version: 10.3.1
prometheus: k8s
role: alert-rules
name: grafana-rules
diff --git a/manifests/grafana-service.yaml b/manifests/grafana-service.yaml
index 2356cc532f9e4e5337124b6135233aa410f5f4f3..be6716765b2ddf558c11d0b7efc144b9d351ff46 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.2.3
+ app.kubernetes.io/version: 10.3.1
name: grafana
namespace: monitoring
spec:
diff --git a/manifests/grafana-serviceAccount.yaml b/manifests/grafana-serviceAccount.yaml
index e7bd8f3fb576644d79f4b49d58264d910be286a0..100ee3aea338798b13c8a684aa01c2274f11e3fc 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.2.3
+ app.kubernetes.io/version: 10.3.1
name: grafana
namespace: monitoring
diff --git a/manifests/grafana-serviceMonitor.yaml b/manifests/grafana-serviceMonitor.yaml
index a5709f026d4ac5d5ec07b39130f014492fbef449..b6b8cf6df4b36babd5a49bfc0ec696ac4ad2868b 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.2.3
+ app.kubernetes.io/version: 10.3.1
name: grafana
namespace: monitoring
spec:
diff --git a/manifests/kubernetesControlPlane-prometheusRule.yaml b/manifests/kubernetesControlPlane-prometheusRule.yaml
index e1f81f82082e0575de43114408341bd3a219f402..c4e3eae5ea7fa75663e2e0ae7cd35767c2f8e8bb 100644
--- a/manifests/kubernetesControlPlane-prometheusRule.yaml
+++ b/manifests/kubernetesControlPlane-prometheusRule.yaml
@@ -362,7 +362,7 @@ spec:
rules:
- alert: KubePersistentVolumeFillingUp
annotations:
- description: The PersistentVolume claimed by {{ $labels.persistentvolumeclaim }} in Namespace {{ $labels.namespace }} on Cluster {{ $labels.cluster }} is only {{ $value | humanizePercentage }} free.
+ description: The PersistentVolume claimed by {{ $labels.persistentvolumeclaim }} in Namespace {{ $labels.namespace }} {{ with $labels.cluster -}} on Cluster {{ . }} {{- end }} is only {{ $value | humanizePercentage }} free.
runbook_url: https://runbooks.prometheus-operator.dev/runbooks/kubernetes/kubepersistentvolumefillingup
summary: PersistentVolume is filling up.
expr: |
@@ -382,7 +382,7 @@ spec:
severity: critical
- alert: KubePersistentVolumeFillingUp
annotations:
- description: Based on recent sampling, the PersistentVolume claimed by {{ $labels.persistentvolumeclaim }} in Namespace {{ $labels.namespace }} on Cluster {{ $labels.cluster }} is expected to fill up within four days. Currently {{ $value | humanizePercentage }} is available.
+ description: Based on recent sampling, the PersistentVolume claimed by {{ $labels.persistentvolumeclaim }} in Namespace {{ $labels.namespace }} {{ with $labels.cluster -}} on Cluster {{ . }} {{- end }} is expected to fill up within four days. Currently {{ $value | humanizePercentage }} is available.
runbook_url: https://runbooks.prometheus-operator.dev/runbooks/kubernetes/kubepersistentvolumefillingup
summary: PersistentVolume is filling up.
expr: |
@@ -404,7 +404,7 @@ spec:
severity: warning
- alert: KubePersistentVolumeInodesFillingUp
annotations:
- description: The PersistentVolume claimed by {{ $labels.persistentvolumeclaim }} in Namespace {{ $labels.namespace }} on Cluster {{ $labels.cluster }} only has {{ $value | humanizePercentage }} free inodes.
+ description: The PersistentVolume claimed by {{ $labels.persistentvolumeclaim }} in Namespace {{ $labels.namespace }} {{ with $labels.cluster -}} on Cluster {{ . }} {{- end }} only has {{ $value | humanizePercentage }} free inodes.
runbook_url: https://runbooks.prometheus-operator.dev/runbooks/kubernetes/kubepersistentvolumeinodesfillingup
summary: PersistentVolumeInodes are filling up.
expr: |
@@ -424,7 +424,7 @@ spec:
severity: critical
- alert: KubePersistentVolumeInodesFillingUp
annotations:
- description: Based on recent sampling, the PersistentVolume claimed by {{ $labels.persistentvolumeclaim }} in Namespace {{ $labels.namespace }} on Cluster {{ $labels.cluster }} is expected to run out of inodes within four days. Currently {{ $value | humanizePercentage }} of its inodes are free.
+ description: Based on recent sampling, the PersistentVolume claimed by {{ $labels.persistentvolumeclaim }} in Namespace {{ $labels.namespace }} {{ with $labels.cluster -}} on Cluster {{ . }} {{- end }} is expected to run out of inodes within four days. Currently {{ $value | humanizePercentage }} of its inodes are free.
runbook_url: https://runbooks.prometheus-operator.dev/runbooks/kubernetes/kubepersistentvolumeinodesfillingup
summary: PersistentVolumeInodes are filling up.
expr: |
@@ -446,7 +446,7 @@ spec:
severity: warning
- alert: KubePersistentVolumeErrors
annotations:
- description: The persistent volume {{ $labels.persistentvolume }} on Cluster {{ $labels.cluster }} has status {{ $labels.phase }}.
+ description: The persistent volume {{ $labels.persistentvolume }} {{ with $labels.cluster -}} on Cluster {{ . }} {{- end }} has status {{ $labels.phase }}.
runbook_url: https://runbooks.prometheus-operator.dev/runbooks/kubernetes/kubepersistentvolumeerrors
summary: PersistentVolume is having issues with provisioning.
expr: |
diff --git a/manifests/prometheusOperator-clusterRole.yaml b/manifests/prometheusOperator-clusterRole.yaml
index 17bc39f3714e9f31d4b69ba6c616d75bdbb2e2aa..a799fc32e2910d4ff7ac2302321c7681ec4f346f 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.71.0
+ app.kubernetes.io/version: 0.71.2
name: prometheus-operator
rules:
- apiGroups:
diff --git a/manifests/prometheusOperator-clusterRoleBinding.yaml b/manifests/prometheusOperator-clusterRoleBinding.yaml
index a7e6f59660b66194ebaec98b94e511772ed0b22b..2e7c21edd743bcf49ed5adcda58e64e8afea5153 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.71.0
+ app.kubernetes.io/version: 0.71.2
name: prometheus-operator
roleRef:
apiGroup: rbac.authorization.k8s.io
diff --git a/manifests/prometheusOperator-deployment.yaml b/manifests/prometheusOperator-deployment.yaml
index 5c5bffc91b10e105a4f4df1988295ba27660db2e..a8b3933a271400be4d86bf207a39c0c6a3ee6134 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.71.0
+ app.kubernetes.io/version: 0.71.2
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.71.0
+ app.kubernetes.io/version: 0.71.2
spec:
automountServiceAccountToken: true
containers:
- args:
- --kubelet-service=kube-system/kubelet
- - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.71.0
+ - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.71.2
env:
- name: GOGC
value: "30"
- image: quay.io/prometheus-operator/prometheus-operator:v0.71.0
+ image: quay.io/prometheus-operator/prometheus-operator:v0.71.2
name: prometheus-operator
ports:
- containerPort: 8080
diff --git a/manifests/prometheusOperator-networkPolicy.yaml b/manifests/prometheusOperator-networkPolicy.yaml
index 19cd4dc2b334ea2783aa9aee7edc7c4433c5f667..30ecd991e056e1b82d23c54ff320e52f660cd1dc 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.71.0
+ app.kubernetes.io/version: 0.71.2
name: prometheus-operator
namespace: monitoring
spec:
diff --git a/manifests/prometheusOperator-prometheusRule.yaml b/manifests/prometheusOperator-prometheusRule.yaml
index 663de0156c7b8bbb9cac3b78becb1f97d982ff4e..e163f10ba8569d381774219ca7ed2e45183936fd 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.71.0
+ app.kubernetes.io/version: 0.71.2
prometheus: k8s
role: alert-rules
name: prometheus-operator-rules
diff --git a/manifests/prometheusOperator-service.yaml b/manifests/prometheusOperator-service.yaml
index d8a89a44a37075e5d584a02f5696f2c6682c3bec..8aba259be48d72c26fd5ffe78c2e79d840e13f75 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.71.0
+ app.kubernetes.io/version: 0.71.2
name: prometheus-operator
namespace: monitoring
spec:
diff --git a/manifests/prometheusOperator-serviceAccount.yaml b/manifests/prometheusOperator-serviceAccount.yaml
index 2fa9010e919aa0c570362a1b3b1c1643ccf73542..d600dfa227f926593435874590ed77150b8e25c4 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.71.0
+ app.kubernetes.io/version: 0.71.2
name: prometheus-operator
namespace: monitoring
diff --git a/manifests/prometheusOperator-serviceMonitor.yaml b/manifests/prometheusOperator-serviceMonitor.yaml
index efc9d3efec5223437e76f412e144ec29bf3db7fe..a33dde903565b3fdaed86de2bc7c98edc56983cd 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.71.0
+ app.kubernetes.io/version: 0.71.2
name: prometheus-operator
namespace: monitoring
spec:
@@ -21,4 +21,4 @@ spec:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.71.0
+ app.kubernetes.io/version: 0.71.2
diff --git a/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml b/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml
index 8797aa35aa99c55c5a53c78700d3e2c982886a72..67387c72a5a92a27f1e538644138c5314ee87142 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.13.0
- operator.prometheus.io/version: 0.71.0
+ operator.prometheus.io/version: 0.71.2
name: alertmanagerconfigs.monitoring.coreos.com
spec:
group: monitoring.coreos.com
diff --git a/manifests/setup/0alertmanagerCustomResourceDefinition.yaml b/manifests/setup/0alertmanagerCustomResourceDefinition.yaml
index 636e883f2c37f15191b68697fb3e38bbde7ad07f..8264c5bdcff0033e718c790548cef2c45f47c207 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.13.0
- operator.prometheus.io/version: 0.71.0
+ operator.prometheus.io/version: 0.71.2
name: alertmanagers.monitoring.coreos.com
spec:
group: monitoring.coreos.com
diff --git a/manifests/setup/0podmonitorCustomResourceDefinition.yaml b/manifests/setup/0podmonitorCustomResourceDefinition.yaml
index d01553851f278a1e2bb2b6f821790256dd8fcd91..8ac8b403b0d0839872ec85f289308b68fdd6a45f 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.13.0
- operator.prometheus.io/version: 0.71.0
+ operator.prometheus.io/version: 0.71.2
name: podmonitors.monitoring.coreos.com
spec:
group: monitoring.coreos.com
diff --git a/manifests/setup/0probeCustomResourceDefinition.yaml b/manifests/setup/0probeCustomResourceDefinition.yaml
index 77482b935577cc20c51922f53a4437c5d25dff61..db2421b9035afe625f6a8763a8544ccf9a897571 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.13.0
- operator.prometheus.io/version: 0.71.0
+ operator.prometheus.io/version: 0.71.2
name: probes.monitoring.coreos.com
spec:
group: monitoring.coreos.com
diff --git a/manifests/setup/0prometheusCustomResourceDefinition.yaml b/manifests/setup/0prometheusCustomResourceDefinition.yaml
index 0b8650db926215fc008f81db0a02430e1bef8df1..6df9b8b3194bc12cdb1cad401d35edc6b842b1fe 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.13.0
- operator.prometheus.io/version: 0.71.0
+ operator.prometheus.io/version: 0.71.2
name: prometheuses.monitoring.coreos.com
spec:
group: monitoring.coreos.com
@@ -4096,6 +4096,18 @@ spec:
description: "Interval between consecutive scrapes. \n Default: \"30s\""
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
+ scrapeProtocols:
+ description: "The protocols to negotiate during a scrape. It tells clients the protocols supported by Prometheus in order of preference (from most to least preferred). \n If unset, Prometheus uses its default value. \n It requires Prometheus >= v2.49.0."
+ items:
+ description: 'ScrapeProtocol represents a protocol used by Prometheus for scraping metrics. Supported values are: * `OpenMetricsText0.0.1` * `OpenMetricsText1.0.0` * `PrometheusProto` * `PrometheusText0.0.4`'
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ type: string
+ type: array
+ x-kubernetes-list-type: set
scrapeTimeout:
description: Number of seconds to wait until a scrape request times out.
pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
diff --git a/manifests/setup/0prometheusagentCustomResourceDefinition.yaml b/manifests/setup/0prometheusagentCustomResourceDefinition.yaml
index 722fc99fd59054799e6d955bb1dcf5818f614311..328adc5afc18ec4c95ecfc2c60ab2be7ddcd37a0 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.13.0
- operator.prometheus.io/version: 0.71.0
+ operator.prometheus.io/version: 0.71.2
name: prometheusagents.monitoring.coreos.com
spec:
group: monitoring.coreos.com
@@ -3364,6 +3364,18 @@ spec:
description: "Interval between consecutive scrapes. \n Default: \"30s\""
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
+ scrapeProtocols:
+ description: "The protocols to negotiate during a scrape. It tells clients the protocols supported by Prometheus in order of preference (from most to least preferred). \n If unset, Prometheus uses its default value. \n It requires Prometheus >= v2.49.0."
+ items:
+ description: 'ScrapeProtocol represents a protocol used by Prometheus for scraping metrics. Supported values are: * `OpenMetricsText0.0.1` * `OpenMetricsText1.0.0` * `PrometheusProto` * `PrometheusText0.0.4`'
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ type: string
+ type: array
+ x-kubernetes-list-type: set
scrapeTimeout:
description: Number of seconds to wait until a scrape request times out.
pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
diff --git a/manifests/setup/0prometheusruleCustomResourceDefinition.yaml b/manifests/setup/0prometheusruleCustomResourceDefinition.yaml
index 9146cf44b655262882535a4d79b75eb03e6601c3..3b9a9f337ff7fe11ad8378681dd4af67438c003b 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.13.0
- operator.prometheus.io/version: 0.71.0
+ operator.prometheus.io/version: 0.71.2
name: prometheusrules.monitoring.coreos.com
spec:
group: monitoring.coreos.com
diff --git a/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml b/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml
index 05fd6342e59c069c60c1bc6ebdc1ed5c992ddc62..83706a16667f0fa28a8d64999239f7475ee57755 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.13.0
- operator.prometheus.io/version: 0.71.0
+ operator.prometheus.io/version: 0.71.2
name: scrapeconfigs.monitoring.coreos.com
spec:
group: monitoring.coreos.com
@@ -750,12 +750,13 @@ spec:
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
type:
- description: The type of DNS query to perform. One of SRV, A, AAAA or MX. If not set, Prometheus uses its default value.
+ description: "The type of DNS query to perform. One of SRV, A, AAAA, MX or NS. If not set, Prometheus uses its default value. \n When set to NS, It requires Prometheus >= 2.49.0."
enum:
- SRV
- A
- AAAA
- MX
+ - NS
type: string
required:
- names
@@ -1825,6 +1826,18 @@ spec:
description: ScrapeInterval is the interval between consecutive scrapes.
pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
type: string
+ scrapeProtocols:
+ description: "The protocols to negotiate during a scrape. It tells clients the protocols supported by Prometheus in order of preference (from most to least preferred). \n If unset, Prometheus uses its default value. \n It requires Prometheus >= v2.49.0."
+ items:
+ description: 'ScrapeProtocol represents a protocol used by Prometheus for scraping metrics. Supported values are: * `OpenMetricsText0.0.1` * `OpenMetricsText1.0.0` * `PrometheusProto` * `PrometheusText0.0.4`'
+ enum:
+ - PrometheusProto
+ - OpenMetricsText0.0.1
+ - OpenMetricsText1.0.0
+ - PrometheusText0.0.4
+ type: string
+ type: array
+ x-kubernetes-list-type: set
scrapeTimeout:
description: ScrapeTimeout is the number of seconds to wait until a scrape request times out.
pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
diff --git a/manifests/setup/0servicemonitorCustomResourceDefinition.yaml b/manifests/setup/0servicemonitorCustomResourceDefinition.yaml
index d5e8788a1a73390f75c8bc27e65744a590ddc90b..788c3a3dfff5863be8ab8b3685b0147c5937087c 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.13.0
- operator.prometheus.io/version: 0.71.0
+ operator.prometheus.io/version: 0.71.2
name: servicemonitors.monitoring.coreos.com
spec:
group: monitoring.coreos.com
diff --git a/manifests/setup/0thanosrulerCustomResourceDefinition.yaml b/manifests/setup/0thanosrulerCustomResourceDefinition.yaml
index 88124ef52d3ae77a531196458f592046d1d570de..146fea3ad6e9090086c9bdd5090fb5ea666e2fef 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.13.0
- operator.prometheus.io/version: 0.71.0
+ operator.prometheus.io/version: 0.71.2
name: thanosrulers.monitoring.coreos.com
spec:
group: monitoring.coreos.com