From: lavado Date: Fri, 20 Mar 2020 21:59:41 +0000 (-0500) Subject: Adds osm_automated tag to automated dashboards X-Git-Tag: v7.1.0rc1~1^2 X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F08%2F8708%2F2;p=osm%2FMON.git Adds osm_automated tag to automated dashboards Fixes Bug 1027. Change-Id: Id4ef8828b93acc6a68b1020ff25043c36f4878e5 Signed-off-by: lavado (cherry picked from commit e304bb892c98c77665910de132ae940d62a89666) --- diff --git a/osm_mon/dashboarder/backends/grafana.py b/osm_mon/dashboarder/backends/grafana.py index 491cd52..4f1fe52 100644 --- a/osm_mon/dashboarder/backends/grafana.py +++ b/osm_mon/dashboarder/backends/grafana.py @@ -34,7 +34,8 @@ headers = { def get_all_dashboard_uids(): - response = requests.request("GET", url + "search?query=%", headers=headers) + # Gets only dashboards that were automated by OSM (with tag 'osm_automated') + response = requests.request("GET", url + "search?tag=osm_automated", headers=headers) dashboards = response.json() dashboard_uids = [] for dashboard in dashboards: diff --git a/osm_mon/dashboarder/templates/ns_scoped.json b/osm_mon/dashboarder/templates/ns_scoped.json index 977ec21..222d836 100644 --- a/osm_mon/dashboarder/templates/ns_scoped.json +++ b/osm_mon/dashboarder/templates/ns_scoped.json @@ -585,7 +585,7 @@ "refresh": "5s", "schemaVersion": 20, "style": "dark", - "tags": [], + "tags": ["osm_automated"], "templating": { "list": [ { diff --git a/osm_mon/dashboarder/templates/project_scoped.json b/osm_mon/dashboarder/templates/project_scoped.json index e58d922..2f49164 100644 --- a/osm_mon/dashboarder/templates/project_scoped.json +++ b/osm_mon/dashboarder/templates/project_scoped.json @@ -547,7 +547,7 @@ "refresh": "5s", "schemaVersion": 20, "style": "dark", - "tags": [], + "tags": ["osm_automated"], "templating": { "list": [ {