Skip to content

Commit 2230254

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #1643 from rhobs/automated-updates-master-update-generate
Bug 2074807: [bot] Update jsonnet dependencies
2 parents 7e3ec6b + ae54601 commit 2230254

10 files changed

+163
-27
lines changed

‎assets/control-plane/prometheus-rule.yaml

+45
Original file line numberDiff line numberDiff line change
@@ -370,6 +370,51 @@ spec:
370370
for: 1h
371371
labels:
372372
severity: warning
373+
- alert: KubePersistentVolumeInodesFillingUp
374+
annotations:
375+
description: The PersistentVolume claimed by {{ $labels.persistentvolumeclaim
376+
}} in Namespace {{ $labels.namespace }} only has {{ $value | humanizePercentage
377+
}} free inodes.
378+
summary: PersistentVolumeInodes are filling up.
379+
expr: |
380+
(
381+
kubelet_volume_stats_inodes_free{namespace=~"(openshift-.*|kube-.*|default)",job="kubelet", metrics_path="/metrics"}
382+
/
383+
kubelet_volume_stats_inodes{namespace=~"(openshift-.*|kube-.*|default)",job="kubelet", metrics_path="/metrics"}
384+
) < 0.03
385+
and
386+
kubelet_volume_stats_inodes_used{namespace=~"(openshift-.*|kube-.*|default)",job="kubelet", metrics_path="/metrics"} > 0
387+
unless on(namespace, persistentvolumeclaim)
388+
kube_persistentvolumeclaim_access_mode{namespace=~"(openshift-.*|kube-.*|default)", access_mode="ReadOnlyMany"} == 1
389+
unless on(namespace, persistentvolumeclaim)
390+
kube_persistentvolumeclaim_labels{namespace=~"(openshift-.*|kube-.*|default)",label_alerts_k8s_io_kube_persistent_volume_filling_up="disabled"} == 1
391+
for: 1m
392+
labels:
393+
severity: critical
394+
- alert: KubePersistentVolumeInodesFillingUp
395+
annotations:
396+
description: Based on recent sampling, the PersistentVolume claimed by {{
397+
$labels.persistentvolumeclaim }} in Namespace {{ $labels.namespace }} is
398+
expected to run out of inodes within four days. Currently {{ $value | humanizePercentage
399+
}} of its inodes are free.
400+
summary: PersistentVolumeInodes are filling up.
401+
expr: |
402+
(
403+
kubelet_volume_stats_inodes_free{namespace=~"(openshift-.*|kube-.*|default)",job="kubelet", metrics_path="/metrics"}
404+
/
405+
kubelet_volume_stats_inodes{namespace=~"(openshift-.*|kube-.*|default)",job="kubelet", metrics_path="/metrics"}
406+
) < 0.15
407+
and
408+
kubelet_volume_stats_inodes_used{namespace=~"(openshift-.*|kube-.*|default)",job="kubelet", metrics_path="/metrics"} > 0
409+
and
410+
predict_linear(kubelet_volume_stats_inodes_free{namespace=~"(openshift-.*|kube-.*|default)",job="kubelet", metrics_path="/metrics"}[6h], 4 * 24 * 3600) < 0
411+
unless on(namespace, persistentvolumeclaim)
412+
kube_persistentvolumeclaim_access_mode{namespace=~"(openshift-.*|kube-.*|default)", access_mode="ReadOnlyMany"} == 1
413+
unless on(namespace, persistentvolumeclaim)
414+
kube_persistentvolumeclaim_labels{namespace=~"(openshift-.*|kube-.*|default)",label_alerts_k8s_io_kube_persistent_volume_filling_up="disabled"} == 1
415+
for: 1h
416+
labels:
417+
severity: warning
373418
- alert: KubePersistentVolumeErrors
374419
annotations:
375420
description: The persistent volume {{ $labels.persistentvolume }} has status

