diff --git a/.github/workflows/versions.yaml b/.github/workflows/versions.yaml
index 5807f5e13f61a213d5c5c9e66b83f802dfb85fd9..0230d4414b2c34e34b453b6b38a1d64364581c2f 100644
--- a/.github/workflows/versions.yaml
+++ b/.github/workflows/versions.yaml
@@ -10,10 +10,10 @@ jobs:
strategy:
matrix:
branch:
- - 'release-0.5'
- 'release-0.6'
- 'release-0.7'
- 'release-0.8'
+ - 'release-0.9'
- 'main'
steps:
- uses: actions/checkout@v2
diff --git a/jsonnet/kube-prometheus/jsonnetfile.json b/jsonnet/kube-prometheus/jsonnetfile.json
index 477d61710632589dec314fdf974143dcd1977367..232ef3f17f81d744216817849096b9b810e837ef 100644
--- a/jsonnet/kube-prometheus/jsonnetfile.json
+++ b/jsonnet/kube-prometheus/jsonnetfile.json
@@ -17,7 +17,7 @@
"subdir": "contrib/mixin"
}
},
- "version": "release-3.5"
+ "version": "main"
},
{
"source": {
@@ -26,7 +26,7 @@
"subdir": "jsonnet/prometheus-operator"
}
},
- "version": "release-0.50"
+ "version": "master"
},
{
"source": {
@@ -35,7 +35,7 @@
"subdir": "jsonnet/mixin"
}
},
- "version": "release-0.50",
+ "version": "master",
"name": "prometheus-operator-mixin"
},
{
@@ -45,7 +45,7 @@
"subdir": ""
}
},
- "version": "release-0.9"
+ "version": "master"
},
{
"source": {
@@ -54,7 +54,7 @@
"subdir": "jsonnet/kube-state-metrics"
}
},
- "version": "release-2.1"
+ "version": "master"
},
{
"source": {
@@ -63,7 +63,7 @@
"subdir": "jsonnet/kube-state-metrics-mixin"
}
},
- "version": "release-2.1"
+ "version": "master"
},
{
"source": {
@@ -72,7 +72,7 @@
"subdir": "docs/node-mixin"
}
},
- "version": "832909dd257eb368cf83363ffcae3ab84cb4bcb1"
+ "version": "master"
},
{
"source": {
@@ -81,7 +81,7 @@
"subdir": "documentation/prometheus-mixin"
}
},
- "version": "751ca03faddc9c64089c41d0da370a3a0b477742",
+ "version": "main",
"name": "prometheus"
},
{
@@ -91,7 +91,7 @@
"subdir": "doc/alertmanager-mixin"
}
},
- "version": "b408b522bc653d014e53035e59fa394cc1edd762",
+ "version": "main",
"name": "alertmanager"
},
{
@@ -101,7 +101,7 @@
"subdir": "mixin"
}
},
- "version": "release-0.22",
+ "version": "main",
"name": "thanos-mixin"
}
],
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index 01a86cf044ac8ba8dac602348f1e541159542b6e..6ef412f17887b50613ce437cc2c870fbabdce6cd 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -18,8 +18,8 @@
"subdir": "contrib/mixin"
}
},
- "version": "2fe94b19d38237e9eff025e5eeaddde371973b01",
- "sum": "W/Azptf1PoqjyMwJON96UY69MFugDA4IAYiKURscryc="
+ "version": "ab9563dc8e4d84d06080c765f9c6c0d50313f794",
+ "sum": "5XhYOigrKipOWDbIn9hlrz7JcbelzvJnormxSaup9JI="
},
{
"source": {
@@ -48,8 +48,8 @@
"subdir": ""
}
},
- "version": "1163ea85e45e1f7edf6d4f83758d44c6fef1f2fa",
- "sum": "4H2pzHd6A47rQIZcQ3B0o+nFMeNgLE9dGYJv7ZP7m2s="
+ "version": "bc5fd5d5bc191a9549d30d0bd0f7482a9de2d1c1",
+ "sum": "pQ3h8l3P60dZd+DmqQCrWk0y1QTPKvG/Z1xwRwX3r6I="
},
{
"source": {
@@ -58,7 +58,7 @@
"subdir": "lib/promgrafonnet"
}
},
- "version": "1163ea85e45e1f7edf6d4f83758d44c6fef1f2fa",
+ "version": "bc5fd5d5bc191a9549d30d0bd0f7482a9de2d1c1",
"sum": "zv7hXGui6BfHzE9wPatHI/AGZa4A2WKo6pq7ZdqBsps="
},
{
@@ -68,7 +68,7 @@
"subdir": "jsonnet/kube-state-metrics"
}
},
- "version": "d60e6f7ba1719045edc0f60857faadeb87280421",
+ "version": "3193891ee442ee9552745d054c8d0140295431f3",
"sum": "S5qI+PJUdNeYOv76jH5nxwYS9N6U7CRxvyuB1wI4cTE="
},
{
@@ -78,7 +78,7 @@
"subdir": "jsonnet/kube-state-metrics-mixin"
}
},
- "version": "d60e6f7ba1719045edc0f60857faadeb87280421",
+ "version": "3193891ee442ee9552745d054c8d0140295431f3",
"sum": "u8gaydJoxEjzizQ8jY8xSjYgWooPmxw+wIWdDxifMAk="
},
{
@@ -109,7 +109,7 @@
"subdir": "doc/alertmanager-mixin"
}
},
- "version": "b408b522bc653d014e53035e59fa394cc1edd762",
+ "version": "ff85bec45bdce3d296a229adb47e7d29415f8a05",
"sum": "pep+dHzfIjh2SU5pEkwilMCAT/NoL6YYflV4x8cr7vU=",
"name": "alertmanager"
},
@@ -120,7 +120,7 @@
"subdir": "docs/node-mixin"
}
},
- "version": "832909dd257eb368cf83363ffcae3ab84cb4bcb1",
+ "version": "b6215e649cdfc0398ca98df8e63f3773f1725840",
"sum": "MmxGhE2PJ1a52mk2x7vDpMT2at4Jglbud/rK74CB5i0="
},
{
@@ -130,7 +130,7 @@
"subdir": "documentation/prometheus-mixin"
}
},
- "version": "751ca03faddc9c64089c41d0da370a3a0b477742",
+ "version": "54dfee02b29180bd5353b1ba843ef600f802366c",
"sum": "AS8WYFi/z10BZSF6DFkKBscjB32XDMM7iIso7CO/FyI=",
"name": "prometheus"
},
@@ -141,7 +141,7 @@
"subdir": "mixin"
}
},
- "version": "ff363498fc95cfe17de894d7237bcf38bdd0bc36",
+ "version": "da8095daab0776faa1266827278284b7a379b4bf",
"sum": "cajthvLKDjYgYHCKQU2g/pTMRkxcbuJEvTnCyJOihl8=",
"name": "thanos-mixin"
},
diff --git a/manifests/kubernetes-prometheusRule.yaml b/manifests/kubernetes-prometheusRule.yaml
index a7f1f9c9b3d34f76e869f7d0c4bbfd3340cee125..cffd5dc5b7e40bffdc6952f4d6ae9113857bd3c6 100644
--- a/manifests/kubernetes-prometheusRule.yaml
+++ b/manifests/kubernetes-prometheusRule.yaml
@@ -1042,28 +1042,40 @@ spec:
labels:
verb: write
record: code:apiserver_request_total:increase30d
+ - expr: |
+ sum by (cluster, verb, scope) (increase(apiserver_request_duration_seconds_count[1h]))
+ record: cluster_verb_scope:apiserver_request_duration_seconds_count:increase1h
+ - expr: |
+ sum by (cluster, verb, scope) (avg_over_time(cluster_verb_scope:apiserver_request_duration_seconds_count:increase1h[30d]) * 24 * 30)
+ record: cluster_verb_scope:apiserver_request_duration_seconds_count:increase30d
+ - expr: |
+ sum by (cluster, verb, scope, le) (increase(apiserver_request_duration_seconds_bucket[1h]))
+ record: cluster_verb_scope_le:apiserver_request_duration_seconds_bucket:increase1h
+ - expr: |
+ sum by (cluster, verb, scope, le) (avg_over_time(cluster_verb_scope_le:apiserver_request_duration_seconds_bucket:increase1h[30d]) * 24 * 30)
+ record: cluster_verb_scope_le:apiserver_request_duration_seconds_bucket:increase30d
- expr: |
1 - (
(
# write too slow
- sum by (cluster) (increase(apiserver_request_duration_seconds_count{verb=~"POST|PUT|PATCH|DELETE"}[30d]))
+ sum by (cluster) (cluster_verb_scope:apiserver_request_duration_seconds_count:increase30d{verb=~"POST|PUT|PATCH|DELETE"})
-
- sum by (cluster) (increase(apiserver_request_duration_seconds_bucket{verb=~"POST|PUT|PATCH|DELETE",le="1"}[30d]))
+ sum by (cluster) (cluster_verb_scope_le:apiserver_request_duration_seconds_bucket:increase30d{verb=~"POST|PUT|PATCH|DELETE",le="1"})
) +
(
# read too slow
- sum by (cluster) (increase(apiserver_request_duration_seconds_count{verb=~"LIST|GET"}[30d]))
+ sum by (cluster) (cluster_verb_scope:apiserver_request_duration_seconds_count:increase30d{verb=~"LIST|GET"})
-
(
(
- sum by (cluster) (increase(apiserver_request_duration_seconds_bucket{verb=~"LIST|GET",scope=~"resource|",le="1"}[30d]))
+ sum by (cluster) (cluster_verb_scope_le:apiserver_request_duration_seconds_bucket:increase30d{verb=~"LIST|GET",scope=~"resource|",le="1"})
or
vector(0)
)
+
- sum by (cluster) (increase(apiserver_request_duration_seconds_bucket{verb=~"LIST|GET",scope="namespace",le="5"}[30d]))
+ sum by (cluster) (cluster_verb_scope_le:apiserver_request_duration_seconds_bucket:increase30d{verb=~"LIST|GET",scope="namespace",le="5"})
+
- sum by (cluster) (increase(apiserver_request_duration_seconds_bucket{verb=~"LIST|GET",scope="cluster",le="40"}[30d]))
+ sum by (cluster) (cluster_verb_scope_le:apiserver_request_duration_seconds_bucket:increase30d{verb=~"LIST|GET",scope="cluster",le="40"})
)
) +
# errors
@@ -1076,19 +1088,19 @@ spec:
record: apiserver_request:availability30d
- expr: |
1 - (
- sum by (cluster) (increase(apiserver_request_duration_seconds_count{job="apiserver",verb=~"LIST|GET"}[30d]))
+ sum by (cluster) (cluster_verb_scope:apiserver_request_duration_seconds_count:increase30d{verb=~"LIST|GET"})
-
(
# too slow
(
- sum by (cluster) (increase(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope=~"resource|",le="1"}[30d]))
+ sum by (cluster) (cluster_verb_scope_le:apiserver_request_duration_seconds_bucket:increase30d{verb=~"LIST|GET",scope=~"resource|",le="1"})
or
vector(0)
)
+
- sum by (cluster) (increase(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="namespace",le="5"}[30d]))
+ sum by (cluster) (cluster_verb_scope_le:apiserver_request_duration_seconds_bucket:increase30d{verb=~"LIST|GET",scope="namespace",le="5"})
+
- sum by (cluster) (increase(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="cluster",le="40"}[30d]))
+ sum by (cluster) (cluster_verb_scope_le:apiserver_request_duration_seconds_bucket:increase30d{verb=~"LIST|GET",scope="cluster",le="40"})
)
+
# errors
@@ -1103,9 +1115,9 @@ spec:
1 - (
(
# too slow
- sum by (cluster) (increase(apiserver_request_duration_seconds_count{verb=~"POST|PUT|PATCH|DELETE"}[30d]))
+ sum by (cluster) (cluster_verb_scope:apiserver_request_duration_seconds_count:increase30d{verb=~"POST|PUT|PATCH|DELETE"})
-
- sum by (cluster) (increase(apiserver_request_duration_seconds_bucket{verb=~"POST|PUT|PATCH|DELETE",le="1"}[30d]))
+ sum by (cluster) (cluster_verb_scope_le:apiserver_request_duration_seconds_bucket:increase30d{verb=~"POST|PUT|PATCH|DELETE",le="1"})
)
+
# errors