From 0ece42f99ee2a0cf9e422607e1be48b7075cdd4e Mon Sep 17 00:00:00 2001 From: GowthamShanmugasundaram Date: Thu, 4 Oct 2018 16:38:46 +0000 Subject: [PATCH] Fixing alert dashboard issue with grafana 5.x.x I did small change to work existing alerting logic to work with latest grafana. tendrl-bug-id: Tendrl/monitoring-integration#372 Signed-off-by: GowthamShanmugasundaram --- tendrl/monitoring_integration/grafana/alert_dashboard.py | 5 +++-- tendrl/monitoring_integration/grafana/dashboard.py | 2 -- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/tendrl/monitoring_integration/grafana/alert_dashboard.py b/tendrl/monitoring_integration/grafana/alert_dashboard.py index 06ee866..c1ec08b 100644 --- a/tendrl/monitoring_integration/grafana/alert_dashboard.py +++ b/tendrl/monitoring_integration/grafana/alert_dashboard.py @@ -140,8 +140,8 @@ def create_resource_dashboard(resource_name, resource): "repeat": None, "repeatIteration": None, "repeatRowId": None, - "showTitle": False, - "title": "Dashboard Row", + "showTitle": True, + "title": resource["resource_name"], "titleSize": "h6" } new_resource_panels = get_panels(resource_rows) @@ -315,6 +315,7 @@ def add_gluster_resource_panel( resource_type = "nodes" panel_count = most_recent_panel_id for alert_row in alert_rows: + alert_row["title"] = resource_name panel_count += 1 for panel in alert_row["panels"]: targets = panel["targets"] diff --git a/tendrl/monitoring_integration/grafana/dashboard.py b/tendrl/monitoring_integration/grafana/dashboard.py index 8c2e822..fa5036c 100644 --- a/tendrl/monitoring_integration/grafana/dashboard.py +++ b/tendrl/monitoring_integration/grafana/dashboard.py @@ -60,8 +60,6 @@ def upload_default_dashboards(): if 'dashboard' in dashboard_json: dashboard_id = dashboard_json.get('dashboard').get('id') - response = dashboard_utils.set_home_dashboard(dashboard_id) - response = dashboard_utils.set_home_dashboard(dashboard_id) if response.status_code == 200: msg = '\n' + "Dashboard " + \