From b84a3650a5059598dbd6fbfca1f266e2eb28c5f3 Mon Sep 17 00:00:00 2001
From: Fabian Reinartz <fab.reinartz@gmail.com>
Date: Fri, 4 Nov 2016 14:25:59 -0700
Subject: [PATCH] Add JSON wrapping
---
assets/grafana/all-nodes-dashboard.json | 11 ++++++
assets/grafana/deployment-dashboard.json | 11 ++++++
...rd.json => kubernetes-pods-dashboard.json} | 0
assets/grafana/node-dashboard.json | 11 ++++++
manifests/grafana/grafana-cm.yaml | 35 ++++++++++++++++++-
5 files changed, 67 insertions(+), 1 deletion(-)
rename assets/grafana/{grafana-kubernetes-pods-dashboard.json => kubernetes-pods-dashboard.json} (100%)
diff --git a/assets/grafana/all-nodes-dashboard.json b/assets/grafana/all-nodes-dashboard.json
index 4e07445d..839565cd 100644
--- a/assets/grafana/all-nodes-dashboard.json
+++ b/assets/grafana/all-nodes-dashboard.json
@@ -1,4 +1,5 @@
{
+ "dashboard": {
"__inputs": [
{
"name": "DS_PROMETHEUS",
@@ -866,4 +867,14 @@
"version": 10,
"links": [],
"gnetId": 22
+},
+ "inputs": [
+ {
+ "name": "DS_PROMETHEUS",
+ "pluginId": "prometheus",
+ "type": "datasource",
+ "value": "prometheus"
+ }
+ ],
+ "overwrite": true
}
\ No newline at end of file
diff --git a/assets/grafana/deployment-dashboard.json b/assets/grafana/deployment-dashboard.json
index b09d4a47..69638d15 100644
--- a/assets/grafana/deployment-dashboard.json
+++ b/assets/grafana/deployment-dashboard.json
@@ -1,4 +1,5 @@
{
+ "dashboard": {
"__inputs": [
{
"name": "DS_PROMETHEUS",
@@ -803,4 +804,14 @@
"version": 2,
"links": [],
"gnetId": null
+},
+ "inputs": [
+ {
+ "name": "DS_PROMETHEUS",
+ "pluginId": "prometheus",
+ "type": "datasource",
+ "value": "prometheus"
+ }
+ ],
+ "overwrite": true
}
\ No newline at end of file
diff --git a/assets/grafana/grafana-kubernetes-pods-dashboard.json b/assets/grafana/kubernetes-pods-dashboard.json
similarity index 100%
rename from assets/grafana/grafana-kubernetes-pods-dashboard.json
rename to assets/grafana/kubernetes-pods-dashboard.json
diff --git a/assets/grafana/node-dashboard.json b/assets/grafana/node-dashboard.json
index 10ded0ff..bac1eb0d 100644
--- a/assets/grafana/node-dashboard.json
+++ b/assets/grafana/node-dashboard.json
@@ -1,4 +1,5 @@
{
+ "dashboard": {
"__inputs": [
{
"name": "DS_PROMETHEUS",
@@ -879,4 +880,14 @@
"version": 1,
"links": [],
"gnetId": 22
+},
+ "inputs": [
+ {
+ "name": "DS_PROMETHEUS",
+ "pluginId": "prometheus",
+ "type": "datasource",
+ "value": "prometheus"
+ }
+ ],
+ "overwrite": true
}
\ No newline at end of file
diff --git a/manifests/grafana/grafana-cm.yaml b/manifests/grafana/grafana-cm.yaml
index a0488f64..db41fd60 100644
--- a/manifests/grafana/grafana-cm.yaml
+++ b/manifests/grafana/grafana-cm.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
data:
all-nodes-dashboard.json: |-
{
+ "dashboard": {
"__inputs": [
{
"name": "DS_PROMETHEUS",
@@ -869,9 +870,20 @@ data:
"version": 10,
"links": [],
"gnetId": 22
+ },
+ "inputs": [
+ {
+ "name": "DS_PROMETHEUS",
+ "pluginId": "prometheus",
+ "type": "datasource",
+ "value": "prometheus"
+ }
+ ],
+ "overwrite": true
}
deployment-dashboard.json: |-
{
+ "dashboard": {
"__inputs": [
{
"name": "DS_PROMETHEUS",
@@ -1676,8 +1688,18 @@ data:
"version": 2,
"links": [],
"gnetId": null
+ },
+ "inputs": [
+ {
+ "name": "DS_PROMETHEUS",
+ "pluginId": "prometheus",
+ "type": "datasource",
+ "value": "prometheus"
+ }
+ ],
+ "overwrite": true
}
- grafana-kubernetes-pods-dashboard.json: |
+ kubernetes-pods-dashboard.json: |
{
"dashboard": {
"__inputs": [
@@ -2089,6 +2111,7 @@ data:
}
node-dashboard.json: |-
{
+ "dashboard": {
"__inputs": [
{
"name": "DS_PROMETHEUS",
@@ -2969,6 +2992,16 @@ data:
"version": 1,
"links": [],
"gnetId": 22
+ },
+ "inputs": [
+ {
+ "name": "DS_PROMETHEUS",
+ "pluginId": "prometheus",
+ "type": "datasource",
+ "value": "prometheus"
+ }
+ ],
+ "overwrite": true
}
prometheus-datasource.json: |
{
--
GitLab