‎assets/node-exporter/prometheus-rule.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ spec:
2323
summary: Filesystem is predicted to run out of space within the next 24 hours.
2424
expr: |
2525
(
26-
node_filesystem_avail_bytes{job="node-exporter",fstype!=""} / node_filesystem_size_bytes{job="node-exporter",fstype!=""} * 100 < 20
26+
node_filesystem_avail_bytes{job="node-exporter",fstype!=""} / node_filesystem_size_bytes{job="node-exporter",fstype!=""} * 100 < 15
2727
and
2828
predict_linear(node_filesystem_avail_bytes{job="node-exporter",fstype!=""}[6h], 24*60*60) < 0
2929
and
@@ -41,7 +41,7 @@ spec:
4141
summary: Filesystem is predicted to run out of space within the next 4 hours.
4242
expr: |
4343
(
44-
node_filesystem_avail_bytes{job="node-exporter",fstype!=""} / node_filesystem_size_bytes{job="node-exporter",fstype!=""} * 100 < 15
44+
node_filesystem_avail_bytes{job="node-exporter",fstype!=""} / node_filesystem_size_bytes{job="node-exporter",fstype!=""} * 100 < 10
4545
and
4646
predict_linear(node_filesystem_avail_bytes{job="node-exporter",fstype!=""}[6h], 4*60*60) < 0
4747
and

‎assets/prometheus-operator-user-workload/cluster-role.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ rules:
1616
- alertmanagerconfigs
1717
- prometheuses
1818
- prometheuses/finalizers
19+
- prometheuses/status
1920
- thanosrulers
2021
- thanosrulers/finalizers
2122
- servicemonitors

‎assets/prometheus-operator/cluster-role.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ rules:
1616
- alertmanagerconfigs
1717
- prometheuses
1818
- prometheuses/finalizers
19+
- prometheuses/status
1920
- thanosrulers
2021
- thanosrulers/finalizers
2122
- servicemonitors

‎jsonnet/jsonnetfile.lock.json

+16-16
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"subdir": "contrib/mixin"
1919
}
2020
},
21-
"version": "ad03f2076ad418dcbf4b6976665819448b182f49",
21+
"version": "81491914fbfbfcc041e175beb20f2cf3f575557e",
2222
"sum": "zhLYhUNcXNkMRfJhMUX0UiOpi8TOuLmUqJfO9NFKFkg="
2323
},
2424
{
@@ -48,7 +48,7 @@
4848
"subdir": "grafana-builder"
4949
}
5050
},
51-
"version": "318a65120918fe8e298ffc8e63b9e941677ef321",
51+
"version": "28e90490f768aaf14d5bcb15ed2f6ab4e3efe725",
5252
"sum": "0KkygBQd/AFzUvVzezE4qF/uDYgrwUXVpZfINBti0oc="
5353
},
5454
{
@@ -69,8 +69,8 @@
6969
"subdir": ""
7070
}
7171
},
72-
"version": "468d4f2c12ac22f003fe9a3aa471c4984a83affe",
73-
"sum": "PXOEgevj6B66zgGVuOr161CKpjor6D2IRXhybWx5FKA="
72+
"version": "62ad10fe9ceb53c6b846871997abbfe8e0bd7cf5",
73+
"sum": "6gD9F29f8T2a71n35Y61P7TBiF5NQuhk4JUwEafsA1E="
7474
},
7575
{
7676
"source": {
@@ -79,7 +79,7 @@
7979
"subdir": "lib/promgrafonnet"
8080
}
8181
},
82-
"version": "468d4f2c12ac22f003fe9a3aa471c4984a83affe",
82+
"version": "62ad10fe9ceb53c6b846871997abbfe8e0bd7cf5",
8383
"sum": "zv7hXGui6BfHzE9wPatHI/AGZa4A2WKo6pq7ZdqBsps="
8484
},
8585
{
@@ -131,8 +131,8 @@
131131
"subdir": "jsonnet/kube-prometheus"
132132
}
133133
},
134-
"version": "0c0643f984fd102075323d5388ed852a12fb453c",
135-
"sum": "O6oOSZjCNAuk5SxzHbmgXrHImUzB1oPymFP2U4VuS2Y="
134+
"version": "bbdb94a23e97edbab113f8cb788071cf6a541e6d",
135+
"sum": "350sbhl/YOwB1oQYF3KLHapsqsVN93iIb8TnOn3wzsI="
136136
},
137137
{
138138
"source": {
@@ -141,7 +141,7 @@
141141
"subdir": "jsonnet/mixin"
142142
}
143143
},
144-
"version": "371192cdc95e4596c4f07591ff65104d8c85bad9",
144+
"version": "b0628d00ee84230c24560736060e1ca45e7fc429",
145145
"sum": "joc3gM74r0q658bmpfTbeAr0Nce4gTBv0rf3I+2J0rQ=",
146146
"name": "prometheus-operator-mixin"
147147
},
@@ -152,8 +152,8 @@
152152
"subdir": "jsonnet/prometheus-operator"
153153
}
154154
},
155-
"version": "371192cdc95e4596c4f07591ff65104d8c85bad9",
156-
"sum": "NqiD9mjw2dbS/xXSv5q+JAxU4v+YtQDnwpkSqNFD/pQ="
155+
"version": "b0628d00ee84230c24560736060e1ca45e7fc429",
156+
"sum": "mYU7yZz9AkpjVw+YrqebZOx+WON1jJZewVtVoUTXsx0="
157157
},
158158
{
159159
"source": {
@@ -162,7 +162,7 @@
162162
"subdir": "doc/alertmanager-mixin"
163163
}
164164
},
165-
"version": "032e0cf60f9c5f4ee4b241e8ca13b04c28117496",
165+
"version": "71d61c9c9149420209c973014e0d6c981b183611",
166166
"sum": "iqF63VWQovIGBb7JI5oVVgMShz0dKptSzEVQQjsy+Jo=",
167167
"name": "alertmanager"
168168
},
@@ -173,8 +173,8 @@
173173
"subdir": "docs/node-mixin"
174174
}
175175
},
176-
"version": "b52bf958f8e2d4ed1624b8122d08af4d12da9322",
177-
"sum": "/SFdKggqBEmznyeGfpyEZl4rC69mMtLGEB9lG1mQhVA="
176+
"version": "3d9ee5d9cc4545c7aaccc0f282f59478fe128ed1",
177+
"sum": "fNanwWpnovE/ok6i7zlwd1mwOPbglp19edJdOLgTDnU="
178178
},
179179
{
180180
"source": {
@@ -183,7 +183,7 @@
183183
"subdir": "documentation/prometheus-mixin"
184184
}
185185
},
186-
"version": "1c1b174a8e98f5a97ba782b50f4eb9a09d3f9a8e",
186+
"version": "4deb1a90d2f1300bb92938aa3c5949fffc7b7ce4",
187187
"sum": "APXOIP3B3dZ3Tyh7L2UhyWR8Vbf5+9adTLz/ya7n6uU=",
188188
"name": "prometheus"
189189
},
@@ -194,7 +194,7 @@
194194
"subdir": "config/crd/bases"
195195
}
196196
},
197-
"version": "78b040462bc89e2b907649cd3e609867191857ca",
197+
"version": "ac027a4a3dd7526a3afe80fc7e48cfec62436d81",
198198
"sum": "GQ0GFKGdIWKx1b78VRs6jtC4SMqkBjT5jl65QUjPKK4="
199199
},
200200
{
@@ -214,7 +214,7 @@
214214
"subdir": "mixin"
215215
}
216216
},
217-
"version": "58ffc8f4280bb1d7e132ec801ee47d8f2b9c67f4",
217+
"version": "81218afa5b01d44d20db8be599c88127e2cdf646",
218218
"sum": "dBm9ML50quhu6dwTIgfNmVruMqfaUeQVCO/6EKtQLxE="
219219
}
220220
],

‎manifests/0000_50_cluster-monitoring-operator_00_0podmonitor-custom-resource-definition.yaml

+6-2
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,9 @@ spec:
185185
the timestamps present in scraped data.
186186
type: boolean
187187
interval:
188-
description: Interval at which metrics should be scraped
188+
description: Interval at which metrics should be scraped If
189+
not specified Prometheus' global scrape interval is used.
190+
pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
189191
type: string
190192
metricRelabelings:
191193
description: MetricRelabelConfigs to apply to samples before
@@ -414,7 +416,9 @@ spec:
414416
description: HTTP scheme to use for scraping.
415417
type: string
416418
scrapeTimeout:
417-
description: Timeout after which the scrape is ended
419+
description: Timeout after which the scrape is ended If not
420+
specified, the Prometheus global scrape interval is used.
421+
pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
418422
type: string
419423
targetPort:
420424
anyOf:

‎manifests/0000_50_cluster-monitoring-operator_00_0probe-custom-resource-definition.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ spec:
134134
interval:
135135
description: Interval at which targets are probed using the configured
136136
prober. If not specified Prometheus' global scrape interval is used.
137+
pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
137138
type: string
138139
jobName:
139140
description: The job name assigned to scraped metrics by default.
@@ -324,6 +325,8 @@ spec:
324325
type: integer
325326
scrapeTimeout:
326327
description: Timeout for scraping metrics from the Prometheus exporter.
328+
If not specified, the Prometheus global scrape interval is used.
329+
pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
327330
type: string
328331
targetLimit:
329332
description: TargetLimit defines a limit on the number of scraped

0 commit comments

Comments
 (0)