Adds alias field to the Elastic target datasource

grafana_dashboards/client/grafana.py

@@ -51,5 +51,8 @@ def process_dashboard(self, project_name, dashboard_name, dashboard_data):
         if 'folderId' in dashboard_data:
             body.update({'folderId': dashboard_data['folderId']})
 
+        if 'uid' in dashboard_data:
+            body.update({'uid': dashboard_data['uid']})
+
         logger.info("Uploading dashboard '%s' to %s", dashboard_name, self._host)
         self._connection.make_request('/api/dashboards/db', body)

grafana_dashboards/components/dashboards.py

@@ -54,6 +54,8 @@ def gen_json_from_data(self, data, context):
             json_data['refresh'] = data.get('refresh')
         if 'folderId' in data:
             json_data['folderId'] = data.get('folderId')
+        if 'uid' in data:
+            json_data['uid'] = data.get('uid')
         if get_component_type(Annotations) in data:
             json_data['annotations'] = {'list': self.registry.create_component(Annotations, data).gen_json()}
         if get_component_type(Rows) in data:

grafana_dashboards/components/targets.py

@@ -75,7 +75,7 @@ def gen_json_from_data(self, data, context):
 
 
 class ElasticTarget(TargetsItemBase):
-    _copy_fields = {'bucketAggs', 'hide', 'metrics', 'refId', 'timeField', 'datasource'}
+    _copy_fields = {'bucketAggs', 'hide', 'metrics', 'refId', 'timeField', 'datasource', 'alias'}
 
     def gen_json_from_data(self, data, context):
         template_json = super(ElasticTarget, self).gen_json_from_data(data, context)

samples/elastic.yaml

@@ -34,6 +34,7 @@
             targets:
             - elastic-target:
                 query: '(status: "succeeded")'
+                alias: 'Alias'
                 bucketAggs:
                 - field: finishedAt
                   type: date_histogram

samples/project.yaml

@@ -20,6 +20,7 @@
 
 - name: overview
   dashboard:
+    uid: 'uid{dashboard-prefix}'
     title: '{dashboard-prefix} Overview'
     tags:
       - tag1

tests/grafana_dashboards/client/test_grafana.py

@@ -28,7 +28,7 @@ def test_grafana():
     dashboard_data = {'title': 'title', 'tags': []}
     exporter.process_dashboard('project_name', 'dashboard_name', dashboard_data)
 
-    body = {'overwrite': True, 'dashboard': dashboard_data}
+    body = {'overwrite': True, 'dashboard': dashboard_data, 'message': ''}
     # noinspection PyProtectedMember
     exporter._connection.make_request.assert_called_once_with('/api/dashboards/db',
                                                               body)
@@ -41,7 +41,7 @@ def test_grafana_with_kerberos():
     dashboard_data = {'title': 'title', 'tags': []}
     exporter.process_dashboard('project_name', 'dashboard_name', dashboard_data)
 
-    body = {'overwrite': True, 'dashboard': dashboard_data}
+    body = {'overwrite': True, 'dashboard': dashboard_data, 'message': ''}
     # noinspection PyProtectedMember
     exporter._connection.make_request.assert_called_once_with('/api/dashboards/db',
                                                               body)

tests/grafana_dashboards/components/elastic-target/full_with_alias.json

@@ -0,0 +1,27 @@
+{
+  "query": "(status: 'succeeded')",
+  "alias": "Alias",
+  "bucketAggs": [
+    {
+      "field": "finishedAt",
+      "id": "2",
+      "settings": {
+        "interval": "auto",
+        "min_doc_count": 1,
+        "trimEdges": 0
+      },
+      "type": "date_histogram"
+    }
+  ],
+  "hide": false,
+  "metrics": [
+    {
+      "field": "select metric",
+      "id": "1",
+      "type": "count"
+    }
+  ],
+  "refId": "A",
+  "timeField": "finishedAt",
+  "datasource": "default"
+}

tests/grafana_dashboards/components/elastic-target/full_with_alias.yaml

@@ -0,0 +1,19 @@
+elastic-target:
+  query: "(status: 'succeeded')"
+  alias: "Alias"
+  bucketAggs:
+  - field: finishedAt
+    type: date_histogram
+    id: "2"
+    settings:
+      interval: 'auto'
+      min_doc_count: 1
+      trimEdges: 0
+  hide: false
+  metrics: 
+  - field: "select metric"
+    id: "1"
+    type: count                
+  refId: "A"
+  timeField: finishedAt
+  datasource: default