Merge pull request #115 from jakubplichta/refresh

By default refresh all queries in query string
jakubplichta · Oct 31, 2017 · c6b515d · c6b515d
2 parents ee1a14d + b7ad109
commit c6b515d
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 3 deletions.
diff --git a/grafana_dashboards/components/templates.py b/grafana_dashboards/components/templates.py
@@ -34,16 +34,17 @@ def gen_json_from_data(self, data, context):
         queries = []
         if not data.get('query'):
             return queries
+        refresh_only_first = data.get('refresh-only-first', False)
         for query_part in data['query'].split('.'):
             if query_part.startswith('$'):
                 is_first = False if queries else True
                 query = query_part[1:]
                 metric = '*'
                 template_json = {
                     'type': 'query',
-                    'refresh_on_load': is_first,
+                    'refresh_on_load': not refresh_only_first or is_first,
                     'name': query,
-                    'refresh': is_first
+                    'refresh': not refresh_only_first or is_first
                 }
                 if query in data:
                     query_config = data[query]

diff --git a/tests/grafana_dashboards/components/query/defaults.json b/tests/grafana_dashboards/components/query/defaults.json
@@ -1 +1,16 @@
-[]
+[
+  {
+    "name": "var1",
+    "query": "test.*",
+    "refresh": true,
+    "refresh_on_load": true,
+    "type": "query"
+  },
+  {
+    "name": "var2",
+    "query": "test.$var1.*",
+    "refresh": true,
+    "refresh_on_load": true,
+    "type": "query"
+  }
+]
diff --git a/tests/grafana_dashboards/components/query/defaults.yaml b/tests/grafana_dashboards/components/query/defaults.yaml
@@ -1 +1,2 @@
 query:
+  query: test.$var1.$var2
diff --git a/tests/grafana_dashboards/components/query/empty.json b/tests/grafana_dashboards/components/query/empty.json
@@ -0,0 +1 @@
+[]
diff --git a/tests/grafana_dashboards/components/query/empty.yaml b/tests/grafana_dashboards/components/query/empty.yaml
@@ -0,0 +1 @@
+query:
diff --git a/tests/grafana_dashboards/components/query/full.yaml b/tests/grafana_dashboards/components/query/full.yaml
@@ -1,5 +1,6 @@
 query:
   query: part1.$var1.part2.$var2.$var3
+  refresh-only-first: true
   var1:
     metric: '*x*'
     current: o1