diff --git a/assets/kubernetes/alerts.yaml b/assets/kubernetes/alerts.yaml index b1c7701..9b8768b 100644 --- a/assets/kubernetes/alerts.yaml +++ b/assets/kubernetes/alerts.yaml @@ -391,6 +391,10 @@ groups: message: The API server has an abnormal latency of {{ $value }} seconds for {{ $labels.verb }} {{ $labels.resource }}. runbook_url: https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-kubeapilatencyhigh expr: | + cluster_quantile:apiserver_request_duration_seconds:histogram_quantile{job="kube-apiserver",quantile="0.99"} + > + 1 + and on (verb,resource) ( cluster:apiserver_request_duration_seconds:mean5m{job="kube-apiserver"} > @@ -402,10 +406,6 @@ groups: ) ) > on (verb) group_left() 1.2 * avg by (verb) (cluster:apiserver_request_duration_seconds:mean5m{job="kube-apiserver"} >= 0) - and on (verb,resource) - cluster_quantile:apiserver_request_duration_seconds:histogram_quantile{job="kube-apiserver",quantile="0.99"} - > - 1 for: 5m labels: severity: warning diff --git a/site/content/kubernetes/_index.md b/site/content/kubernetes/_index.md index 8f751c8..f90911e 100644 --- a/site/content/kubernetes/_index.md +++ b/site/content/kubernetes/_index.md @@ -598,6 +598,10 @@ annotations: message: The API server has an abnormal latency of {{ $value }} seconds for {{ $labels.verb }} {{ $labels.resource }}. runbook_url: https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-kubeapilatencyhigh expr: | + cluster_quantile:apiserver_request_duration_seconds:histogram_quantile{job="kube-apiserver",quantile="0.99"} + > + 1 + and on (verb,resource) ( cluster:apiserver_request_duration_seconds:mean5m{job="kube-apiserver"} > @@ -609,10 +613,6 @@ expr: | ) ) > on (verb) group_left() 1.2 * avg by (verb) (cluster:apiserver_request_duration_seconds:mean5m{job="kube-apiserver"} >= 0) - and on (verb,resource) - cluster_quantile:apiserver_request_duration_seconds:histogram_quantile{job="kube-apiserver",quantile="0.99"} - > - 1 for: 5m labels: severity: warning diff --git a/site/content/prometheus/_index.md b/site/content/prometheus/_index.md index 3a304cd..85318fa 100644 --- a/site/content/prometheus/_index.md +++ b/site/content/prometheus/_index.md @@ -282,5 +282,5 @@ labels: Following dashboards are generated from mixins and hosted on github: -- [prometheus](https://github.com/monitoring-mixins/website/blob/master/assets/prometheus/dashboards/prometheus.json) - [prometheus-remote-write](https://github.com/monitoring-mixins/website/blob/master/assets/prometheus/dashboards/prometheus-remote-write.json) +- [prometheus](https://github.com/monitoring-mixins/website/blob/master/assets/prometheus/dashboards/prometheus.json)