From: palsus <subhankar.pal@altran.com>
Date: Wed, 13 May 2020 18:04:02 +0000 (+0200)
Subject: Merge "Adds osm_automated tag to automated dashboards Fixes Bug 1027." into v7.0
X-Git-Tag: v7.1.0rc1~1
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=9d210bd18c2e45c15ec5e38e69a58deacf68e243;hp=fb3acf42c75850b25218eaf13fbf07bca9148f61;p=osm%2FMON.git

Merge "Adds osm_automated tag to automated dashboards Fixes Bug 1027." into v7.0
---

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": [
       {