From 04cf9ce35a6dd66006d1a58d2b7d720bf55efcef Mon Sep 17 00:00:00 2001
From: Frederic Branczyk <fbranczyk@gmail.com>
Date: Tue, 17 Jul 2018 19:49:42 +0200
Subject: [PATCH] *: Re-generate
---
manifests/grafana-dashboardDefinitions.yaml | 34 +++++++++++++++++--
manifests/kube-state-metrics-deployment.yaml | 8 ++---
.../kube-state-metrics-serviceMonitor.yaml | 1 +
manifests/prometheus-rules.yaml | 2 +-
4 files changed, 38 insertions(+), 7 deletions(-)
diff --git a/manifests/grafana-dashboardDefinitions.yaml b/manifests/grafana-dashboardDefinitions.yaml
index a0dba292..1143970e 100644
--- a/manifests/grafana-dashboardDefinitions.yaml
+++ b/manifests/grafana-dashboardDefinitions.yaml
@@ -2501,6 +2501,7 @@ items:
"instant": true,
"intervalFactor": 2,
"legendFormat": "",
+ "refId": "A",
"step": 10
},
{
@@ -2509,6 +2510,7 @@ items:
"instant": true,
"intervalFactor": 2,
"legendFormat": "",
+ "refId": "B",
"step": 10
},
{
@@ -2517,6 +2519,7 @@ items:
"instant": true,
"intervalFactor": 2,
"legendFormat": "",
+ "refId": "C",
"step": 10
},
{
@@ -2525,6 +2528,7 @@ items:
"instant": true,
"intervalFactor": 2,
"legendFormat": "",
+ "refId": "D",
"step": 10
},
{
@@ -2533,6 +2537,7 @@ items:
"instant": true,
"intervalFactor": 2,
"legendFormat": "",
+ "refId": "E",
"step": 10
}
],
@@ -2861,6 +2866,7 @@ items:
"instant": true,
"intervalFactor": 2,
"legendFormat": "",
+ "refId": "A",
"step": 10
},
{
@@ -2869,6 +2875,7 @@ items:
"instant": true,
"intervalFactor": 2,
"legendFormat": "",
+ "refId": "B",
"step": 10
},
{
@@ -2877,6 +2884,7 @@ items:
"instant": true,
"intervalFactor": 2,
"legendFormat": "",
+ "refId": "C",
"step": 10
},
{
@@ -2885,6 +2893,7 @@ items:
"instant": true,
"intervalFactor": 2,
"legendFormat": "",
+ "refId": "D",
"step": 10
},
{
@@ -2893,6 +2902,7 @@ items:
"instant": true,
"intervalFactor": 2,
"legendFormat": "",
+ "refId": "E",
"step": 10
}
],
@@ -3303,6 +3313,7 @@ items:
"instant": true,
"intervalFactor": 2,
"legendFormat": "",
+ "refId": "A",
"step": 10
},
{
@@ -3311,6 +3322,7 @@ items:
"instant": true,
"intervalFactor": 2,
"legendFormat": "",
+ "refId": "B",
"step": 10
},
{
@@ -3319,6 +3331,7 @@ items:
"instant": true,
"intervalFactor": 2,
"legendFormat": "",
+ "refId": "C",
"step": 10
},
{
@@ -3327,6 +3340,7 @@ items:
"instant": true,
"intervalFactor": 2,
"legendFormat": "",
+ "refId": "D",
"step": 10
},
{
@@ -3335,6 +3349,7 @@ items:
"instant": true,
"intervalFactor": 2,
"legendFormat": "",
+ "refId": "E",
"step": 10
}
],
@@ -3663,6 +3678,7 @@ items:
"instant": true,
"intervalFactor": 2,
"legendFormat": "",
+ "refId": "A",
"step": 10
},
{
@@ -3671,6 +3687,7 @@ items:
"instant": true,
"intervalFactor": 2,
"legendFormat": "",
+ "refId": "B",
"step": 10
},
{
@@ -3679,6 +3696,7 @@ items:
"instant": true,
"intervalFactor": 2,
"legendFormat": "",
+ "refId": "C",
"step": 10
},
{
@@ -3687,6 +3705,7 @@ items:
"instant": true,
"intervalFactor": 2,
"legendFormat": "",
+ "refId": "D",
"step": 10
},
{
@@ -3695,6 +3714,7 @@ items:
"instant": true,
"intervalFactor": 2,
"legendFormat": "",
+ "refId": "E",
"step": 10
}
],
@@ -4132,6 +4152,7 @@ items:
"instant": true,
"intervalFactor": 2,
"legendFormat": "",
+ "refId": "A",
"step": 10
},
{
@@ -4140,6 +4161,7 @@ items:
"instant": true,
"intervalFactor": 2,
"legendFormat": "",
+ "refId": "B",
"step": 10
},
{
@@ -4148,6 +4170,7 @@ items:
"instant": true,
"intervalFactor": 2,
"legendFormat": "",
+ "refId": "C",
"step": 10
},
{
@@ -4156,6 +4179,7 @@ items:
"instant": true,
"intervalFactor": 2,
"legendFormat": "",
+ "refId": "D",
"step": 10
},
{
@@ -4164,6 +4188,7 @@ items:
"instant": true,
"intervalFactor": 2,
"legendFormat": "",
+ "refId": "E",
"step": 10
}
],
@@ -4492,6 +4517,7 @@ items:
"instant": true,
"intervalFactor": 2,
"legendFormat": "",
+ "refId": "A",
"step": 10
},
{
@@ -4500,6 +4526,7 @@ items:
"instant": true,
"intervalFactor": 2,
"legendFormat": "",
+ "refId": "B",
"step": 10
},
{
@@ -4508,6 +4535,7 @@ items:
"instant": true,
"intervalFactor": 2,
"legendFormat": "",
+ "refId": "C",
"step": 10
},
{
@@ -4516,6 +4544,7 @@ items:
"instant": true,
"intervalFactor": 2,
"legendFormat": "",
+ "refId": "D",
"step": 10
},
{
@@ -4524,6 +4553,7 @@ items:
"instant": true,
"intervalFactor": 2,
"legendFormat": "",
+ "refId": "E",
"step": 10
}
],
@@ -5696,14 +5726,14 @@ items:
"refId": "A"
},
{
- "expr": "sum by(container) (kube_pod_container_resource_requests_memory_bytes{job=\"kubelet\", namespace=\"$namespace\", pod=\"$pod\", container=\u007e\"$container\", container!=\"POD\"})",
+ "expr": "sum by(container) (kube_pod_container_resource_requests_memory_bytes{job=\"kube-state-metrics\", namespace=\"$namespace\", pod=\"$pod\", container=\u007e\"$container\"})",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "Requested: {{ container }}",
"refId": "B"
},
{
- "expr": "sum by(container) (kube_pod_container_resource_limits_memory_bytes{job=\"kubelet\", namespace=\"$namespace\", pod=\"$pod\", container=\u007e\"$container\", container!=\"POD\"})",
+ "expr": "sum by(container) (kube_pod_container_resource_limits_memory_bytes{job=\"kube-state-metrics\", namespace=\"$namespace\", pod=\"$pod\", container=\u007e\"$container\"})",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "Limit: {{ container }}",
diff --git a/manifests/kube-state-metrics-deployment.yaml b/manifests/kube-state-metrics-deployment.yaml
index c7bb25c6..065c87a9 100644
--- a/manifests/kube-state-metrics-deployment.yaml
+++ b/manifests/kube-state-metrics-deployment.yaml
@@ -55,11 +55,11 @@ spec:
name: kube-state-metrics
resources:
limits:
- cpu: 102m
- memory: 180Mi
+ cpu: 100m
+ memory: 150Mi
requests:
- cpu: 102m
- memory: 180Mi
+ cpu: 100m
+ memory: 150Mi
- command:
- /pod_nanny
- --container=kube-state-metrics
diff --git a/manifests/kube-state-metrics-serviceMonitor.yaml b/manifests/kube-state-metrics-serviceMonitor.yaml
index 3d1073ad..2100449d 100644
--- a/manifests/kube-state-metrics-serviceMonitor.yaml
+++ b/manifests/kube-state-metrics-serviceMonitor.yaml
@@ -12,6 +12,7 @@ spec:
interval: 30s
port: https-main
scheme: https
+ scrapeTimeout: 30s
tlsConfig:
insecureSkipVerify: true
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
diff --git a/manifests/prometheus-rules.yaml b/manifests/prometheus-rules.yaml
index 75d5f36e..49c4a995 100644
--- a/manifests/prometheus-rules.yaml
+++ b/manifests/prometheus-rules.yaml
@@ -388,7 +388,7 @@ spec:
kube_deployment_spec_replicas{job="kube-state-metrics"}
!=
kube_deployment_status_replicas_available{job="kube-state-metrics"}
- for: 15m
+ for: 1h
labels:
severity: critical
- alert: KubeStatefulSetReplicasMismatch
--
GitLab