Skip to content

Commit 151032c

Browse files
paulfantompaulfantom
authored
Merge pull request #1469 from paulfantom/update-crd-fix
2 parents ba8ec69 + 89e81dd commit 151032c

6 files changed

+3398
-493
lines changed

‎jsonnetfile.lock.json‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"subdir": "contrib/mixin"
1919
}
2020
},
21-
"version": "02cdd195396ad2a81ce6001c8f15615968ba9efb",
21+
"version": "6656181d312a9e780551f083c67a6fafb4c44fc6",
2222
"sum": "cdKL5kPYfpWSpTCu4qctmh+gWQqL+4YWom6rw9qLYJU="
2323
},
2424
{
@@ -38,7 +38,7 @@
3838
"subdir": "grafana-builder"
3939
}
4040
},
41-
"version": "17eca514f990530c411c2e9411af5213dd4bd224",
41+
"version": "460ba73ba5c736f2e60c023f4e0de556eaa4574c",
4242
"sum": "U34Nd1ViO2LZ3D8IzygPPRfUcy6zOgCnTMVHZ+9O/QE="
4343
},
4444
{
@@ -48,8 +48,8 @@
4848
"subdir": ""
4949
}
5050
},
51-
"version": "8dc2c0d69f762d943c5bfbdcc17645e346d610ca",
52-
"sum": "TamniMXp0Jy6E5OMOYtcrTJ1P+rFTVNuiOZSkxvckb8="
51+
"version": "99b12873277982d0cba9d0a469fd1ec398e0b31d",
52+
"sum": "eSDcNtvl1iINgaEy41KC75ZOOZh47JEzIfFqfP8MJBM="
5353
},
5454
{
5555
"source": {
@@ -58,7 +58,7 @@
5858
"subdir": "lib/promgrafonnet"
5959
}
6060
},
61-
"version": "8dc2c0d69f762d943c5bfbdcc17645e346d610ca",
61+
"version": "99b12873277982d0cba9d0a469fd1ec398e0b31d",
6262
"sum": "zv7hXGui6BfHzE9wPatHI/AGZa4A2WKo6pq7ZdqBsps="
6363
},
6464
{
@@ -68,7 +68,7 @@
6868
"subdir": "jsonnet/kube-state-metrics"
6969
}
7070
},
71-
"version": "25066f254b11143486272cb7bb5956e8b3a2a61b",
71+
"version": "e2328cf5f0e1d1acde5f2bd9b9dfae8a13599755",
7272
"sum": "U1wzIpTAtOvC1yj43Y8PfvT0JfvnAcMfNH12Wi+ab0Y="
7373
},
7474
{
@@ -78,7 +78,7 @@
7878
"subdir": "jsonnet/kube-state-metrics-mixin"
7979
}
8080
},
81-
"version": "25066f254b11143486272cb7bb5956e8b3a2a61b",
81+
"version": "e2328cf5f0e1d1acde5f2bd9b9dfae8a13599755",
8282
"sum": "u8gaydJoxEjzizQ8jY8xSjYgWooPmxw+wIWdDxifMAk="
8383
},
8484
{
@@ -88,7 +88,7 @@
8888
"subdir": "jsonnet/mixin"
8989
}
9090
},
91-
"version": "f710e9d66a09efdb8edc144af555718b7d7ed2e3",
91+
"version": "9221f58e65f3ba17838a0e54883763791633d94c",
9292
"sum": "qZ4WgiweaE6eeKtFK60QUjLO8sf2L9Q8fgafWvDcyfY=",
9393
"name": "prometheus-operator-mixin"
9494
},
@@ -99,8 +99,8 @@
9999
"subdir": "jsonnet/prometheus-operator"
100100
}
101101
},
102-
"version": "f710e9d66a09efdb8edc144af555718b7d7ed2e3",
103-
"sum": "4e3A/CccaxvLdWFPKJlC/P9RbPhSX6cH/Nj8+N1DBzg="
102+
"version": "9221f58e65f3ba17838a0e54883763791633d94c",
103+
"sum": "IQmnLho9ATHbLNJg9UoHHAlYdkiIZu2uHsJo6Q7E/1I="
104104
},
105105
{
106106
"source": {
@@ -109,7 +109,7 @@
109109
"subdir": "doc/alertmanager-mixin"
110110
}
111111
},
112-
"version": "1b8afe7cb5aafe59442e35979ec57401145ea26b",
112+
"version": "992cea60078d65a2509a6f806ccdb84f7d0645b0",
113113
"sum": "pep+dHzfIjh2SU5pEkwilMCAT/NoL6YYflV4x8cr7vU=",
114114
"name": "alertmanager"
115115
},
@@ -120,8 +120,8 @@
120120
"subdir": "docs/node-mixin"
121121
}
122122
},
123-
"version": "fbc23548b9ec9efc509f5957773e6fe383202aa6",
124-
"sum": "7EybLA+57k2P4GclrYjPWZU+lZzxYhXN0NAxNPfO8/c="
123+
"version": "2a282668522b2dcbd38e0aa9c55693a89e22e610",
124+
"sum": "YSzs6XU+0JsGZQLnQ4+jIr2EfLGCPFBQc2loru2wJCw="
125125
},
126126
{
127127
"source": {
@@ -130,8 +130,8 @@
130130
"subdir": "documentation/prometheus-mixin"
131131
}
132132
},
133-
"version": "a6e6011d55ed913cb8e53968cead9a6a6fd84911",
134-
"sum": "m4VHwft4fUcxzL4+52lLZG/V5aH5ZEdjaweb88vISL0=",
133+
"version": "64d9b419980479536b237244d87e4d9c5cc816cf",
134+
"sum": "n5Zdr/7YeRb8Y9FsXnul5K+hprHOzuSXsYdkapEhPts=",
135135
"name": "prometheus"
136136
},
137137
{
@@ -141,7 +141,7 @@
141141
"subdir": "mixin"
142142
}
143143
},
144-
"version": "18049504408c5ae09deb76961b92baf7f96b0e93",
144+
"version": "2695ecd69c4464914ad4b4480b5e924ebfcd919d",
145145
"sum": "Og+wEHfgzXBvBLAeeQvGNoiCw3FY4LQHlJdpsG/owj8=",
146146
"name": "thanos-mixin"
147147
},

