From 4c9912ece53796c900e5a128b9421be3d17c14e0 Mon Sep 17 00:00:00 2001
From: Dmitry Verkhoturov <paskal.07@gmail.com>
Date: Thu, 24 Jan 2019 19:57:19 +0300
Subject: [PATCH] sync rules
---
jsonnetfile.lock.json | 10 ++++-----
manifests/grafana-dashboardDefinitions.yaml | 24 +++++++++++++++++++++
manifests/prometheus-rules.yaml | 6 ++++--
3 files changed, 33 insertions(+), 7 deletions(-)
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index 3f494915..cfd96219 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -8,7 +8,7 @@
"subdir": "contrib/kube-prometheus/jsonnet/kube-prometheus"
}
},
- "version": "698d6d750a9f46d0db4c7ae47ed293979921e89c"
+ "version": "e578c3af3a5c6ac26207c4b2ae92af6298e32342"
},
{
"name": "ksonnet",
@@ -28,7 +28,7 @@
"subdir": ""
}
},
- "version": "2e358ff68f00bd0dead547beaddc6ce7526864e8"
+ "version": "3b031fd4bb5c3027ab5e76a342758c203b535db0"
},
{
"name": "grafonnet",
@@ -38,7 +38,7 @@
"subdir": "grafonnet"
}
},
- "version": "d05a9bd3adfba39ed3b1987a428d9e9863428df5"
+ "version": "11022f5e920ac1ea960556193e3f0ab57d70d7c5"
},
{
"name": "grafana-builder",
@@ -48,7 +48,7 @@
"subdir": "grafana-builder"
}
},
- "version": "d75c3b260c1077c924d7ea0240250afc235c4cb3"
+ "version": "eb4d2218cefc621cd31041d46c3dbf328325d68f"
},
{
"name": "grafana",
@@ -78,7 +78,7 @@
"subdir": "Documentation/etcd-mixin"
}
},
- "version": "a00bff7848db1dcead692e2bea1d7c87e8a2c157"
+ "version": "fa521f4e00fedfb6d98449d92a6408d0b3b0d922"
}
]
}
diff --git a/manifests/grafana-dashboardDefinitions.yaml b/manifests/grafana-dashboardDefinitions.yaml
index dc491cb6..f3374edc 100644
--- a/manifests/grafana-dashboardDefinitions.yaml
+++ b/manifests/grafana-dashboardDefinitions.yaml
@@ -4896,6 +4896,12 @@ items:
data:
nodes.json: |-
{
+ "__inputs": [
+
+ ],
+ "__requires": [
+
+ ],
"annotations": {
"list": [
@@ -6208,6 +6214,12 @@ items:
data:
persistentvolumesusage.json: |-
{
+ "__inputs": [
+
+ ],
+ "__requires": [
+
+ ],
"annotations": {
"list": [
@@ -6551,6 +6563,12 @@ items:
data:
pods.json: |-
{
+ "__inputs": [
+
+ ],
+ "__requires": [
+
+ ],
"annotations": {
"list": [
@@ -7035,6 +7053,12 @@ items:
data:
statefulset.json: |-
{
+ "__inputs": [
+
+ ],
+ "__requires": [
+
+ ],
"annotations": {
"list": [
diff --git a/manifests/prometheus-rules.yaml b/manifests/prometheus-rules.yaml
index 04905a34..5729174f 100644
--- a/manifests/prometheus-rules.yaml
+++ b/manifests/prometheus-rules.yaml
@@ -776,7 +776,8 @@ spec:
severity: warning
- alert: KubeClientCertificateExpiration
annotations:
- message: Kubernetes API certificate is expiring in less than 7 days.
+ message: A client certificate used to authenticate to the apiserver is expiring
+ in less than 7 days.
runbook_url: https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-kubeclientcertificateexpiration
expr: |
histogram_quantile(0.01, sum by (job, le) (rate(apiserver_client_certificate_expiration_seconds_bucket{job="apiserver"}[5m]))) < 604800
@@ -784,7 +785,8 @@ spec:
severity: warning
- alert: KubeClientCertificateExpiration
annotations:
- message: Kubernetes API certificate is expiring in less than 24 hours.
+ message: A client certificate used to authenticate to the apiserver is expiring
+ in less than 24 hours.
runbook_url: https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-kubeclientcertificateexpiration
expr: |
histogram_quantile(0.01, sum by (job, le) (rate(apiserver_client_certificate_expiration_seconds_bucket{job="apiserver"}[5m]))) < 86400
--
GitLab