Merge pull request #319 from grafana/dont-wrap-datasources

Don't wrap datasources in an array

Author: malcolmholmes

prometheus-ksonnet/grafana/datasources.libsonnet

@@ -12,22 +12,18 @@
   grafanaDatasources+:: {},
 
   // Generates yaml string containing datasource config
-  grafana_datasource(name, url, default=false, method='GET')::
-    {
-      apiVersion: 1,
-      datasources: [{
-        name: name,
-        type: 'prometheus',
-        access: 'proxy',
-        url: url,
-        isDefault: default,
-        version: 1,
-        editable: false,
-        jsonData: {
-          httpMethod: method,
-        },
-      }],
+  grafana_datasource(name, url, default=false, method='GET', type='prometheus'):: {
+    name: name,
+    type: type,
+    access: 'proxy',
+    url: url,
+    isDefault: default,
+    version: 1,
+    editable: false,
+    jsonData: {
+      httpMethod: method,
     },
+  },
 
   /*
     helper to allow adding datasources directly to the datasource_config_map
@@ -38,29 +34,28 @@
   */
   grafana_add_datasource(name, url, default=false, method='GET')::
     configMap.withDataMixin({
-      ['%s.yml' % name]: $.util.manifestYaml($.grafana_datasource(name, url, default, method)),
+      ['%s.yml' % name]: $.util.manifestYaml({
+        apiVersion: 1,
+        datasources: [$.grafana_datasource(name, url, default, method)],
+      }),
     }),
 
   // Generates yaml string containing datasource config
-  grafana_datasource_with_basicauth(name, url, username, password, default=false, method='GET')::
-    {
-      apiVersion: 1,
-      datasources: [{
-        name: name,
-        type: 'prometheus',
-        access: 'proxy',
-        url: url,
-        isDefault: default,
-        version: 1,
-        editable: false,
-        basicAuth: true,
-        basicAuthUser: username,
-        basicAuthPassword: password,
-        jsonData: {
-          httpMethod: method,
-        },
-      }],
+  grafana_datasource_with_basicauth(name, url, username, password, default=false, method='GET', type='prometheus'):: {
+    name: name,
+    type: type,
+    access: 'proxy',
+    url: url,
+    isDefault: default,
+    version: 1,
+    editable: false,
+    basicAuth: true,
+    basicAuthUser: username,
+    basicAuthPassword: password,
+    jsonData: {
+      httpMethod: method,
     },
+  },
 
   /*
    helper to allow adding datasources directly to the datasource_config_map
@@ -71,17 +66,23 @@
   */
   grafana_add_datasource_with_basicauth(name, url, username, password, default=false, method='GET')::
     configMap.withDataMixin({
-      ['%s.yml' % name]: $.util.manifestYaml($.grafana_datasource_with_basicauth(name, url, username, password, default, method)),
+      ['%s.yml' % name]: $.util.manifestYaml({
+        apiVersion: 1,
+        datasources: [$.grafana_datasource_with_basicauth(name, url, username, password, default, method)],
+      }),
     }),
 
   grafana_datasource_config_map:
     configMap.new('grafana-datasources') +
     configMap.withDataMixin({
-      [name]: (
+      [if std.endsWith(name, '.yml') then name else name + '.yml']: (
         if std.isString($.grafanaDatasources[name]) then
           $.grafanaDatasources[name]
         else
-          $.util.manifestYaml($.grafanaDatasources[name])
+          $.util.manifestYaml({
+            apiVersion: 1,
+            datasources: [$.grafanaDatasources[name]],
+          })
       )
       for name in std.objectFields($.grafanaDatasources)
     }) +