easylinux/kube-prometheus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #205 from ocadotechnology/fix-kube-state-metrics-redeployment

Browse Source 
Allow for multiple kube-state-metrics series
This commit is contained in:
Frederic Branczyk
2017-03-10 20:00:11 +01:00
committed by GitHub
parent e69a6f69ec 6a52b78990
commit 83f19b0dd1
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
assets/grafana/deployment-dashboard.json
View File

@@ -302,7 +302,7 @@
"targets": [ "targets": [
{ {
"refId": "A", "refId": "A",
"expr": "kube_deployment_spec_replicas{deployment=\"$deployment_name\",namespace=\"$deployment_namespace\"}", "expr": "max(kube_deployment_spec_replicas{deployment=\"$deployment_name\",namespace=\"$deployment_namespace\"}) without (instance)",
"intervalFactor": 2, "intervalFactor": 2,
"step": 600, "step": 600,
"metric": "kube_deployment_spec_replicas" "metric": "kube_deployment_spec_replicas"
@@ -381,7 +381,7 @@
"targets": [ "targets": [
{ {
"refId": "A", "refId": "A",
"expr": "kube_deployment_status_replicas_available{deployment=\"$deployment_name\",namespace=\"$deployment_namespace\"}", "expr": "min(kube_deployment_status_replicas_available{deployment=\"$deployment_name\",namespace=\"$deployment_namespace\"}) without (instance)",
"intervalFactor": 2, "intervalFactor": 2,
"step": 600 "step": 600
} }
@@ -505,7 +505,7 @@
}, },
"targets": [ "targets": [
{ {
"expr": "kube_deployment_status_observed_generation{deployment=\"$deployment_name\",namespace=\"$deployment_namespace\"}", "expr": "max(kube_deployment_status_observed_generation{deployment=\"$deployment_name\",namespace=\"$deployment_namespace\"}) without (instance)",
"intervalFactor": 2, "intervalFactor": 2,
"legendFormat": "", "legendFormat": "",
"refId": "A", "refId": "A",
@@ -583,7 +583,7 @@
}, },
"targets": [ "targets": [
{ {
"expr": "kube_deployment_metadata_generation{deployment=\"$deployment_name\",namespace=\"$deployment_namespace\"}", "expr": "max(kube_deployment_metadata_generation{deployment=\"$deployment_name\",namespace=\"$deployment_namespace\"}) without (instance)",
"intervalFactor": 2, "intervalFactor": 2,
"legendFormat": "", "legendFormat": "",
"refId": "A", "refId": "A",
@@ -649,35 +649,35 @@
"steppedLine": false, "steppedLine": false,
"targets": [ "targets": [
{ {
"expr": "kube_deployment_status_replicas{deployment=\"$deployment_name\",namespace=\"$deployment_namespace\"}", "expr": "max(kube_deployment_status_replicas{deployment=\"$deployment_name\",namespace=\"$deployment_namespace\"}) without (instance)",
"intervalFactor": 2, "intervalFactor": 2,
"legendFormat": "current replicas", "legendFormat": "current replicas",
"refId": "A", "refId": "A",
"step": 30 "step": 30
}, },
{ {
"expr": "kube_deployment_status_replicas_available{deployment=\"$deployment_name\",namespace=\"$deployment_namespace\"}", "expr": "min(kube_deployment_status_replicas_available{deployment=\"$deployment_name\",namespace=\"$deployment_namespace\"}) without (instance)",
"intervalFactor": 2, "intervalFactor": 2,
"legendFormat": "available", "legendFormat": "available",
"refId": "B", "refId": "B",
"step": 30 "step": 30
}, },
{ {
"expr": "kube_deployment_status_replicas_unavailable{deployment=\"$deployment_name\",namespace=\"$deployment_namespace\"}", "expr": "max(kube_deployment_status_replicas_unavailable{deployment=\"$deployment_name\",namespace=\"$deployment_namespace\"}) without (instance)",
"intervalFactor": 2, "intervalFactor": 2,
"legendFormat": "unavailable", "legendFormat": "unavailable",
"refId": "C", "refId": "C",
"step": 30 "step": 30
}, },
{ {
"expr": "kube_deployment_status_replicas_updated{deployment=\"$deployment_name\",namespace=\"$deployment_namespace\"}", "expr": "min(kube_deployment_status_replicas_updated{deployment=\"$deployment_name\",namespace=\"$deployment_namespace\"}) without (instance)",
"intervalFactor": 2, "intervalFactor": 2,
"legendFormat": "updated", "legendFormat": "updated",
"refId": "D", "refId": "D",
"step": 30 "step": 30
}, },
{ {
"expr": "kube_deployment_spec_replicas{deployment=\"$deployment_name\",namespace=\"$deployment_namespace\"}", "expr": "max(kube_deployment_spec_replicas{deployment=\"$deployment_name\",namespace=\"$deployment_namespace\"}) without (instance)",
"intervalFactor": 2, "intervalFactor": 2,
"legendFormat": "desired", "legendFormat": "desired",
"refId": "E", "refId": "E",

2
manifests/exporters/kube-state-metrics-deployment.yaml
View File

@@ -3,7 +3,7 @@ kind: Deployment
metadata: metadata:
name: kube-state-metrics name: kube-state-metrics
spec: spec:
replicas: 1 replicas: 2
template: template:
metadata: metadata:
labels: labels:

18
manifests/grafana/grafana-dashboards.yaml
View File

@@ -1166,7 +1166,7 @@ data:
"targets": [ "targets": [
{ {
"refId": "A", "refId": "A",
"expr": "kube_deployment_spec_replicas{deployment=\"$deployment_name\",namespace=\"$deployment_namespace\"}", "expr": "max(kube_deployment_spec_replicas{deployment=\"$deployment_name\",namespace=\"$deployment_namespace\"}) without (instance)",
"intervalFactor": 2, "intervalFactor": 2,
"step": 600, "step": 600,
"metric": "kube_deployment_spec_replicas" "metric": "kube_deployment_spec_replicas"
@@ -1245,7 +1245,7 @@ data:
"targets": [ "targets": [
{ {
"refId": "A", "refId": "A",
"expr": "kube_deployment_status_replicas_available{deployment=\"$deployment_name\",namespace=\"$deployment_namespace\"}", "expr": "min(kube_deployment_status_replicas_available{deployment=\"$deployment_name\",namespace=\"$deployment_namespace\"}) without (instance)",
"intervalFactor": 2, "intervalFactor": 2,
"step": 600 "step": 600
} }
@@ -1369,7 +1369,7 @@ data:
}, },
"targets": [ "targets": [
{ {
"expr": "kube_deployment_status_observed_generation{deployment=\"$deployment_name\",namespace=\"$deployment_namespace\"}", "expr": "max(kube_deployment_status_observed_generation{deployment=\"$deployment_name\",namespace=\"$deployment_namespace\"}) without (instance)",
"intervalFactor": 2, "intervalFactor": 2,
"legendFormat": "", "legendFormat": "",
"refId": "A", "refId": "A",
@@ -1447,7 +1447,7 @@ data:
}, },
"targets": [ "targets": [
{ {
"expr": "kube_deployment_metadata_generation{deployment=\"$deployment_name\",namespace=\"$deployment_namespace\"}", "expr": "max(kube_deployment_metadata_generation{deployment=\"$deployment_name\",namespace=\"$deployment_namespace\"}) without (instance)",
"intervalFactor": 2, "intervalFactor": 2,
"legendFormat": "", "legendFormat": "",
"refId": "A", "refId": "A",
@@ -1513,35 +1513,35 @@ data:
"steppedLine": false, "steppedLine": false,
"targets": [ "targets": [
{ {
"expr": "kube_deployment_status_replicas{deployment=\"$deployment_name\",namespace=\"$deployment_namespace\"}", "expr": "max(kube_deployment_status_replicas{deployment=\"$deployment_name\",namespace=\"$deployment_namespace\"}) without (instance)",
"intervalFactor": 2, "intervalFactor": 2,
"legendFormat": "current replicas", "legendFormat": "current replicas",
"refId": "A", "refId": "A",
"step": 30 "step": 30
}, },
{ {
"expr": "kube_deployment_status_replicas_available{deployment=\"$deployment_name\",namespace=\"$deployment_namespace\"}", "expr": "min(kube_deployment_status_replicas_available{deployment=\"$deployment_name\",namespace=\"$deployment_namespace\"}) without (instance)",
"intervalFactor": 2, "intervalFactor": 2,
"legendFormat": "available", "legendFormat": "available",
"refId": "B", "refId": "B",
"step": 30 "step": 30
}, },
{ {
"expr": "kube_deployment_status_replicas_unavailable{deployment=\"$deployment_name\",namespace=\"$deployment_namespace\"}", "expr": "max(kube_deployment_status_replicas_unavailable{deployment=\"$deployment_name\",namespace=\"$deployment_namespace\"}) without (instance)",
"intervalFactor": 2, "intervalFactor": 2,
"legendFormat": "unavailable", "legendFormat": "unavailable",
"refId": "C", "refId": "C",
"step": 30 "step": 30
}, },
{ {
"expr": "kube_deployment_status_replicas_updated{deployment=\"$deployment_name\",namespace=\"$deployment_namespace\"}", "expr": "min(kube_deployment_status_replicas_updated{deployment=\"$deployment_name\",namespace=\"$deployment_namespace\"}) without (instance)",
"intervalFactor": 2, "intervalFactor": 2,
"legendFormat": "updated", "legendFormat": "updated",
"refId": "D", "refId": "D",
"step": 30 "step": 30
}, },
{ {
"expr": "kube_deployment_spec_replicas{deployment=\"$deployment_name\",namespace=\"$deployment_namespace\"}", "expr": "max(kube_deployment_spec_replicas{deployment=\"$deployment_name\",namespace=\"$deployment_namespace\"}) without (instance)",
"intervalFactor": 2, "intervalFactor": 2,
"legendFormat": "desired", "legendFormat": "desired",
"refId": "E", "refId": "E",