examples,jsonnet: expose kubernetes-grafana API to fix grafana examples

Signed-off-by: paulfantom <pawel@krupa.net.pl>

examples/grafana-additional-jsonnet-dashboard-example.jsonnet

@@ -6,34 +6,36 @@ local template = grafana.template;
 local graphPanel = grafana.graphPanel;
 
 local kp = (import 'kube-prometheus/main.libsonnet') + {
-  _config+:: {
+  values+:: {
-    namespace: 'monitoring',
+    common+:: {
-  },
+      namespace: 'monitoring',
-  grafana+:: {
+    },
-    dashboards+:: {
+    grafana+: {
-      'my-dashboard.json':
+      dashboards+:: {
-        dashboard.new('My Dashboard')
+        'my-dashboard.json':
-        .addTemplate(
+          dashboard.new('My Dashboard')
-          {
+          .addTemplate(
-            current: {
+            {
-              text: 'Prometheus',
+              current: {
-              value: 'Prometheus',
+                text: 'Prometheus',
+                value: 'Prometheus',
+              },
+              hide: 0,
+              label: null,
+              name: 'datasource',
+              options: [],
+              query: 'prometheus',
+              refresh: 1,
+              regex: '',
+              type: 'datasource',
             },
-            hide: 0,
+          )
-            label: null,
+          .addRow(
-            name: 'datasource',
+            row.new()
-            options: [],
+            .addPanel(graphPanel.new('My Panel', span=6, datasource='$datasource')
-            query: 'prometheus',
+                      .addTarget(prometheus.target('vector(1)')))
-            refresh: 1,
+          ),
-            regex: '',
+      },
-            type: 'datasource',
-          },
-        )
-        .addRow(
-          row.new()
-          .addPanel(graphPanel.new('My Panel', span=6, datasource='$datasource')
-                    .addTarget(prometheus.target('vector(1)')))
-        ),
     },
   },
 };

examples/grafana-additional-rendered-dashboard-example-2.jsonnet

@@ -1,10 +1,12 @@
 local kp = (import 'kube-prometheus/main.libsonnet') + {
-  _config+:: {
+  values+:: {
-    namespace: 'monitoring',
+    common+:: {
-  },
+      namespace: 'monitoring',
-  grafana+:: {
+    },
-    rawDashboards+:: {
+    grafana+: {
-      'my-dashboard.json': (importstr 'example-grafana-dashboard.json'),
+      rawDashboards+:: {
+        'my-dashboard.json': (importstr 'example-grafana-dashboard.json'),
+      },
     },
   },
 };

examples/grafana-additional-rendered-dashboard-example.jsonnet

@@ -1,13 +1,12 @@
 local kp = (import 'kube-prometheus/main.libsonnet') + {
-  _config+:: {
+  values+:: {
-    namespace: 'monitoring',
+    common+:: {
-  },
+      namespace: 'monitoring',
-  grafanaDashboards+:: {  //  monitoring-mixin compatibility
+    },
-    'my-dashboard.json': (import 'example-grafana-dashboard.json'),
+    grafana+: {
-  },
+      dashboards+:: {  // use this method to import your dashboards to Grafana
-  grafana+:: {
+        'my-dashboard.json': (import 'example-grafana-dashboard.json'),
-    dashboards+:: {  // use this method to import your dashboards to Grafana
+      },
-      'my-dashboard.json': (import 'example-grafana-dashboard.json'),
     },
   },
 };

jsonnet/kube-prometheus/components/grafana.libsonnet

@@ -22,6 +22,10 @@ local defaults = {
   },
   prometheusName: error 'must provide prometheus name',
   dashboards: {},
+  // TODO(paulfantom): expose those to have a stable API. After kubernetes-grafana refactor those could probably be removed.
+  rawDashboards: {},
+  folderDashboards: {},
+  containers: [],
 };
 
 function(params) {
@@ -47,6 +51,9 @@ function(params) {
         labels: g.config.commonLabels,
         dashboards: g.config.dashboards,
         resources: g.config.resources,
+        rawDashboards: g.config.rawDashboards,
+        folderDashboards: g.config.folderDashboards,
+        containers: g.config.containers,
       },
     },
   },