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

[bot] Update jsonnet dependencies #1647

Closed
wants to merge 1 commit into from
Closed

[bot] Update jsonnet dependencies #1647

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
16 changes: 8 additions & 8 deletions assets/control-plane/prometheus-rule.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ spec:
runbook_url: https://github.com/openshift/runbooks/blob/master/alerts/cluster-monitoring-operator/KubePodNotReady.md
summary: Pod has been in a non-ready state for more than 15 minutes.
expr: |
sum by (namespace, pod) (
max by(namespace, pod) (
sum by (namespace, pod, cluster) (
max by(namespace, pod, cluster) (
kube_pod_status_phase{namespace=~"(openshift-.*|kube-.*|default)",job="kube-state-metrics", phase=~"Pending|Unknown"}
) * on(namespace, pod) group_left(owner_kind) topk by(namespace, pod) (
1, max by(namespace, pod, owner_kind) (kube_pod_owner{owner_kind!="Job"})
) * on(namespace, pod, cluster) group_left(owner_kind) topk by(namespace, pod, cluster) (
1, max by(namespace, pod, owner_kind, cluster) (kube_pod_owner{owner_kind!="Job"})
)
) > 0
for: 15m
Expand Down Expand Up @@ -148,7 +148,7 @@ spec:
1 hour.
summary: Pod container waiting longer than 1 hour
expr: |
sum by (namespace, pod, container) (kube_pod_container_status_waiting_reason{namespace=~"(openshift-.*|kube-.*|default)",job="kube-state-metrics"}) > 0
sum by (namespace, pod, container, cluster) (kube_pod_container_status_waiting_reason{namespace=~"(openshift-.*|kube-.*|default)",job="kube-state-metrics"}) > 0
for: 1h
labels:
severity: warning
Expand Down Expand Up @@ -180,7 +180,7 @@ spec:
more than {{ "43200" | humanizeDuration }} to complete.
summary: Job did not complete in time
expr: |
time() - max by(namespace, job_name) (kube_job_status_start_time{namespace=~"(openshift-.*|kube-.*|default)",job="kube-state-metrics"}
time() - max by(namespace, job_name, cluster) (kube_job_status_start_time{namespace=~"(openshift-.*|kube-.*|default)",job="kube-state-metrics"}
and
kube_job_status_active{namespace=~"(openshift-.*|kube-.*|default)",job="kube-state-metrics"} > 0) > 43200
labels:
Expand Down Expand Up @@ -451,7 +451,7 @@ spec:
}} times averaged over the past 10m.
summary: Kubernetes aggregated API has reported errors.
expr: |
sum by(name, namespace)(increase(aggregator_unavailable_apiservice_total[10m])) > 4
sum by(name, namespace, cluster)(increase(aggregator_unavailable_apiservice_total[10m])) > 4
labels:
severity: warning
- alert: KubeAggregatedAPIDown
Expand All @@ -460,7 +460,7 @@ spec:
}} has been only {{ $value | humanize }}% available over the last 10m.
summary: Kubernetes aggregated API is down.
expr: |
(1 - max by(name, namespace)(avg_over_time(aggregator_unavailable_apiservice[10m]))) * 100 < 85
(1 - max by(name, namespace, cluster)(avg_over_time(aggregator_unavailable_apiservice[10m]))) * 100 < 85
for: 5m
labels:
severity: warning
Expand Down
8 changes: 4 additions & 4 deletions assets/grafana/dashboard-definitions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19214,8 +19214,8 @@ items:
"list": [
{
"current": {
"text": "default",
"value": "default"
"text": "Prometheus",
"value": "Prometheus"
},
"hide": 0,
"label": "Data Source",
Expand Down Expand Up @@ -20270,8 +20270,8 @@ items:
"list": [
{
"current": {
"text": "default",
"value": "default"
"text": "Prometheus",
"value": "Prometheus"
},
"hide": 0,
"label": "Data Source",
Expand Down
42 changes: 21 additions & 21 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": "81491914fbfbfcc041e175beb20f2cf3f575557e",
"version": "43434afd480c27ef5949e3a8caf65a37eba679df",
"sum": "zhLYhUNcXNkMRfJhMUX0UiOpi8TOuLmUqJfO9NFKFkg="
},
{
Expand All @@ -28,7 +28,7 @@
"subdir": "grafana-mixin"
}
},
"version": "1120f9e255760a3c104b57871fcb91801e934382",
"version": "3eed09056849ab873b867b561b7ce580ef2c75ba",
"sum": "MkjR7zCgq6MUZgjDzop574tFKoTX2OBr7DTwm1K+Ofs="
},
{
Expand All @@ -48,8 +48,8 @@
"subdir": "grafana-builder"
}
},
"version": "28e90490f768aaf14d5bcb15ed2f6ab4e3efe725",
"sum": "0KkygBQd/AFzUvVzezE4qF/uDYgrwUXVpZfINBti0oc="
"version": "1ddfda8ac51edb0adc38516b9a2435d6abcfc9f0",
"sum": "TieGrr7GyKjURk1+wXHFpdoCiwNaIVfZvyc5mbI9OM0="
},
{
"source": {
Expand All @@ -69,8 +69,8 @@
"subdir": ""
}
},
"version": "62ad10fe9ceb53c6b846871997abbfe8e0bd7cf5",
"sum": "6gD9F29f8T2a71n35Y61P7TBiF5NQuhk4JUwEafsA1E="
"version": "b8f44bb7be728423836bef0e904ec7166895a34b",
"sum": "LCgSosxceeYuoau5fYSPtE5eXOFe46DxexfkrctUv7c="
},
{
"source": {
Expand All @@ -79,7 +79,7 @@
"subdir": "lib/promgrafonnet"
}
},
"version": "62ad10fe9ceb53c6b846871997abbfe8e0bd7cf5",
"version": "b8f44bb7be728423836bef0e904ec7166895a34b",
"sum": "zv7hXGui6BfHzE9wPatHI/AGZa4A2WKo6pq7ZdqBsps="
},
{
Expand All @@ -89,7 +89,7 @@
"subdir": "jsonnet/kube-state-metrics"
}
},
"version": "b43b8cd57b7e71e7e5c151f6b7753ce5fdd04905",
"version": "0567e1e1b981755e563d2244fa1659563f2cddbc",
"sum": "P0dCnbzyPScQGNXwXRcwiPkMLeTq0IPNbSTysDbySnM="
},
{
Expand All @@ -99,7 +99,7 @@
"subdir": "jsonnet/kube-state-metrics-mixin"
}
},
"version": "b43b8cd57b7e71e7e5c151f6b7753ce5fdd04905",
"version": "0567e1e1b981755e563d2244fa1659563f2cddbc",
"sum": "u8gaydJoxEjzizQ8jY8xSjYgWooPmxw+wIWdDxifMAk="
},
{
Expand Down Expand Up @@ -131,8 +131,8 @@
"subdir": "jsonnet/kube-prometheus"
}
},
"version": "bbdb94a23e97edbab113f8cb788071cf6a541e6d",
"sum": "350sbhl/YOwB1oQYF3KLHapsqsVN93iIb8TnOn3wzsI="
"version": "4af90319f557da9b38db4e37d710d6d997ff4744",
"sum": "kJIVoJzzriX81zjuVnED4lR0CmZZLuPSg0F0eKeWOcM="
},
{
"source": {
Expand All @@ -141,7 +141,7 @@
"subdir": "jsonnet/mixin"
}
},
"version": "b475b655a82987eca96e142fe03a1e9c4e51f5f2",
"version": "5db6996d3ca995e66301c53c33959fd64c3f6ae6",
"sum": "GQmaVFJwKMiD/P4n3N2LrAZVcwutriWrP8joclDtBYQ=",
"name": "prometheus-operator-mixin"
},
Expand All @@ -162,8 +162,8 @@
"subdir": "doc/alertmanager-mixin"
}
},
"version": "71d61c9c9149420209c973014e0d6c981b183611",
"sum": "iqF63VWQovIGBb7JI5oVVgMShz0dKptSzEVQQjsy+Jo=",
"version": "14b01e6a34dd3155768c7e9bd5c4376055de9419",
"sum": "f3iZDUXQ/YWB5yDCY7VLD5bs442+3CdJgXJhJyWhNf8=",
"name": "alertmanager"
},
{
Expand All @@ -173,8 +173,8 @@
"subdir": "docs/node-mixin"
}
},
"version": "3d9ee5d9cc4545c7aaccc0f282f59478fe128ed1",
"sum": "fNanwWpnovE/ok6i7zlwd1mwOPbglp19edJdOLgTDnU="
"version": "a2321e7b940ddcff26873612bccdf7cd4c42b6b6",
"sum": "MlWDAKGZ+JArozRKdKEvewHeWn8j2DNBzesJfLVd0dk="
},
{
"source": {
Expand All @@ -183,7 +183,7 @@
"subdir": "documentation/prometheus-mixin"
}
},
"version": "4deb1a90d2f1300bb92938aa3c5949fffc7b7ce4",
"version": "9f1a3970b24e09bd65e189e39920652133a02b38",
"sum": "APXOIP3B3dZ3Tyh7L2UhyWR8Vbf5+9adTLz/ya7n6uU=",
"name": "prometheus"
},
Expand All @@ -194,7 +194,7 @@
"subdir": "config/crd/bases"
}
},
"version": "ac027a4a3dd7526a3afe80fc7e48cfec62436d81",
"version": "b715a9b3e1894962f910c10dc4999dda22fabc26",
"sum": "GQ0GFKGdIWKx1b78VRs6jtC4SMqkBjT5jl65QUjPKK4="
},
{
Expand All @@ -204,7 +204,7 @@
"subdir": "jsonnet/kube-thanos"
}
},
"version": "6328583a623765ed6ebf18064a301104def57420",
"version": "86a9d83c02a1c13efdf4a51d40cefbcc5526c37d",
"sum": "9XtRX02CoqEIb2BHJ0nDhuV6VvncFBanwQRFd60qYGg="
},
{
Expand All @@ -214,8 +214,8 @@
"subdir": "mixin"
}
},
"version": "81218afa5b01d44d20db8be599c88127e2cdf646",
"sum": "dBm9ML50quhu6dwTIgfNmVruMqfaUeQVCO/6EKtQLxE="
"version": "0d15bc0d4754c090c8ffa765fbadc281cdd6d161",
"sum": "/UJrWExMDM89fPfidt1pNLSQOLXsyBpmyp3unRbjaXw="
}
],
"legacyImports": false
Expand Down
8 changes: 4 additions & 4 deletions manifests/0000_90_cluster-monitoring-operator_01-dashboards.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19235,8 +19235,8 @@ data:
"list": [
{
"current": {
"text": "default",
"value": "default"
"text": "Prometheus",
"value": "Prometheus"
},
"hide": 0,
"label": "Data Source",
Expand Down Expand Up @@ -20293,8 +20293,8 @@ data:
"list": [
{
"current": {
"text": "default",
"value": "default"
"text": "Prometheus",
"value": "Prometheus"
},
"hide": 0,
"label": "Data Source",
Expand Down