Merge pull request #123 from jakubplichta/improvements

Add support for allFormat and allValue in templating

grafana_dashboards/components/templates.py

@@ -59,7 +59,7 @@ def gen_json_from_data(self, data, context):
                         template_json['options'] = [{'text': option, 'value': option} for option in
                                                     (query_config['options'])]
 
-                    for key in ['regex', 'multi', 'includeAll', 'hide']:
+                    for key in ['regex', 'multi', 'includeAll', 'hide', 'allFormat', 'allValue']:
                         if key in query_config:
                             template_json[key] = query_config[key]
 

samples/config.yaml

@@ -2,6 +2,10 @@ elastic-search:
   host: https://this-is-my-domain.com
   password: my_password
   username: my_username
+grafana:
+  host: http://localhost:8380
+  username: admin
+  password: admin
 file:
   output_folder: ./out
 context:

samples/project.yaml

@@ -16,6 +16,7 @@
       - '{component}-connections'
       - '{component}-{env}-{nodes}-system-details'
       - 'some dashboard'
+      - docker-statsd
 
 - default-dashboard: &default-dashboard
     time_options: [1h, 6h, 12h, 24h, 2d, 7d, 14d, 30d]
@@ -215,3 +216,23 @@
   yaxes:
     - yaxis:
         format: bytes
+
+- name: docker-statsd
+  dashboard:
+    title: Docker statsd
+    <<: *default-dashboard
+    templates:
+      - query:
+          query: 'stats.statsd.graphiteStats.$metric'
+          metric:
+            current: calculationtime
+            includeAll: true
+            multi: true
+            current: All
+    rows:
+      - row:
+          panels:
+            - graph:
+                title: dynamic
+                target: 'stats.statsd.graphiteStats.$metric'
+                repeat: metric

tests/grafana_dashboards/components/query/full.json

@@ -29,6 +29,8 @@
     "type": "query",
     "multi": true,
     "includeAll": true,
+    "allFormat": "glob",
+    "allValue": "test*",
     "hide": 2
   },
   {

tests/grafana_dashboards/components/query/full.yaml

@@ -10,5 +10,7 @@ query:
     regex: '/opt\^(value)\^\w+/'
   var2:
     includeAll: true
+    allFormat: glob
+    allValue: test*
     multi: true
     hide: 2