Merge pull request #1466 from brancz/dashboard-cms

kube-prometheus: Use 1 ConfigMap per Grafana dashboard

jsonnet/kube-prometheus/kube-prometheus.libsonnet

@@ -1,4 +1,5 @@
 local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
+local configMapList = k.core.v1.configMapList;
 
 (import 'grafana/grafana.libsonnet') +
 (import 'kube-state-metrics/kube-state-metrics.libsonnet') +
@@ -12,6 +13,9 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
   kubePrometheus+:: {
     namespace: k.core.v1.namespace.new($._config.namespace),
   },
+  grafana+:: {
+    dashboardDefinitions: configMapList.new(super.dashboardDefinitions),
+  },
 } + {
   _config+:: {
     namespace: 'default',

manifests/grafana-dashboardDatasources.yaml

@@ -5,7 +5,7 @@ data:
         "datasources": [
             {
                 "access": "proxy",
-                "etitable": false,
+                "editable": false,
                 "name": "prometheus",
                 "org_id": 1,
                 "type": "prometheus",

manifests/grafana-dashboardDefinitions.yaml

@@ -1,5 +1,7 @@
 apiVersion: v1
-data:
+items:
+- apiVersion: v1
+  data:
     k8s-cluster-rsrc-use.json: |-
       {
           "annotations": {
@@ -909,6 +911,12 @@ data:
           "title": "K8s / USE Method / Cluster",
           "version": 0
       }
+  kind: ConfigMap
+  metadata:
+    name: grafana-dashboard-k8s-cluster-rsrc-use
+    namespace: monitoring
+- apiVersion: v1
+  data:
     k8s-node-rsrc-use.json: |-
       {
           "annotations": {
@@ -1845,6 +1853,12 @@ data:
           "title": "K8s / USE Method / Node",
           "version": 0
       }
+  kind: ConfigMap
+  metadata:
+    name: grafana-dashboard-k8s-node-rsrc-use
+    namespace: monitoring
+- apiVersion: v1
+  data:
     k8s-resources-cluster.json: |-
       {
           "annotations": {
@@ -2988,6 +3002,12 @@ data:
           "title": "K8s / Compute Resources / Cluster",
           "version": 0
       }
+  kind: ConfigMap
+  metadata:
+    name: grafana-dashboard-k8s-resources-cluster
+    namespace: monitoring
+- apiVersion: v1
+  data:
     k8s-resources-namespace.json: |-
       {
           "annotations": {
@@ -3810,6 +3830,12 @@ data:
           "title": "K8s / Compute Resources / Namespace",
           "version": 0
       }
+  kind: ConfigMap
+  metadata:
+    name: grafana-dashboard-k8s-resources-namespace
+    namespace: monitoring
+- apiVersion: v1
+  data:
     k8s-resources-pod.json: |-
       {
           "annotations": {
@@ -4659,6 +4685,12 @@ data:
           "title": "K8s / Compute Resources / Pod",
           "version": 0
       }
+  kind: ConfigMap
+  metadata:
+    name: grafana-dashboard-k8s-resources-pod
+    namespace: monitoring
+- apiVersion: v1
+  data:
     nodes.json: |-
       {
           "annotations": {
@@ -5579,6 +5611,12 @@ data:
           "title": "Nodes",
           "version": 0
       }
+  kind: ConfigMap
+  metadata:
+    name: grafana-dashboard-nodes
+    namespace: monitoring
+- apiVersion: v1
+  data:
     pods.json: |-
       {
           "annotations": {
@@ -6062,6 +6100,12 @@ data:
           "title": "Pods",
           "version": 0
       }
+  kind: ConfigMap
+  metadata:
+    name: grafana-dashboard-pods
+    namespace: monitoring
+- apiVersion: v1
+  data:
     statefulset.json: |-
       {
           "annotations": {
@@ -6908,7 +6952,8 @@ data:
           "title": "StatefulSets",
           "version": 0
       }
-kind: ConfigMap
+  kind: ConfigMap
-metadata:
+  metadata:
-  name: grafana-dashboard-definitions
+    name: grafana-dashboard-statefulset
     namespace: monitoring
+kind: ConfigMapList

manifests/grafana-deployment.yaml

@@ -38,8 +38,29 @@ spec:
         - mountPath: /etc/grafana/provisioning/dashboards
           name: grafana-dashboards
           readOnly: false
-        - mountPath: /grafana-dashboard-definitions/0
+        - mountPath: /grafana-dashboard-definitions/0/k8s-cluster-rsrc-use
-          name: grafana-dashboard-definitions
+          name: grafana-dashboard-k8s-cluster-rsrc-use
+          readOnly: false
+        - mountPath: /grafana-dashboard-definitions/0/k8s-node-rsrc-use
+          name: grafana-dashboard-k8s-node-rsrc-use
+          readOnly: false
+        - mountPath: /grafana-dashboard-definitions/0/k8s-resources-cluster
+          name: grafana-dashboard-k8s-resources-cluster
+          readOnly: false
+        - mountPath: /grafana-dashboard-definitions/0/k8s-resources-namespace
+          name: grafana-dashboard-k8s-resources-namespace
+          readOnly: false
+        - mountPath: /grafana-dashboard-definitions/0/k8s-resources-pod
+          name: grafana-dashboard-k8s-resources-pod
+          readOnly: false
+        - mountPath: /grafana-dashboard-definitions/0/nodes
+          name: grafana-dashboard-nodes
+          readOnly: false
+        - mountPath: /grafana-dashboard-definitions/0/pods
+          name: grafana-dashboard-pods
+          readOnly: false
+        - mountPath: /grafana-dashboard-definitions/0/statefulset
+          name: grafana-dashboard-statefulset
           readOnly: false
       securityContext:
         runAsNonRoot: true
@@ -55,5 +76,26 @@ spec:
           name: grafana-dashboards
         name: grafana-dashboards
       - configMap:
-          name: grafana-dashboard-definitions
+          name: grafana-dashboard-k8s-cluster-rsrc-use
-        name: grafana-dashboard-definitions
+        name: grafana-dashboard-k8s-cluster-rsrc-use
+      - configMap:
+          name: grafana-dashboard-k8s-node-rsrc-use
+        name: grafana-dashboard-k8s-node-rsrc-use
+      - configMap:
+          name: grafana-dashboard-k8s-resources-cluster
+        name: grafana-dashboard-k8s-resources-cluster
+      - configMap:
+          name: grafana-dashboard-k8s-resources-namespace
+        name: grafana-dashboard-k8s-resources-namespace
+      - configMap:
+          name: grafana-dashboard-k8s-resources-pod
+        name: grafana-dashboard-k8s-resources-pod
+      - configMap:
+          name: grafana-dashboard-nodes
+        name: grafana-dashboard-nodes
+      - configMap:
+          name: grafana-dashboard-pods
+        name: grafana-dashboard-pods
+      - configMap:
+          name: grafana-dashboard-statefulset
+        name: grafana-dashboard-statefulset