From e9c7b3e9e30a79c7c071afd9be41f268d2e6352f Mon Sep 17 00:00:00 2001 From: "Steve Nyemba, The Architect" Date: Mon, 15 Oct 2018 10:46:39 -0500 Subject: [PATCH] bug fix with layout --- src/api/index.py | 1 + src/api/templates/dashboard/apps/summary.html | 89 ++++++++++++++++--- src/utils/charting.py | 2 +- src/utils/ml/analytics.py | 6 +- 4 files changed, 82 insertions(+), 16 deletions(-) diff --git a/src/api/index.py b/src/api/index.py index 0266064..e4b9b4b 100755 --- a/src/api/index.py +++ b/src/api/index.py @@ -219,6 +219,7 @@ def get_board(): args['app_summary'] = session['apps.summary'] args['app_grid'] = session['apps.grid'] args['folders_summary'] = session['folders.summary'] + # args['resource'] = session['resource'] args['folder_size'] = session['folders.max_size'] diff --git a/src/api/templates/dashboard/apps/summary.html b/src/api/templates/dashboard/apps/summary.html index fe3c7dc..93a1cf5 100644 --- a/src/api/templates/dashboard/apps/summary.html +++ b/src/api/templates/dashboard/apps/summary.html @@ -4,7 +4,7 @@ --> - + @@ -20,7 +20,8 @@ display:grid ; grid-template-rows: 32px auto; grid-gap:4px; - height:99%; + height:99%; + } @@ -34,7 +35,7 @@ .widget { width:100%; - height:90%; + height:90%; } .widget .title { @@ -102,6 +103,13 @@ .fa-times {color:maroon} .fa-folder-open {color:#FF7F24;} .fa-cog {color:#d3d3d3} + .busy { + display:flex ; + align-items: center; + justify-content: center; + height:100%; + + } +
+
+ + + +
Loading dashboard ...
+
+
@@ -172,7 +191,7 @@
Status Counts
-

+
{{ app_summary[loop.index-1].crash}}
@@ -189,7 +208,30 @@

Resource Usage

+ +
+ Total Resource Usage +
+
+
+
+
+ {{session['apps.resource'][loop.index -1].x[0][1] + session['apps.resource'][loop.index -1].x[0][0] }} + % +
+
CPU
+
+ +
+
+ {{session['apps.resource'][loop.index -1].x[1][0] + session['apps.resource'][loop.index -1].x[1][1]}} + % + +
+
RAM
+
+
@@ -208,17 +250,34 @@
{{ row.files}}
Files
-
-
{{ row.size}}
-
MB Used
-
-
-
{{ row.max_size}}
-
MB Threshold
-
+ + {% if row.size > 1000 %} +
+
{{ (row.size / 1000) | round(2) }}
+
GB Used
+
+
+
{{ (row.max_size / 1000) | round(2) }}
+
GB Threshold
+
+ {% else %} +
+
{{ row.size }}
+
MB Used
+
+
+
{{ row.max_size}}
+
MB Threshold
+
+ {% endif %} + +
{% endif %} + {% if loop.index == nodes|length %} + + {% endif %} {% endfor %}
@@ -230,10 +289,16 @@
+ + {% endfor %} + +
diff --git a/src/utils/charting.py b/src/utils/charting.py index c5cef07..db0d2f2 100644 --- a/src/utils/charting.py +++ b/src/utils/charting.py @@ -137,7 +137,7 @@ class HTMLGraph(Graph): config["data"]["labels"] = labels if isinstance(X[0],list) == False : X = [X[0]] - print series + for row in X : index = X.index(row) diff --git a/src/utils/ml/analytics.py b/src/utils/ml/analytics.py index 2d3bfc9..04a2039 100644 --- a/src/utils/ml/analytics.py +++ b/src/utils/ml/analytics.py @@ -134,7 +134,8 @@ class apps(analytics) : N = df.shape[0] - 1 other_df = pd.DataFrame(df[df.name.str.contains('other',na=False)]) watch_df = pd.DataFrame(df[df.name.str.contains('other',na=False)==False]) - X = [[other_df.cpu.sum(),other_df.mem.sum()],[watch_df.cpu.sum(),watch_df.mem.sum()]] + X = [[other_df.cpu.sum(),watch_df.cpu.sum()],[other_df.mem.sum(),watch_df.mem.sum()]] + date= data[node]['date']['long'] q.append({"node":node, "x":X,"labels":labels, "title":title,"series":series,"ylabel":ylabel}) crash = watch_df.status.str.contains('X').sum() @@ -188,8 +189,7 @@ class folders(analytics): self.set('max_size',max_size) for node in data : df = pd.DataFrame(data[node]['logs']) - N = df.shape[0] - print ' --- ',df.size_in_kb.values + N = df.shape[0] df = pd.DataFrame(df.mean()[['size_in_kb','files','age_in_days']]).T r.append({"node":node,"folders":N, "max_size":max_size,"size":np.round(df.size_in_kb.values[0]*.000001,2),"age":df.age_in_days.values[0].round(2),"files":df.files.values[0].round(2)})