Skip to content

Commit 5fe3b74

Browse files
committed
Added code to update grafana dashboards on monitoring-integration start
Signed-off-by: Anmol Sachan <[email protected]>
1 parent 50427c4 commit 5fe3b74

File tree

4 files changed

+13
-85
lines changed

4 files changed

+13
-85
lines changed

setup.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,6 @@ def run(self):
114114
'console_scripts': [
115115
'tendrl-monitoring-integration = \
116116
tendrl.monitoring_integration.manager:main',
117-
'tendrl-upgrade = \
118-
tendrl.monitoring_integration.upgrades.delete_dashboards:main',
119117
],
120118
},
121119
url="http://www.redhat.com",

tendrl/monitoring_integration/grafana/dashboard.py

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,19 @@ def upload_default_dashboards():
3030
datasource.create()
3131
dashboards = dashboard_utils.get_all_dashboards()
3232
for dashboard_json in dashboards:
33-
title.append(dashboard_json["uri"].split('/')[1])
33+
dashboard = dashboard_json["uri"].split('/')[1]
34+
title.append(dashboard)
35+
# Deleting already existing dashboards if present
36+
response = dashboard_utils.delete_dashboard(dashboard)
37+
if 'title' in response:
38+
msg = "\n Already existing %s deleted. \n" % dashboard
39+
logger.log("debug", NS.get("publisher_id", None),
40+
{'message': msg})
41+
else:
42+
msg = "\n%s delete failed with error: %s \n" % (dashboard,
43+
str(response))
44+
logger.log("debug", NS.get("publisher_id", None),
45+
{'message': msg})
3446

3547
for dashboard_json in NS.config.data["dashboards"]:
3648
if dashboard_json in title:

tendrl/monitoring_integration/upgrades/__init__.py

Whitespace-only changes.

tendrl/monitoring_integration/upgrades/delete_dashboards.py

Lines changed: 0 additions & 82 deletions
This file was deleted.

0 commit comments

Comments
 (0)