Skip to content

Commit 673e352

Browse files
philipgoughprom-op-bot
philipgough
and
prom-op-bot
authored
[bot] [fix-action] Automated version update (#2695)
Co-authored-by: Prometheus Operator Bot <[email protected]>
1 parent d750109 commit 673e352

15 files changed

+570
-49
lines changed

‎jsonnetfile.lock.json‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"subdir": "contrib/mixin"
1919
}
2020
},
21-
"version": "a756eaf122f7547a6255d21fa69705af0162a4b0",
21+
"version": "aebb3752ae6ac26eb43e657b54eafd8d3ff00d9a",
2222
"sum": "XmXkOCriQIZmXwlIIFhqlJMa0e6qGWdxZD+ZDYaN0Po="
2323
},
2424
{
@@ -28,8 +28,8 @@
2828
"subdir": "grafana-mixin"
2929
}
3030
},
31-
"version": "1120f9e255760a3c104b57871fcb91801e934382",
32-
"sum": "MkjR7zCgq6MUZgjDzop574tFKoTX2OBr7DTwm1K+Ofs="
31+
"version": "0a44e27aab911fcc9bef5c456fadaadab9c8d619",
32+
"sum": "S8mRTRH4w62kMCa2je3iCtvscYrwQmkyJ7Y/aM14KbE="
3333
},
3434
{
3535
"source": {
@@ -78,7 +78,7 @@
7878
"subdir": "grafana-builder"
7979
}
8080
},
81-
"version": "aa5c0d4beb76035fdf999488e180462f08e617c9",
81+
"version": "1cd23af7f31e8ee2f4e6abe16b466c7bfc0ce82a",
8282
"sum": "G7B6E5sqWirDbMWRhifbLRfGgRFbIh9WCYa6X3kMh6g="
8383
},
8484
{
@@ -88,8 +88,8 @@
8888
"subdir": "mixin-utils"
8989
}
9090
},
91-
"version": "aa5c0d4beb76035fdf999488e180462f08e617c9",
92-
"sum": "iu4NT+YOgpxQnxElKML76cSxgTA0cwTmFfI0hOfHHmw="
91+
"version": "1cd23af7f31e8ee2f4e6abe16b466c7bfc0ce82a",
92+
"sum": "VAik6Sh5MD5H1Km1gSIXG4rwQ4m4zyw7odP5TKu3bGo="
9393
},
9494
{
9595
"source": {
@@ -118,8 +118,8 @@
118118
"subdir": ""
119119
}
120120
},
121-
"version": "4d54801b16abe46a3c7bb4c1d2422fe8cc83b032",
122-
"sum": "Cgb/s1ZhEEQPj3qHyucV27vU5o3RFXZN4acHBnM+7/I="
121+
"version": "02b7ba4c005e5c5b4ba25f95ddc8272b489da6cf",
122+
"sum": "Iw3dxtrJJSCpzff/OpVyXSAd3vzoPCiE7/fjP/4nAQ4="
123123
},
124124
{
125125
"source": {
@@ -128,7 +128,7 @@
128128
"subdir": "jsonnet/kube-state-metrics"
129129
}
130130
},
131-
"version": "84e2d8fe697053c185c0ce17f0e22c151d071a46",
131+
"version": "f421b9a69a08f3009b959c81f08749176996998a",
132132
"sum": "3bioG7CfTfY9zeu5xU4yon6Zt3kYvNkyl492nOhQxnM="
133133
},
134134
{
@@ -138,7 +138,7 @@
138138
"subdir": "jsonnet/kube-state-metrics-mixin"
139139
}
140140
},
141-
"version": "84e2d8fe697053c185c0ce17f0e22c151d071a46",
141+
"version": "f421b9a69a08f3009b959c81f08749176996998a",
142142
"sum": "qclI7LwucTjBef3PkGBkKxF0mfZPbHnn4rlNWKGtR4c="
143143
},
144144
{
@@ -148,7 +148,7 @@
148148
"subdir": "jsonnet/mixin"
149149
}
150150
},
151-
"version": "8af9ceaf5f99a2be18bd7b690fa79dc18c18aa04",
151+
"version": "baf40889d1bb7d7703c63ee5cbc9fdb218392949",
152152
"sum": "gi+knjdxs2T715iIQIntrimbHRgHnpM8IFBJDD1gYfs=",
153153
"name": "prometheus-operator-mixin"
154154
},
@@ -159,8 +159,8 @@
159159
"subdir": "jsonnet/prometheus-operator"
160160
}
161161
},
162-
"version": "8af9ceaf5f99a2be18bd7b690fa79dc18c18aa04",
163-
"sum": "dtH2oiXvUttHg2fz6uITHKuZflkQ832ddkdnhVu0drY="
162+
"version": "baf40889d1bb7d7703c63ee5cbc9fdb218392949",
163+
"sum": "ikNhDwJwp2YNd5JPZWL6nkgZ3pzQIYfk3uxO3yQQqg4="
164164
},
165165
{
166166
"source": {
@@ -169,7 +169,7 @@
169169
"subdir": "doc/alertmanager-mixin"
170170
}
171171
},
172-
"version": "0ce3cfb962db3cbb1649d3e816a49a13c4036cd1",
172+
"version": "4534c9ac53d6bf502c27bc8fdd24341e9d4f2ba8",
173173
"sum": "j5prvRrJdoCv7n45l5Uy2ghl1IDb9BBUqjwCDs4ZJoQ=",
174174
"name": "alertmanager"
175175
},
@@ -180,7 +180,7 @@
180180
"subdir": "docs/node-mixin"
181181
}
182182
},
183-
"version": "2a2f16cd28d3ef57e4a9e1c2babca1fcf9c4eed6",
183+
"version": "581a9090e409d17ee3757e15225b00e7abc3eccf",
184184
"sum": "NcpQ0Hz0qciUqmOYoAR0X8GUK5pH/QiUXm1aDNgvua0="
185185
},
186186
{
@@ -190,8 +190,8 @@
190190
"subdir": "documentation/prometheus-mixin"
191191
}
192192
},
193-
"version": "40a27ce87591487239d07e5f47010f114ee5bea2",
194-
"sum": "2c+wttfee9TwuQJZIkNV7Tekem74Qgc7iZ842P28rNw=",
193+
"version": "19a8f8c8ea71cb9d700eba49955db71bc868555b",
194+
"sum": "1+e8HismURh2GEbJPRIxI30M1nsrIuIh0TRUhwylqf4=",
195195
"name": "prometheus"
196196
},
197197
{
@@ -201,7 +201,7 @@
201201
"subdir": "jsonnet/controller-gen"
202202
}
203203
},
204-
"version": "1ed2f3301251455dee757da1658c88fd32e0f1ca",
204+
"version": "e1f5afaac998a158554457b4400731b7ef65be34",
205205
"sum": "O3c9Uurei8MWAY0Ad7DOL1fMqSgdHyHB7MpHsxSITKM=",
206206
"name": "pyrra"
207207
},
@@ -212,7 +212,7 @@
212212
"subdir": "mixin"
213213
}
214214
},
215-
"version": "4ad45948cd1098000270dc52c8d2f5f077e02076",
215+
"version": "9073c8d0c5476a8a6bf8532e464e6e921ef1c8ea",
216216
"sum": "ieCD4eMgGbOlrI8GmckGPHBGQDcLasE1rULYq56W/bs=",
217217
"name": "thanos-mixin"
218218
},

