diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index 08a0ff19d97f7ac8ab6996eb395b966f8a60df87..5c01010f3d5a35f886dc14183acf37146a55d833 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -18,8 +18,8 @@
"subdir": "contrib/mixin"
}
},
- "version": "556447683112b6ccc00b27a1bd0d0a4edc361692",
- "sum": "W/Azptf1PoqjyMwJON96UY69MFugDA4IAYiKURscryc="
+ "version": "f4fad92e0d0240d1495cc6bf9d2f4d1fbeab4e4b",
+ "sum": "RqOj1ITnyH6jm/6qBtEE+Ob5KTk/nKX1zlhj/SWqARE="
},
{
"source": {
@@ -38,7 +38,7 @@
"subdir": "grafana-builder"
}
},
- "version": "054a2cecd449b88582386cd12a5865daca10439e",
+ "version": "d8d3c4b74089f6f6a83b6c99d7425e2d646a1b30",
"sum": "GRf2GvwEU4jhXV+JOonXSZ4wdDv8mnHBPCQ6TUVd+g8="
},
{
@@ -48,8 +48,8 @@
"subdir": ""
}
},
- "version": "e0dc3563dcbf2e54e0ffe8e83f3f51b237ef33be",
- "sum": "egi2xHFco6VkCxettVvAju/yrsGnB3AFoPpCGKfWhtU="
+ "version": "6a4b21fb685af4a26983a4e51103f62b3ca244f7",
+ "sum": "Z/G2a7I4uXmDSgcwJqZ1f4haO+CInIJgYiLaCLCpm6U="
},
{
"source": {
@@ -58,7 +58,7 @@
"subdir": "lib/promgrafonnet"
}
},
- "version": "e0dc3563dcbf2e54e0ffe8e83f3f51b237ef33be",
+ "version": "6a4b21fb685af4a26983a4e51103f62b3ca244f7",
"sum": "zv7hXGui6BfHzE9wPatHI/AGZa4A2WKo6pq7ZdqBsps="
},
{
@@ -68,7 +68,7 @@
"subdir": "jsonnet/kube-state-metrics"
}
},
- "version": "d94da5292d7e213c5b2f3f508d162e6044a68ca9",
+ "version": "7594278d264753220921eef1a59af4927b375573",
"sum": "S5qI+PJUdNeYOv76jH5nxwYS9N6U7CRxvyuB1wI4cTE="
},
{
@@ -78,7 +78,7 @@
"subdir": "jsonnet/kube-state-metrics-mixin"
}
},
- "version": "d94da5292d7e213c5b2f3f508d162e6044a68ca9",
+ "version": "7594278d264753220921eef1a59af4927b375573",
"sum": "u8gaydJoxEjzizQ8jY8xSjYgWooPmxw+wIWdDxifMAk="
},
{
@@ -88,7 +88,7 @@
"subdir": "jsonnet/mixin"
}
},
- "version": "1c35faa561f2557fa156438c13c5763d3b6ac6c4",
+ "version": "2388bfa557c9836d5ff01e620a129d33852670ff",
"sum": "6reUygVmQrLEWQzTKcH8ceDbvM+2ztK3z2VBR2K2l+U=",
"name": "prometheus-operator-mixin"
},
@@ -99,7 +99,7 @@
"subdir": "jsonnet/prometheus-operator"
}
},
- "version": "1c35faa561f2557fa156438c13c5763d3b6ac6c4",
+ "version": "2388bfa557c9836d5ff01e620a129d33852670ff",
"sum": "eHJp7oFWvBEsSmwoRML356DLK80n7rRt8XKRZ+YawvQ="
},
{
@@ -109,7 +109,7 @@
"subdir": "doc/alertmanager-mixin"
}
},
- "version": "fd0929ba9fc58737a9c91f24771862692fa72d17",
+ "version": "8491f816296b26bd4efe3aa4164fe72a7cd329de",
"sum": "pep+dHzfIjh2SU5pEkwilMCAT/NoL6YYflV4x8cr7vU=",
"name": "alertmanager"
},
@@ -120,7 +120,7 @@
"subdir": "docs/node-mixin"
}
},
- "version": "90d469805ac04cf1be31fdb50fcd895146332e92",
+ "version": "35a2de21d4ae686f4d3e9e0a54059a6c7ef93885",
"sum": "os3VfjBdFdDaTYzI+A/RahIhQcgQ7KoaLL68s1kiCbA="
},
{
@@ -130,7 +130,7 @@
"subdir": "documentation/prometheus-mixin"
}
},
- "version": "d8219f29f4fec899edde3d3055acf3013dc3f77a",
+ "version": "62598878dd080d0488457e2238fb6e5a847a8247",
"sum": "G3mFWvwIrrhG6hlPz/hQdE6ZNSim88DlbSDJN7enkhY=",
"name": "prometheus"
},
@@ -141,7 +141,7 @@
"subdir": "mixin"
}
},
- "version": "8f5021166d21005f9a63c3c44fd876113fd0c05d",
+ "version": "e7d3ec77ee6ad2580e50b371c00465ad277340a1",
"sum": "cajthvLKDjYgYHCKQU2g/pTMRkxcbuJEvTnCyJOihl8=",
"name": "thanos-mixin"
},
diff --git a/manifests/grafana-dashboardDefinitions.yaml b/manifests/grafana-dashboardDefinitions.yaml
index 8253c14cf7dc2094661ed05d86798cc744af92ff..cfc1a747c74d10824ecd0ac8b136d093bf4341b6 100644
--- a/manifests/grafana-dashboardDefinitions.yaml
+++ b/manifests/grafana-dashboardDefinitions.yaml
@@ -7504,7 +7504,7 @@ items:
},
"yaxes": [
{
- "format": "Bps",
+ "format": "pps",
"label": null,
"logBase": 1,
"max": null,
@@ -7590,7 +7590,7 @@ items:
},
"yaxes": [
{
- "format": "Bps",
+ "format": "pps",
"label": null,
"logBase": 1,
"max": null,
@@ -7688,7 +7688,7 @@ items:
},
"yaxes": [
{
- "format": "Bps",
+ "format": "pps",
"label": null,
"logBase": 1,
"max": null,
@@ -7774,7 +7774,7 @@ items:
},
"yaxes": [
{
- "format": "Bps",
+ "format": "pps",
"label": null,
"logBase": 1,
"max": null,
@@ -10210,7 +10210,7 @@ items:
},
"yaxes": [
{
- "format": "Bps",
+ "format": "pps",
"label": null,
"logBase": 1,
"max": null,
@@ -10296,7 +10296,7 @@ items:
},
"yaxes": [
{
- "format": "Bps",
+ "format": "pps",
"label": null,
"logBase": 1,
"max": null,
@@ -10394,7 +10394,7 @@ items:
},
"yaxes": [
{
- "format": "Bps",
+ "format": "pps",
"label": null,
"logBase": 1,
"max": null,
@@ -10480,7 +10480,7 @@ items:
},
"yaxes": [
{
- "format": "Bps",
+ "format": "pps",
"label": null,
"logBase": 1,
"max": null,
@@ -13362,7 +13362,7 @@ items:
},
"yaxes": [
{
- "format": "Bps",
+ "format": "pps",
"label": null,
"logBase": 1,
"max": null,
@@ -13449,7 +13449,7 @@ items:
},
"yaxes": [
{
- "format": "Bps",
+ "format": "pps",
"label": null,
"logBase": 1,
"max": null,
@@ -13548,7 +13548,7 @@ items:
},
"yaxes": [
{
- "format": "Bps",
+ "format": "pps",
"label": null,
"logBase": 1,
"max": null,
@@ -13635,7 +13635,7 @@ items:
},
"yaxes": [
{
- "format": "Bps",
+ "format": "pps",
"label": null,
"logBase": 1,
"max": null,
@@ -16004,7 +16004,7 @@ items:
},
"yaxes": [
{
- "format": "Bps",
+ "format": "pps",
"label": null,
"logBase": 1,
"max": null,
@@ -16090,7 +16090,7 @@ items:
},
"yaxes": [
{
- "format": "Bps",
+ "format": "pps",
"label": null,
"logBase": 1,
"max": null,
@@ -16188,7 +16188,7 @@ items:
},
"yaxes": [
{
- "format": "Bps",
+ "format": "pps",
"label": null,
"logBase": 1,
"max": null,
@@ -16274,7 +16274,7 @@ items:
},
"yaxes": [
{
- "format": "Bps",
+ "format": "pps",
"label": null,
"logBase": 1,
"max": null,
@@ -18166,7 +18166,7 @@ items:
},
"yaxes": [
{
- "format": "Bps",
+ "format": "pps",
"label": null,
"logBase": 1,
"max": null,
@@ -18252,7 +18252,7 @@ items:
},
"yaxes": [
{
- "format": "Bps",
+ "format": "pps",
"label": null,
"logBase": 1,
"max": null,
@@ -18350,7 +18350,7 @@ items:
},
"yaxes": [
{
- "format": "Bps",
+ "format": "pps",
"label": null,
"logBase": 1,
"max": null,
@@ -18436,7 +18436,7 @@ items:
},
"yaxes": [
{
- "format": "Bps",
+ "format": "pps",
"label": null,
"logBase": 1,
"max": null,
diff --git a/manifests/kubernetes-prometheusRule.yaml b/manifests/kubernetes-prometheusRule.yaml
index 208116ff702f8e6f1dfd9f5e97f0617b65204a00..a3b278f14120f2eccffbeaf666d601713787efe1 100644
--- a/manifests/kubernetes-prometheusRule.yaml
+++ b/manifests/kubernetes-prometheusRule.yaml
@@ -60,7 +60,7 @@ spec:
expr: |
(
kube_deployment_spec_replicas{job="kube-state-metrics"}
- !=
+ >
kube_deployment_status_replicas_available{job="kube-state-metrics"}
) and (
changes(kube_deployment_status_replicas_updated{job="kube-state-metrics"}[10m])
@@ -212,7 +212,7 @@ spec:
severity: warning
- alert: KubeHpaReplicasMismatch
annotations:
- description: HPA {{ $labels.namespace }}/{{ $labels.hpa }} has not matched the desired number of replicas for longer than 15 minutes.
+ description: HPA {{ $labels.namespace }}/{{ $labels.horizontalpodautoscaler }} has not matched the desired number of replicas for longer than 15 minutes.
runbook_url: https://github.com/prometheus-operator/kube-prometheus/wiki/kubehpareplicasmismatch
summary: HPA has not matched descired number of replicas.
expr: |
@@ -234,7 +234,7 @@ spec:
severity: warning
- alert: KubeHpaMaxedOut
annotations:
- description: HPA {{ $labels.namespace }}/{{ $labels.hpa }} has been running at max replicas for longer than 15 minutes.
+ description: HPA {{ $labels.namespace }}/{{ $labels.horizontalpodautoscaler }} has been running at max replicas for longer than 15 minutes.
runbook_url: https://github.com/prometheus-operator/kube-prometheus/wiki/kubehpamaxedout
summary: HPA is running at max replicas
expr: |
@@ -362,10 +362,13 @@ spec:
runbook_url: https://github.com/prometheus-operator/kube-prometheus/wiki/kubepersistentvolumefillingup
summary: PersistentVolume is filling up.
expr: |
- kubelet_volume_stats_available_bytes{job="kubelet", metrics_path="/metrics"}
- /
- kubelet_volume_stats_capacity_bytes{job="kubelet", metrics_path="/metrics"}
- < 0.03
+ (
+ kubelet_volume_stats_available_bytes{job="kubelet", metrics_path="/metrics"}
+ /
+ kubelet_volume_stats_capacity_bytes{job="kubelet", metrics_path="/metrics"}
+ ) < 0.03
+ and
+ kubelet_volume_stats_used_bytes{job="kubelet", metrics_path="/metrics"} > 0
for: 1m
labels:
severity: critical
@@ -381,6 +384,8 @@ spec:
kubelet_volume_stats_capacity_bytes{job="kubelet", metrics_path="/metrics"}
) < 0.15
and
+ kubelet_volume_stats_used_bytes{job="kubelet", metrics_path="/metrics"} > 0
+ and
predict_linear(kubelet_volume_stats_available_bytes{job="kubelet", metrics_path="/metrics"}[6h], 4 * 24 * 3600) < 0
for: 1h
labels: