From 48beabec0dbaf3b6bf30e68c763190b774cf771f Mon Sep 17 00:00:00 2001 From: Steve Nyemba Date: Mon, 17 Sep 2018 00:37:27 -0500 Subject: [PATCH] bug fix on chart (wrong labels) --- src/api/templates/dashboard/apps/summary.html | 1 + src/utils/ml/analytics.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/api/templates/dashboard/apps/summary.html b/src/api/templates/dashboard/apps/summary.html index e2937af..b660ec5 100644 --- a/src/api/templates/dashboard/apps/summary.html +++ b/src/api/templates/dashboard/apps/summary.html @@ -111,6 +111,7 @@ // config.data = apps // $('#grid').jsGrid(config) // }) + {{app_summary|tojson}} var render_grid = function(name){ var logs = {{app_logs|tojson}} var config = {{ app_grid|tojson}} diff --git a/src/utils/ml/analytics.py b/src/utils/ml/analytics.py index ffe5d41..ff7b602 100644 --- a/src/utils/ml/analytics.py +++ b/src/utils/ml/analytics.py @@ -103,7 +103,7 @@ class apps(analytics) : q = [] for row in slogs : - r.append( {"x":[row['running'],row['idle'],row['crash']],"labels":['Crash','Idle','Running'],"title":row['node'],"date":row['date']}) + r.append( {"x":[row['crash'],row['idle'],row['running']],"labels":['Crash','Idle','Running'],"title":row['node'],"date":row['date']}) # q.append({"x":[[row['cpu'],row['mem']]],"labels":["CPU","RAM"],"title":"Resources","date":row['date'],"title":row['node'],"series":[ 'CPU','RAM' ]}) q.append({"x":[[row['cpu'],0],[0,row['mem']]],"labels":["",""],"title":"Resources","date":row['date'],"title":row['node'],"series":[ 'CPU','RAM' ],"ylabel":"% Resource Used"})