From 701f32914bf3d6d729cb7d012c6e8e90caf374fc Mon Sep 17 00:00:00 2001 From: Matthias Loibl Date: Fri, 3 May 2019 18:24:19 +0200 Subject: [PATCH 1/3] Use v0.1.0 of kubernetes-mixin explicitly --- jsonnet/kube-prometheus/jsonnetfile.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jsonnet/kube-prometheus/jsonnetfile.json b/jsonnet/kube-prometheus/jsonnetfile.json index 5f481c36..a2bbb335 100644 --- a/jsonnet/kube-prometheus/jsonnetfile.json +++ b/jsonnet/kube-prometheus/jsonnetfile.json @@ -18,7 +18,7 @@ "subdir": "" } }, - "version": "master" + "version": "v0.1.0" }, { "name": "grafana", From 54ebea1d2733ae96a86a23ec48fb99c061c8c3b3 Mon Sep 17 00:00:00 2001 From: Matthias Loibl Date: Fri, 3 May 2019 18:43:43 +0200 Subject: [PATCH 2/3] Generate manifests with kubernetes-mixin v0.1.0 --- jsonnetfile.lock.json | 2 +- manifests/grafana-dashboardDefinitions.yaml | 28 ++++----------------- 2 files changed, 6 insertions(+), 24 deletions(-) diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json index 1a596386..dce2d6e5 100644 --- a/jsonnetfile.lock.json +++ b/jsonnetfile.lock.json @@ -28,7 +28,7 @@ "subdir": "" } }, - "version": "7360753d27aa428758c918434503c1c35afcd3bb" + "version": "5107f34c39baf5360ed0be84ea9a0cc5fb25fabc" }, { "name": "grafonnet", diff --git a/manifests/grafana-dashboardDefinitions.yaml b/manifests/grafana-dashboardDefinitions.yaml index abd59cf6..40558b32 100644 --- a/manifests/grafana-dashboardDefinitions.yaml +++ b/manifests/grafana-dashboardDefinitions.yaml @@ -3047,24 +3047,6 @@ items: "type": "number", "unit": "short" }, - { - "alias": "CPU Usage", - "colorMode": null, - "colors": [ - - ], - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "decimals": 2, - "link": false, - "linkTooltip": "Drill down", - "linkUrl": "", - "pattern": "Value #C", - "thresholds": [ - - ], - "type": "number", - "unit": "short" - }, { "alias": "Memory Usage", "colorMode": null, @@ -3076,7 +3058,7 @@ items: "link": false, "linkTooltip": "Drill down", "linkUrl": "", - "pattern": "Value #D", + "pattern": "Value #C", "thresholds": [ ], @@ -3094,7 +3076,7 @@ items: "link": false, "linkTooltip": "Drill down", "linkUrl": "", - "pattern": "Value #E", + "pattern": "Value #D", "thresholds": [ ], @@ -3112,7 +3094,7 @@ items: "link": false, "linkTooltip": "Drill down", "linkUrl": "", - "pattern": "Value #F", + "pattern": "Value #E", "thresholds": [ ], @@ -3130,7 +3112,7 @@ items: "link": false, "linkTooltip": "Drill down", "linkUrl": "", - "pattern": "Value #G", + "pattern": "Value #F", "thresholds": [ ], @@ -3148,7 +3130,7 @@ items: "link": false, "linkTooltip": "Drill down", "linkUrl": "", - "pattern": "Value #H", + "pattern": "Value #G", "thresholds": [ ], From 9f4176dcdfa900ccf238b78302edfc35bf1ee80f Mon Sep 17 00:00:00 2001 From: Matthias Loibl Date: Mon, 6 May 2019 19:47:50 +0200 Subject: [PATCH 3/3] Pin release-0.1 branch for kubernetes-mixin --- jsonnet/kube-prometheus/jsonnetfile.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jsonnet/kube-prometheus/jsonnetfile.json b/jsonnet/kube-prometheus/jsonnetfile.json index a2bbb335..a582c98c 100644 --- a/jsonnet/kube-prometheus/jsonnetfile.json +++ b/jsonnet/kube-prometheus/jsonnetfile.json @@ -18,7 +18,7 @@ "subdir": "" } }, - "version": "v0.1.0" + "version": "release-0.1" }, { "name": "grafana",