From af54eb4eb1b8411b94d01b4a35e68d4b89802829 Mon Sep 17 00:00:00 2001 From: akrzos Date: Thu, 15 Feb 2018 12:38:47 -0500 Subject: [PATCH] Allow repeating panels and to set minspan This allows dashboards that expand a templated var to multi-graphs Change-Id: I9b78958d836bbd4f73b06d6c302124857863c3d2 --- grafana_dashboards/schema/panel/graph.py | 2 ++ tests/schema/fixtures/dashboard-0023.json | 2 ++ tests/schema/fixtures/dashboard-0023.yaml | 2 ++ 3 files changed, 6 insertions(+) diff --git a/grafana_dashboards/schema/panel/graph.py b/grafana_dashboards/schema/panel/graph.py index f33a10e..d44ad22 100644 --- a/grafana_dashboards/schema/panel/graph.py +++ b/grafana_dashboards/schema/panel/graph.py @@ -143,10 +143,12 @@ class Graph(Base): v.Optional('legend'): v.All(legend), v.Required('lines', default=True): v.All(bool), v.Required('linewidth', default=2): v.All(int), + v.Optional('minSpan'): v.All(int, v.Range(min=0, max=12)), v.Optional('nullPointMode'): v.All(null_point_modes), v.Required('percentage', default=False): v.All(bool), v.Required('pointradius', default=5): v.All(int), v.Required('points', default=False): v.All(bool), + v.Optional('repeat'): v.All(str), v.Optional('rightYAxisLabel'): v.All(str, v.Length(min=1)), v.Optional('seriesOverrides'): v.All(series_overrides, v.Length(min=1)), diff --git a/tests/schema/fixtures/dashboard-0023.json b/tests/schema/fixtures/dashboard-0023.json index 61bbaa8..89f3408 100644 --- a/tests/schema/fixtures/dashboard-0023.json +++ b/tests/schema/fixtures/dashboard-0023.json @@ -26,9 +26,11 @@ }, "lines": true, "linewidth": 2, + "minSpan": 4, "percentage": false, "pointradius": 5, "points": false, + "repeat": "$hostname", "span": 12, "stack": false, "steppedLine": false, diff --git a/tests/schema/fixtures/dashboard-0023.yaml b/tests/schema/fixtures/dashboard-0023.yaml index 89f3f36..0bb4ef8 100644 --- a/tests/schema/fixtures/dashboard-0023.yaml +++ b/tests/schema/fixtures/dashboard-0023.yaml @@ -13,6 +13,8 @@ dashboard: - title: no title (click here) type: graph datasource: graphite + minSpan: 4 + repeat: $hostname targets: - target: $hostname.Cpu.cpu_prct_used legend: