Merge "Remove query variable refresh deprecation"

grafana_dashboards/schema/template/query.py

@@ -23,18 +23,13 @@ LOG = logging.getLogger(__name__)
 
 class Query(Base):
 
-    def validate_refresh(self, data):
-        v.Schema(v.Any(v.All(int, v.Range(min=0, max=2)), bool))(data)
-        if isinstance(data, bool):
-            LOG.warn('templating query refresh type bool is deprecated')
-        return data
-
     def get_schema(self):
         query = {
             v.Required('includeAll', default=False): v.All(bool),
             v.Required('multi', default=False): v.All(bool),
             v.Required('query', default=''): v.All(str),
-            v.Required('refresh', default=0): self.validate_refresh,
+            v.Required('refresh', default=1): \
+                v.All(int, v.Range(min=0, max=2)),
             v.Optional('datasource'): v.All(str),
             v.Optional('hide'): v.All(int, v.Range(min=0, max=2)),
         }

tests/schema/fixtures/dashboard-0014.json

@@ -10,7 +10,7 @@
                         "multi": false,
                         "name": "foobar",
                         "query": "foobar.*",
-                        "refresh": 0,
+                        "refresh": 1,
                         "type": "query"
                     }
                 ]

tests/schema/fixtures/dashboard-0021.json

@@ -45,7 +45,7 @@
                         "multi": false,
                         "name": "hostname",
                         "query": "node*",
-                        "refresh": true,
+                        "refresh": 1,
                         "type": "query"
                     }
                 ]

tests/schema/fixtures/dashboard-0021.yaml

@@ -7,7 +7,7 @@ dashboard:
       type: query
       datasource: graphite
       query: node*
-      refresh: true
+      refresh: 1
   title: New dashboard
   rows:
     - title: New row

tests/schema/fixtures/dashboard-0023.json

@@ -59,7 +59,7 @@
                         "multi": false,
                         "name": "hostname",
                         "query": "node*",
-                        "refresh": true,
+                        "refresh": 1,
                         "type": "query"
                     }
                 ]

tests/schema/fixtures/dashboard-0023.yaml

@@ -4,7 +4,7 @@ dashboard:
       type: query
       datasource: graphite
       query: node*
-      refresh: true
+      refresh: 1
       hide: 0
   title: New dashboard
   rows: