Skip to content
Snippets Groups Projects
Unverified Commit 94c5301c authored by Paweł Krupa's avatar Paweł Krupa Committed by GitHub
Browse files

Merge pull request #1217 from PhilipGough/bz-1913618 

Sync with kubernetes-mixin
parents 466eb795 3a4e292a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
jsonnetfile.lock.json
+ 2
− 2
View file @ 94c5301c
...@@ -48,8 +48,8 @@ ...@@ -48,8 +48,8 @@
"subdir": "" "subdir": ""
} }
}, },
"version": "8524aa43d49914b170b84816fc182319da04a167", "version": "e0dc3563dcbf2e54e0ffe8e83f3f51b237ef33be",
"sum": "J06UiBvcfpRzLM5VbLRAhP39Zaz+EKguJ5sSTBDeygs=" "sum": "egi2xHFco6VkCxettVvAju/yrsGnB3AFoPpCGKfWhtU="
}, },
{ {
"source": { "source": {
......
manifests/grafana-dashboardDefinitions.yaml
+ 9
− 9
View file @ 94c5301c
...@@ -5602,7 +5602,7 @@ items: ...@@ -5602,7 +5602,7 @@ items:
"steppedLine": false, "steppedLine": false,
"targets": [ "targets": [
{ {
"expr": "sum(kube_pod_container_resource_limits{cluster=\"$cluster\", resource=\"cpu\"}) / sum(kube_node_status_allocatable{resource=\"cpu\",cluster=\"$cluster\"})", "expr": "sum(namespace_cpu:kube_pod_container_resource_limits:sum{cluster=\"$cluster\"}) / sum(kube_node_status_allocatable{resource=\"cpu\",cluster=\"$cluster\"})",
"format": "time_series", "format": "time_series",
"instant": true, "instant": true,
"intervalFactor": 2, "intervalFactor": 2,
...@@ -5854,7 +5854,7 @@ items: ...@@ -5854,7 +5854,7 @@ items:
"steppedLine": false, "steppedLine": false,
"targets": [ "targets": [
{ {
"expr": "sum(kube_pod_container_resource_limits{cluster=\"$cluster\", resource=\"memory\"}) / sum(kube_node_status_allocatable{resource=\"memory\",cluster=\"$cluster\"})", "expr": "sum(namespace_memory:kube_pod_container_resource_limits:sum{cluster=\"$cluster\"}) / sum(kube_node_status_allocatable{resource=\"memory\",cluster=\"$cluster\"})",
"format": "time_series", "format": "time_series",
"instant": true, "instant": true,
"intervalFactor": 2, "intervalFactor": 2,
...@@ -6258,7 +6258,7 @@ items: ...@@ -6258,7 +6258,7 @@ items:
"step": 10 "step": 10
}, },
{ {
"expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate{cluster=\"$cluster\"}) by (namespace) / sum(kube_pod_container_resource_requests{cluster=\"$cluster\", resource=\"cpu\"}) by (namespace)", "expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate{cluster=\"$cluster\"}) by (namespace) / sum(namespace_cpu:kube_pod_container_resource_requests:sum{cluster=\"$cluster\"}) by (namespace)",
"format": "table", "format": "table",
"instant": true, "instant": true,
"intervalFactor": 2, "intervalFactor": 2,
...@@ -6267,7 +6267,7 @@ items: ...@@ -6267,7 +6267,7 @@ items:
"step": 10 "step": 10
}, },
{ {
"expr": "sum(kube_pod_container_resource_limits{cluster=\"$cluster\", resource=\"cpu\"}) by (namespace)", "expr": "sum(namespace_cpu:kube_pod_container_resource_limits:sum{cluster=\"$cluster\"}) by (namespace)",
"format": "table", "format": "table",
"instant": true, "instant": true,
"intervalFactor": 2, "intervalFactor": 2,
...@@ -6276,7 +6276,7 @@ items: ...@@ -6276,7 +6276,7 @@ items:
"step": 10 "step": 10
}, },
{ {
"expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate{cluster=\"$cluster\"}) by (namespace) / sum(kube_pod_container_resource_limits{cluster=\"$cluster\", resource=\"cpu\"}) by (namespace)", "expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate{cluster=\"$cluster\"}) by (namespace) / sum(namespace_cpu:kube_pod_container_resource_limits:sum{cluster=\"$cluster\"}) by (namespace)",
"format": "table", "format": "table",
"instant": true, "instant": true,
"intervalFactor": 2, "intervalFactor": 2,
...@@ -6676,7 +6676,7 @@ items: ...@@ -6676,7 +6676,7 @@ items:
"step": 10 "step": 10
}, },
{ {
"expr": "sum(kube_pod_container_resource_requests{cluster=\"$cluster\", resource=\"memory\"}) by (namespace)", "expr": "sum(namespace_memory:kube_pod_container_resource_requests:sum{cluster=\"$cluster\"}) by (namespace)",
"format": "table", "format": "table",
"instant": true, "instant": true,
"intervalFactor": 2, "intervalFactor": 2,
...@@ -6685,7 +6685,7 @@ items: ...@@ -6685,7 +6685,7 @@ items:
"step": 10 "step": 10
}, },
{ {
"expr": "sum(container_memory_rss{cluster=\"$cluster\", container!=\"\"}) by (namespace) / sum(kube_pod_container_resource_requests{cluster=\"$cluster\", resource=\"memory\"}) by (namespace)", "expr": "sum(container_memory_rss{cluster=\"$cluster\", container!=\"\"}) by (namespace) / sum(namespace_memory:kube_pod_container_resource_requests:sum{cluster=\"$cluster\"}) by (namespace)",
"format": "table", "format": "table",
"instant": true, "instant": true,
"intervalFactor": 2, "intervalFactor": 2,
...@@ -6694,7 +6694,7 @@ items: ...@@ -6694,7 +6694,7 @@ items:
"step": 10 "step": 10
}, },
{ {
"expr": "sum(kube_pod_container_resource_limits{cluster=\"$cluster\", resource=\"memory\"}) by (namespace)", "expr": "sum(namespace_memory:kube_pod_container_resource_limits:sum{cluster=\"$cluster\"}) by (namespace)",
"format": "table", "format": "table",
"instant": true, "instant": true,
"intervalFactor": 2, "intervalFactor": 2,
...@@ -6703,7 +6703,7 @@ items: ...@@ -6703,7 +6703,7 @@ items:
"step": 10 "step": 10
}, },
{ {
"expr": "sum(container_memory_rss{cluster=\"$cluster\", container!=\"\"}) by (namespace) / sum(kube_pod_container_resource_limits{cluster=\"$cluster\", resource=\"memory\"}) by (namespace)", "expr": "sum(container_memory_rss{cluster=\"$cluster\", container!=\"\"}) by (namespace) / sum(namespace_memory:kube_pod_container_resource_limits:sum{cluster=\"$cluster\"}) by (namespace)",
"format": "table", "format": "table",
"instant": true, "instant": true,
"intervalFactor": 2, "intervalFactor": 2,
manifests/kubernetes-prometheusRule.yaml
+ 33
− 9
View file @ 94c5301c
...@@ -19,6 +19,8 @@ spec: ...@@ -19,6 +19,8 @@ spec:
summary: Pod is crash looping. summary: Pod is crash looping.
expr: | expr: |
increase(kube_pod_container_status_restarts_total{job="kube-state-metrics"}[10m]) > 0 increase(kube_pod_container_status_restarts_total{job="kube-state-metrics"}[10m]) > 0
and
sum without (phase) (kube_pod_status_phase{phase!="Running",job="kube-state-metrics"} == 1)
for: 15m for: 15m
labels: labels:
severity: warning severity: warning
...@@ -214,19 +216,19 @@ spec: ...@@ -214,19 +216,19 @@ spec:
runbook_url: https://github.com/prometheus-operator/kube-prometheus/wiki/kubehpareplicasmismatch runbook_url: https://github.com/prometheus-operator/kube-prometheus/wiki/kubehpareplicasmismatch
summary: HPA has not matched descired number of replicas. summary: HPA has not matched descired number of replicas.
expr: | expr: |
(kube_hpa_status_desired_replicas{job="kube-state-metrics"} (kube_horizontalpodautoscaler_status_desired_replicas{job="kube-state-metrics"}
!= !=
kube_hpa_status_current_replicas{job="kube-state-metrics"}) kube_horizontalpodautoscaler_status_current_replicas{job="kube-state-metrics"})
and and
(kube_hpa_status_current_replicas{job="kube-state-metrics"} (kube_horizontalpodautoscaler_status_current_replicas{job="kube-state-metrics"}
> >
kube_hpa_spec_min_replicas{job="kube-state-metrics"}) kube_horizontalpodautoscaler_spec_min_replicas{job="kube-state-metrics"})
and and
(kube_hpa_status_current_replicas{job="kube-state-metrics"} (kube_horizontalpodautoscaler_status_current_replicas{job="kube-state-metrics"}
< <
kube_hpa_spec_max_replicas{job="kube-state-metrics"}) kube_horizontalpodautoscaler_spec_max_replicas{job="kube-state-metrics"})
and and
changes(kube_hpa_status_current_replicas{job="kube-state-metrics"}[15m]) == 0 changes(kube_horizontalpodautoscaler_status_current_replicas{job="kube-state-metrics"}[15m]) == 0
for: 15m for: 15m
labels: labels:
severity: warning severity: warning
...@@ -236,9 +238,9 @@ spec: ...@@ -236,9 +238,9 @@ spec:
runbook_url: https://github.com/prometheus-operator/kube-prometheus/wiki/kubehpamaxedout runbook_url: https://github.com/prometheus-operator/kube-prometheus/wiki/kubehpamaxedout
summary: HPA is running at max replicas summary: HPA is running at max replicas
expr: | expr: |
kube_hpa_status_current_replicas{job="kube-state-metrics"} kube_horizontalpodautoscaler_status_current_replicas{job="kube-state-metrics"}
== ==
kube_hpa_spec_max_replicas{job="kube-state-metrics"} kube_horizontalpodautoscaler_spec_max_replicas{job="kube-state-metrics"}
for: 15m for: 15m
labels: labels:
severity: warning severity: warning
...@@ -1250,6 +1252,28 @@ spec: ...@@ -1250,6 +1252,28 @@ spec:
) )
) )
record: namespace_cpu:kube_pod_container_resource_requests:sum record: namespace_cpu:kube_pod_container_resource_requests:sum
- expr: |
sum by (namespace, cluster) (
sum by (namespace, pod, cluster) (
max by (namespace, pod, container, cluster) (
kube_pod_container_resource_limits{resource="memory",job="kube-state-metrics"}
) * on(namespace, pod, cluster) group_left() max by (namespace, pod) (
kube_pod_status_phase{phase=~"Pending|Running"} == 1
)
)
)
record: namespace_memory:kube_pod_container_resource_limits:sum
- expr: |
sum by (namespace, cluster) (
sum by (namespace, pod, cluster) (
max by (namespace, pod, container, cluster) (
kube_pod_container_resource_limits{resource="cpu",job="kube-state-metrics"}
) * on(namespace, pod, cluster) group_left() max by (namespace, pod) (
kube_pod_status_phase{phase=~"Pending|Running"} == 1
)
)
)
record: namespace_cpu:kube_pod_container_resource_limits:sum
- expr: | - expr: |
max by (cluster, namespace, workload, pod) ( max by (cluster, namespace, workload, pod) (
label_replace( label_replace(
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment