Merge "Default dashboard timezone to UTC"

grafana_dashboards/schema/dashboard.py

@@ -21,6 +21,7 @@ class Dashboard(object):
 
     def get_schema(self):
         dashboard = {
+            v.Required('timezone', default='utc'): v.Any('browser', 'utc'),
             v.Required('title'): v.All(str, v.Length(min=1)),
             v.Optional('id'): int,
         }

tests/schema/fixtures/dashboard-0001.json

@@ -2,6 +2,7 @@
     "dashboard": {
         "new-dashboard": {
             "rows": [],
+            "timezone": "utc",
             "title": "New dashboard"
         }
     }

tests/schema/fixtures/dashboard-0002.json

@@ -11,6 +11,7 @@
                     "title": "New row"
                 }
             ],
+            "timezone": "utc",
             "title": "New dashboard"
         }
     }

tests/schema/fixtures/dashboard-0003.json

@@ -23,6 +23,7 @@
                     "title": "New row"
                 }
             ],
+            "timezone": "utc",
             "title": "New dashboard"
         }
     }

tests/schema/fixtures/dashboard-0004.json

@@ -21,6 +21,7 @@
                     "title": "New row"
                 }
             ],
+            "timezone": "utc",
             "title": "New dashboard"
         }
     }

tests/schema/fixtures/dashboard-0005.json

@@ -31,6 +31,7 @@
                     "title": "New row"
                 }
             ],
+            "timezone": "utc",
             "title": "New dashboard"
         }
     }

tests/schema/fixtures/dashboard-0006.json

@@ -36,6 +36,7 @@
                     "title": "New row"
                 }
             ],
+            "timezone": "utc",
             "title": "New dashboard"
         }
     }

tests/schema/fixtures/dashboard-0007.json

@@ -41,6 +41,7 @@
                     "title": "bar"
                 }
             ],
+            "timezone": "utc",
             "title": "New dashboard"
         }
     }

tests/schema/fixtures/dashboard-0008.json

@@ -0,0 +1,9 @@
+{
+    "dashboard": {
+        "new-dashboard": {
+            "rows": [],
+            "timezone": "browser",
+            "title": "New dashboard"
+        }
+    }
+}

tests/schema/fixtures/dashboard-0008.yaml

@@ -0,0 +1,3 @@
+dashboard:
+  timezone: browser
+  title: New dashboard

tests/test_parser.py

@@ -33,8 +33,16 @@ class TestCaseParser(TestCase):
             os.path.dirname(__file__), 'fixtures/parser/dashboard-0001.yaml')
         self.parser.parse(path)
         dashboard = {
-            'foobar': {'rows': [], 'title': 'foobar'},
-            'new-dashboard': {'rows': [], 'title': 'New dashboard'},
+            'foobar': {
+                'rows': [],
+                'timezone': 'utc',
+                'title': 'foobar',
+            },
+            'new-dashboard': {
+                'rows': [],
+                'timezone': 'utc',
+                'title': 'New dashboard',
+            },
         }
 
         # Get parsed dashboard
@@ -61,7 +69,11 @@ class TestCaseParser(TestCase):
             os.path.dirname(__file__), 'fixtures/parser/dashboard-0001.yaml')
         self.parser.parse(path)
         dashboard = {
-            'new-dashboard': {'rows': [], 'title': 'New dashboard'},
+            'new-dashboard': {
+                'rows': [],
+                'timezone': 'utc',
+                'title': 'New dashboard',
+            },
         }
 
         # Get parsed dashboard