Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug 2074807: [bot] Update jsonnet dependencies #1643

Merged
merged 1 commit into from
Apr 21, 2022
Merged

Bug 2074807: [bot] Update jsonnet dependencies #1643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 45 additions & 0 deletions assets/control-plane/prometheus-rule.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,6 +370,51 @@ spec:
for: 1h
labels:
severity: warning
- alert: KubePersistentVolumeInodesFillingUp
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should update runbook to include the new crirical alerts.

annotations:
description: The PersistentVolume claimed by {{ $labels.persistentvolumeclaim
}} in Namespace {{ $labels.namespace }} only has {{ $value | humanizePercentage
}} free inodes.
summary: PersistentVolumeInodes are filling up.
expr: |
(
kubelet_volume_stats_inodes_free{namespace=~"(openshift-.*|kube-.*|default)",job="kubelet", metrics_path="/metrics"}
/
kubelet_volume_stats_inodes{namespace=~"(openshift-.*|kube-.*|default)",job="kubelet", metrics_path="/metrics"}
) < 0.03
and
kubelet_volume_stats_inodes_used{namespace=~"(openshift-.*|kube-.*|default)",job="kubelet", metrics_path="/metrics"} > 0
unless on(namespace, persistentvolumeclaim)
kube_persistentvolumeclaim_access_mode{namespace=~"(openshift-.*|kube-.*|default)", access_mode="ReadOnlyMany"} == 1
unless on(namespace, persistentvolumeclaim)
kube_persistentvolumeclaim_labels{namespace=~"(openshift-.*|kube-.*|default)",label_alerts_k8s_io_kube_persistent_volume_filling_up="disabled"} == 1
for: 1m
labels:
severity: critical
- alert: KubePersistentVolumeInodesFillingUp
annotations:
description: Based on recent sampling, the PersistentVolume claimed by {{
$labels.persistentvolumeclaim }} in Namespace {{ $labels.namespace }} is
expected to run out of inodes within four days. Currently {{ $value | humanizePercentage
}} of its inodes are free.
summary: PersistentVolumeInodes are filling up.
expr: |
(
kubelet_volume_stats_inodes_free{namespace=~"(openshift-.*|kube-.*|default)",job="kubelet", metrics_path="/metrics"}
/
kubelet_volume_stats_inodes{namespace=~"(openshift-.*|kube-.*|default)",job="kubelet", metrics_path="/metrics"}
) < 0.15
and
kubelet_volume_stats_inodes_used{namespace=~"(openshift-.*|kube-.*|default)",job="kubelet", metrics_path="/metrics"} > 0
and
predict_linear(kubelet_volume_stats_inodes_free{namespace=~"(openshift-.*|kube-.*|default)",job="kubelet", metrics_path="/metrics"}[6h], 4 * 24 * 3600) < 0
unless on(namespace, persistentvolumeclaim)
kube_persistentvolumeclaim_access_mode{namespace=~"(openshift-.*|kube-.*|default)", access_mode="ReadOnlyMany"} == 1
unless on(namespace, persistentvolumeclaim)
kube_persistentvolumeclaim_labels{namespace=~"(openshift-.*|kube-.*|default)",label_alerts_k8s_io_kube_persistent_volume_filling_up="disabled"} == 1
for: 1h
labels:
severity: warning
- alert: KubePersistentVolumeErrors
annotations:
description: The persistent volume {{ $labels.persistentvolume }} has status
Expand Down
4 changes: 2 additions & 2 deletions assets/node-exporter/prometheus-rule.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ spec:
summary: Filesystem is predicted to run out of space within the next 24 hours.
expr: |
(
node_filesystem_avail_bytes{job="node-exporter",fstype!=""} / node_filesystem_size_bytes{job="node-exporter",fstype!=""} * 100 < 20
node_filesystem_avail_bytes{job="node-exporter",fstype!=""} / node_filesystem_size_bytes{job="node-exporter",fstype!=""} * 100 < 15
and
predict_linear(node_filesystem_avail_bytes{job="node-exporter",fstype!=""}[6h], 24*60*60) < 0
and
Expand All @@ -41,7 +41,7 @@ spec:
summary: Filesystem is predicted to run out of space within the next 4 hours.
expr: |
(
node_filesystem_avail_bytes{job="node-exporter",fstype!=""} / node_filesystem_size_bytes{job="node-exporter",fstype!=""} * 100 < 15
node_filesystem_avail_bytes{job="node-exporter",fstype!=""} / node_filesystem_size_bytes{job="node-exporter",fstype!=""} * 100 < 10
and
predict_linear(node_filesystem_avail_bytes{job="node-exporter",fstype!=""}[6h], 4*60*60) < 0
and
Expand Down
1 change: 1 addition & 0 deletions assets/prometheus-operator-user-workload/cluster-role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ rules:
- alertmanagerconfigs
- prometheuses
- prometheuses/finalizers
- prometheuses/status
- thanosrulers
- thanosrulers/finalizers
- servicemonitors
Expand Down
1 change: 1 addition & 0 deletions assets/prometheus-operator/cluster-role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ rules:
- alertmanagerconfigs
- prometheuses
- prometheuses/finalizers
- prometheuses/status
- thanosrulers
- thanosrulers/finalizers
- servicemonitors
Expand Down
32 changes: 16 additions & 16 deletions jsonnet/jsonnetfile.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"subdir": "contrib/mixin"
}
},
"version": "ad03f2076ad418dcbf4b6976665819448b182f49",
"version": "81491914fbfbfcc041e175beb20f2cf3f575557e",
"sum": "zhLYhUNcXNkMRfJhMUX0UiOpi8TOuLmUqJfO9NFKFkg="
},
{
Expand Down Expand Up @@ -48,7 +48,7 @@
"subdir": "grafana-builder"
}
},
"version": "318a65120918fe8e298ffc8e63b9e941677ef321",
"version": "28e90490f768aaf14d5bcb15ed2f6ab4e3efe725",
"sum": "0KkygBQd/AFzUvVzezE4qF/uDYgrwUXVpZfINBti0oc="
},
{
Expand All @@ -69,8 +69,8 @@
"subdir": ""
}
},
"version": "468d4f2c12ac22f003fe9a3aa471c4984a83affe",
"sum": "PXOEgevj6B66zgGVuOr161CKpjor6D2IRXhybWx5FKA="
"version": "62ad10fe9ceb53c6b846871997abbfe8e0bd7cf5",
"sum": "6gD9F29f8T2a71n35Y61P7TBiF5NQuhk4JUwEafsA1E="
},
{
"source": {
Expand All @@ -79,7 +79,7 @@
"subdir": "lib/promgrafonnet"
}
},
"version": "468d4f2c12ac22f003fe9a3aa471c4984a83affe",
"version": "62ad10fe9ceb53c6b846871997abbfe8e0bd7cf5",
"sum": "zv7hXGui6BfHzE9wPatHI/AGZa4A2WKo6pq7ZdqBsps="
},
{
Expand Down Expand Up @@ -131,8 +131,8 @@
"subdir": "jsonnet/kube-prometheus"
}
},
"version": "0c0643f984fd102075323d5388ed852a12fb453c",
"sum": "O6oOSZjCNAuk5SxzHbmgXrHImUzB1oPymFP2U4VuS2Y="
"version": "bbdb94a23e97edbab113f8cb788071cf6a541e6d",
"sum": "350sbhl/YOwB1oQYF3KLHapsqsVN93iIb8TnOn3wzsI="
},
{
"source": {
Expand All @@ -141,7 +141,7 @@
"subdir": "jsonnet/mixin"
}
},
"version": "371192cdc95e4596c4f07591ff65104d8c85bad9",
"version": "b0628d00ee84230c24560736060e1ca45e7fc429",
"sum": "joc3gM74r0q658bmpfTbeAr0Nce4gTBv0rf3I+2J0rQ=",
"name": "prometheus-operator-mixin"
},
Expand All @@ -152,8 +152,8 @@
"subdir": "jsonnet/prometheus-operator"
}
},
"version": "371192cdc95e4596c4f07591ff65104d8c85bad9",
"sum": "NqiD9mjw2dbS/xXSv5q+JAxU4v+YtQDnwpkSqNFD/pQ="
"version": "b0628d00ee84230c24560736060e1ca45e7fc429",
"sum": "mYU7yZz9AkpjVw+YrqebZOx+WON1jJZewVtVoUTXsx0="
},
{
"source": {
Expand All @@ -162,7 +162,7 @@
"subdir": "doc/alertmanager-mixin"
}
},
"version": "032e0cf60f9c5f4ee4b241e8ca13b04c28117496",
"version": "71d61c9c9149420209c973014e0d6c981b183611",
"sum": "iqF63VWQovIGBb7JI5oVVgMShz0dKptSzEVQQjsy+Jo=",
"name": "alertmanager"
},
Expand All @@ -173,8 +173,8 @@
"subdir": "docs/node-mixin"
}
},
"version": "b52bf958f8e2d4ed1624b8122d08af4d12da9322",
"sum": "/SFdKggqBEmznyeGfpyEZl4rC69mMtLGEB9lG1mQhVA="
"version": "3d9ee5d9cc4545c7aaccc0f282f59478fe128ed1",
"sum": "fNanwWpnovE/ok6i7zlwd1mwOPbglp19edJdOLgTDnU="
},
{
"source": {
Expand All @@ -183,7 +183,7 @@
"subdir": "documentation/prometheus-mixin"
}
},
"version": "1c1b174a8e98f5a97ba782b50f4eb9a09d3f9a8e",
"version": "4deb1a90d2f1300bb92938aa3c5949fffc7b7ce4",
"sum": "APXOIP3B3dZ3Tyh7L2UhyWR8Vbf5+9adTLz/ya7n6uU=",
"name": "prometheus"
},
Expand All @@ -194,7 +194,7 @@
"subdir": "config/crd/bases"
}
},
"version": "78b040462bc89e2b907649cd3e609867191857ca",
"version": "ac027a4a3dd7526a3afe80fc7e48cfec62436d81",
"sum": "GQ0GFKGdIWKx1b78VRs6jtC4SMqkBjT5jl65QUjPKK4="
},
{
Expand All @@ -214,7 +214,7 @@
"subdir": "mixin"
}
},
"version": "58ffc8f4280bb1d7e132ec801ee47d8f2b9c67f4",
"version": "81218afa5b01d44d20db8be599c88127e2cdf646",
"sum": "dBm9ML50quhu6dwTIgfNmVruMqfaUeQVCO/6EKtQLxE="
}
],
Expand Down
8 changes: 6 additions & 2 deletions manifests/0000_50_cluster-monitoring-operator_00_0podmonitor-custom-resource-definition.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,9 @@ spec:
the timestamps present in scraped data.
type: boolean
interval:
description: Interval at which metrics should be scraped
description: Interval at which metrics should be scraped If
not specified Prometheus' global scrape interval is used.
pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
type: string
metricRelabelings:
description: MetricRelabelConfigs to apply to samples before
Expand Down Expand Up @@ -414,7 +416,9 @@ spec:
description: HTTP scheme to use for scraping.
type: string
scrapeTimeout:
description: Timeout after which the scrape is ended
description: Timeout after which the scrape is ended If not
specified, the Prometheus global scrape interval is used.
pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
type: string
targetPort:
anyOf:
Expand Down
3 changes: 3 additions & 0 deletions manifests/0000_50_cluster-monitoring-operator_00_0probe-custom-resource-definition.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ spec:
interval:
description: Interval at which targets are probed using the configured
prober. If not specified Prometheus' global scrape interval is used.
pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
type: string
jobName:
description: The job name assigned to scraped metrics by default.
Expand Down Expand Up @@ -324,6 +325,8 @@ spec:
type: integer
scrapeTimeout:
description: Timeout for scraping metrics from the Prometheus exporter.
If not specified, the Prometheus global scrape interval is used.
pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
type: string
targetLimit:
description: TargetLimit defines a limit on the number of scraped
Expand Down
Loading