‎manifests/kubernetes-prometheusRule.yaml‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,9 @@ spec:
168168
severity: warning
169169
- alert: KubeContainerWaiting
170170
annotations:
171-
description: Pod {{ $labels.namespace }}/{{ $labels.pod }} container {{ $labels.container}}
172-
has been in waiting state for longer than 1 hour.
171+
description: pod/{{ $labels.pod }} in namespace {{ $labels.namespace }} on
172+
container {{ $labels.container}} has been in waiting state for longer than
173+
1 hour.
173174
runbook_url: https://runbooks.prometheus-operator.dev/runbooks/kubernetes/kubecontainerwaiting
174175
summary: Pod container waiting longer than 1 hour
175176
expr: |
@@ -776,7 +777,7 @@ spec:
776777
+
777778
sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="namespace",le="5"}[1d]))
778779
+
779-
sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="cluster",le="40"}[1d]))
780+
sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="cluster",le="30"}[1d]))
780781
)
781782
)
782783
+
@@ -803,7 +804,7 @@ spec:
803804
+
804805
sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="namespace",le="5"}[1h]))
805806
+
806-
sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="cluster",le="40"}[1h]))
807+
sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="cluster",le="30"}[1h]))
807808
)
808809
)
809810
+
@@ -830,7 +831,7 @@ spec:
830831
+
831832
sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="namespace",le="5"}[2h]))
832833
+
833-
sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="cluster",le="40"}[2h]))
834+
sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="cluster",le="30"}[2h]))
834835
)
835836
)
836837
+
@@ -857,7 +858,7 @@ spec:
857858
+
858859
sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="namespace",le="5"}[30m]))
859860
+
860-
sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="cluster",le="40"}[30m]))
861+
sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="cluster",le="30"}[30m]))
861862
)
862863
)
863864
+
@@ -884,7 +885,7 @@ spec:
884885
+
885886
sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="namespace",le="5"}[3d]))
886887
+
887-
sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="cluster",le="40"}[3d]))
888+
sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="cluster",le="30"}[3d]))
888889
)
889890
)
890891
+
@@ -911,7 +912,7 @@ spec:
911912
+
912913
sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="namespace",le="5"}[5m]))
913914
+
914-
sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="cluster",le="40"}[5m]))
915+
sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="cluster",le="30"}[5m]))
915916
)
916917
)
917918
+
@@ -938,7 +939,7 @@ spec:
938939
+
939940
sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="namespace",le="5"}[6h]))
940941
+
941-
sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="cluster",le="40"}[6h]))
942+
sum by (cluster) (rate(apiserver_request_duration_seconds_bucket{job="apiserver",verb=~"LIST|GET",scope="cluster",le="30"}[6h]))
942943
)
943944
)
944945
+
@@ -1140,7 +1141,7 @@ spec:
11401141
+
11411142
sum by (cluster) (cluster_verb_scope_le:apiserver_request_duration_seconds_bucket:increase30d{verb=~"LIST|GET",scope="namespace",le="5"})
11421143
+
1143-
sum by (cluster) (cluster_verb_scope_le:apiserver_request_duration_seconds_bucket:increase30d{verb=~"LIST|GET",scope="cluster",le="40"})
1144+
sum by (cluster) (cluster_verb_scope_le:apiserver_request_duration_seconds_bucket:increase30d{verb=~"LIST|GET",scope="cluster",le="30"})
11441145
)
11451146
) +
11461147
# errors
@@ -1165,7 +1166,7 @@ spec:
11651166
+
11661167
sum by (cluster) (cluster_verb_scope_le:apiserver_request_duration_seconds_bucket:increase30d{verb=~"LIST|GET",scope="namespace",le="5"})
11671168
+
1168-
sum by (cluster) (cluster_verb_scope_le:apiserver_request_duration_seconds_bucket:increase30d{verb=~"LIST|GET",scope="cluster",le="40"})
1169+
sum by (cluster) (cluster_verb_scope_le:apiserver_request_duration_seconds_bucket:increase30d{verb=~"LIST|GET",scope="cluster",le="30"})
11691170
)
11701171
+
11711172
# errors

0 commit comments

Comments
 (0)