Merge pull request #307 from grafana/datasources-in-json

Allow datasources as JSON objects not just YAML strings

Author: malcolmholmes

prometheus-ksonnet/grafana/datasources.libsonnet

@@ -13,7 +13,7 @@
 
   // Generates yaml string containing datasource config
   grafana_datasource(name, url, default=false, method='GET')::
-    $.util.manifestYaml({
+    {
       apiVersion: 1,
       datasources: [{
         name: name,
@@ -27,7 +27,7 @@
           httpMethod: method,
         },
       }],
-    }),
+    },
 
   /*
     helper to allow adding datasources directly to the datasource_config_map
@@ -38,12 +38,12 @@
   */
   grafana_add_datasource(name, url, default=false, method='GET')::
     configMap.withDataMixin({
-      ['%s.yml' % name]: $.grafana_datasource(name, url, default, method),
+      ['%s.yml' % name]: $.util.manifestYaml($.grafana_datasource(name, url, default, method)),
     }),
 
   // Generates yaml string containing datasource config
   grafana_datasource_with_basicauth(name, url, username, password, default=false, method='GET')::
-    $.util.manifestYaml({
+    {
       apiVersion: 1,
       datasources: [{
         name: name,
@@ -60,7 +60,7 @@
           httpMethod: method,
         },
       }],
-    }),
+    },
 
   /*
    helper to allow adding datasources directly to the datasource_config_map
@@ -71,13 +71,18 @@
   */
   grafana_add_datasource_with_basicauth(name, url, username, password, default=false, method='GET')::
     configMap.withDataMixin({
-      ['%s.yml' % name]: $.grafana_datasource_with_basicauth(name, url, username, password, default, method),
+      ['%s.yml' % name]: $.util.manifestYaml($.grafana_datasource_with_basicauth(name, url, username, password, default, method)),
     }),
 
   grafana_datasource_config_map:
     configMap.new('grafana-datasources') +
     configMap.withDataMixin({
-      [name]: std.toString($.grafanaDatasources[name])
+      [name]: (
+        if std.isString($.grafanaDatasources[name]) then
+          $.grafanaDatasources[name]
+        else
+          $.util.manifestYaml($.grafanaDatasources[name])
+      )
       for name in std.objectFields($.grafanaDatasources)
     }) +
     configMap.mixin.metadata.withLabels($._config.grafana_datasource_labels),