‎manifests/grafana-dashboardDefinitions.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3158,7 +3158,6 @@ items:
31583158
}
31593159
],
31603160
"schemaVersion": 30,
3161-
"style": "dark",
31623161
"tags": [
31633162

31643163
],
@@ -22245,7 +22244,7 @@ items:
2224522244
}
2224622245
},
2224722246
"min": 0,
22248-
"unit": "ms"
22247+
"unit": "short"
2224922248
}
2225022249
},
2225122250
"gridPos": {
@@ -22663,7 +22662,8 @@ items:
2266322662
]
2266422663
},
2266522664
"timezone": "utc",
22666-
"title": "Prometheus / Overview"
22665+
"title": "Prometheus / Overview",
22666+
"uid": "9fa0d141-d019-4ad7-8bc5-42196ee308bd"
2266722667
}
2266822668
kind: ConfigMap
2266922669
metadata:

‎manifests/grafana-prometheusRule.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ spec:
1919
message: '{{ $labels.namespace }}/{{ $labels.job }}/{{ $labels.handler }} is experiencing {{ $value | humanize }}% errors'
2020
runbook_url: https://runbooks.prometheus-operator.dev/runbooks/grafana/grafanarequestsfailing
2121
expr: |
22-
100 * namespace_job_handler_statuscode:grafana_http_request_duration_seconds_count:rate5m{handler!~"/api/datasources/proxy/:id.*|/api/ds/query|/api/tsdb/query", status_code=~"5.."}
23-
/ ignoring (status_code)
22+
100 * sum without (status_code) (namespace_job_handler_statuscode:grafana_http_request_duration_seconds_count:rate5m{handler!~"/api/datasources/proxy/:id.*|/api/ds/query|/api/tsdb/query", status_code=~"5.."})
23+
/
2424
sum without (status_code) (namespace_job_handler_statuscode:grafana_http_request_duration_seconds_count:rate5m{handler!~"/api/datasources/proxy/:id.*|/api/ds/query|/api/tsdb/query"})
2525
> 50
2626
for: 5m

‎manifests/kubernetesControlPlane-prometheusRule.yaml‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -122,13 +122,13 @@ spec:
122122
unless
123123
kube_statefulset_status_update_revision{job="kube-state-metrics"}
124124
)
125-
*
125+
* on(namespace, statefulset, job, cluster)
126126
(
127127
kube_statefulset_replicas{job="kube-state-metrics"}
128128
!=
129129
kube_statefulset_status_replicas_updated{job="kube-state-metrics"}
130130
)
131-
) and (
131+
) and on(namespace, statefulset, job, cluster) (
132132
changes(kube_statefulset_status_replicas_updated{job="kube-state-metrics"}[5m])
133133
==
134134
0
@@ -1550,18 +1550,15 @@ spec:
15501550
record: cluster:node_cpu:ratio_rate5m
15511551
- name: kubelet.rules
15521552
rules:
1553-
- expr: |
1554-
histogram_quantile(0.99, sum(rate(kubelet_pleg_relist_duration_seconds_bucket{job="kubelet", metrics_path="/metrics"}[5m])) by (cluster, instance, le) * on(cluster, instance) group_left(node) kubelet_node_name{job="kubelet", metrics_path="/metrics"})
1553+
- expr: "histogram_quantile(\n 0.99, \n sum(rate(kubelet_pleg_relist_duration_seconds_bucket{job=\"kubelet\", metrics_path=\"/metrics\"}[5m])) by (cluster, instance, le) \n * on(cluster, instance) group_left (node) \n max by (cluster, instance, node) (kubelet_node_name{job=\"kubelet\", metrics_path=\"/metrics\"})\n)\n"
15551554
labels:
15561555
quantile: "0.99"
15571556
record: node_quantile:kubelet_pleg_relist_duration_seconds:histogram_quantile
1558-
- expr: |
1559-
histogram_quantile(0.9, sum(rate(kubelet_pleg_relist_duration_seconds_bucket{job="kubelet", metrics_path="/metrics"}[5m])) by (cluster, instance, le) * on(cluster, instance) group_left(node) kubelet_node_name{job="kubelet", metrics_path="/metrics"})
1557+
- expr: "histogram_quantile(\n 0.9, \n sum(rate(kubelet_pleg_relist_duration_seconds_bucket{job=\"kubelet\", metrics_path=\"/metrics\"}[5m])) by (cluster, instance, le) \n * on(cluster, instance) group_left (node) \n max by (cluster, instance, node) (kubelet_node_name{job=\"kubelet\", metrics_path=\"/metrics\"})\n)\n"
15601558
labels:
15611559
quantile: "0.9"
15621560
record: node_quantile:kubelet_pleg_relist_duration_seconds:histogram_quantile
1563-
- expr: |
1564-
histogram_quantile(0.5, sum(rate(kubelet_pleg_relist_duration_seconds_bucket{job="kubelet", metrics_path="/metrics"}[5m])) by (cluster, instance, le) * on(cluster, instance) group_left(node) kubelet_node_name{job="kubelet", metrics_path="/metrics"})
1561+
- expr: "histogram_quantile(\n 0.5, \n sum(rate(kubelet_pleg_relist_duration_seconds_bucket{job=\"kubelet\", metrics_path=\"/metrics\"}[5m])) by (cluster, instance, le) \n * on(cluster, instance) group_left (node) \n max by (cluster, instance, node) (kubelet_node_name{job=\"kubelet\", metrics_path=\"/metrics\"})\n)\n"
15651562
labels:
15661563
quantile: "0.5"
15671564
record: node_quantile:kubelet_pleg_relist_duration_seconds:histogram_quantile

‎manifests/prometheusOperator-clusterRole.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ rules:
2626
- thanosrulers/status
2727
- scrapeconfigs
2828
- servicemonitors
29+
- servicemonitors/status
2930
- podmonitors
3031
- probes
3132
- prometheusrules

‎manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
33
metadata:
44
annotations:
55
controller-gen.kubebuilder.io/version: v0.18.0
6-
operator.prometheus.io/version: 0.83.0
6+
operator.prometheus.io/version: 0.84.0
77
name: alertmanagerconfigs.monitoring.coreos.com
88
spec:
99
group: monitoring.coreos.com

0 commit comments

Comments
 (0)