library
/
smart-top
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug fix with graphical layout

Browse Source
community
Steve L. Nyemba 6 years ago
parent e81835d919
commit e9a26521bb
3 changed files with 89 additions and 36 deletions
Show Stats Download Patch File Download Diff File

95
src/api/templates/dashboard/apps/summary.html
Unescape View File

@ -39,11 +39,12 @@
}
.widget .title {
font-size:22px;
font-size:18px;
align-items: center;
display:grid;
grid-template-columns: auto 95px;
grid-gap:2px;
min-height:24px;
}
.widget .chart {
display:grid;
@ -102,7 +103,7 @@
.fa-ellipsis-h {color:orange}
.fa-times {color:maroon}
.fa-folder-open {color:#FF7F24;}
.fa-cog {color:#d3d3d3}
.fa-cog {color:gray}
.busy {
display:flex ;
align-items: center;
@ -127,13 +128,14 @@
// })
{{app_summary|tojson}}
var render_grid = function(name){
var logs = {{app_logs|tojson}}
var logs = {{app_logs|tojson}}[name]['logs']
var config = {{ app_grid|tojson}}
config.data = logs[name]
config.data = logs
config.fields[config.fields.length-1].itemTemplate = function(value,item){
var p = {"X":"fa fa-times","S":"fa fa-ellipsis-h","S+":"fa fa-ellipsis-h","R":"fa fa-check"}
var i = jx.dom.get.instance('I')
i.className = p[value]
i.className = p[value] != null? p[value]: 'fa fa-cog fa-spin'
return i
}
var id = '#app_grid_'+name
@ -163,7 +165,7 @@
<div class="search">
<input type="text" placeholder="[Node/Data Collector]">
<div align="left" style="align-items: center">
<span class="active"><i class="fa fa-times"></i></span>
<span class="active"><i class="fa fa-trash"></i></span>
</div>
</div>
<div class=" border-round">
@ -182,8 +184,9 @@
</div>
<div id="{{name}}" class="chart">
<div class="no-border border-right">
<div align="center">
<h3>Crash Analysis</h3>
<div align="center" style="padding:8px">
<div class="bold">Crash Analysis</div>
<div class="small">{{ app_summary[loop.index -1 ].formatted_date }}</div>
</div>
@ -205,8 +208,9 @@
</div>
</div>
<div>
<div align="center">
<h3>Resource Usage</h3>
<div align="center" style="padding:8px">
<div class="bold">Resource Usage</div>
<div class="small">{{ app_summary[loop.index -1 ].formatted_date }}</div>
</div>
<iframe class="no-border" src="{{context}}/1/plot/html/bar/apps.resource?index={{loop.index -1}}" scrolling="no"></iframe>
@ -217,7 +221,7 @@
<div class="stat-board">
<div class="number border">
<div class="value">
{{session['apps.resource'][loop.index -1].x[0][1] + session['apps.resource'][loop.index -1].x[0][0] }}
{{ (session['apps.resource'][loop.index -1].x[0][1] + session['apps.resource'][loop.index -1].x[0][0]) | round(2) }}
<span class="small">%</span>
</div>
<div class="unit">CPU</div>
@ -225,7 +229,7 @@
<div class="number border">
<div class="value">
{{session['apps.resource'][loop.index -1].x[1][0] + session['apps.resource'][loop.index -1].x[1][1]}}
{{ (session['apps.resource'][loop.index -1].x[1][0] + session['apps.resource'][loop.index -1].x[1][1]) | round(2)}}
<span class="small">%</span>
</div>
@ -234,26 +238,59 @@
</div>
</div>
<div class="border-left">
<div align="center">
<h3>Folder Analysis</h3>
</div>
{%for row in folders_summary %}
<div align="center" style="padding:8px">
<div class="bold">Folder Analysis</div>
<div class="small">{{ row.formatted_date }}</div>
</div>
{%if row.node == name %}
<div class="stat-board ">
<div class="number border">
<div class="value">{{ row.folders}}</div>
<div class="unit small">Folders</div>
<div class="" style="padding:4px; margin-left:10px; min-height:250px; overflow:hidden">
<li type="square" style="list-style-type: none">
<i class="fa fa-check" style="font-size:18px;"></i>
Monitoring <span class="bold">{{row.folders}}</span> Folder
{% if row.folders > 1%}
s
{% endif %}
</li>
<li type="square" style="margin-top:8px; list-style-type: none">
<i class="fa fa-check" style="font-size:18px;"></i>
<span class="bold">
{% if row.avg_folder_size > 1000 %}
{{ (row.avg_folder_size/1000)|round(2)}} GB
{% else %}
{{ row.avg_folder_size}} MB
{% endif %}
</span>/Folder monitored
</li>
<li type="square" style="margin-top:8px; list-style-type: none">
<i class="fa fa-check" style="font-size:18px;"></i>
<span class="bold">{{row.avg_files_folder}}</span> Files / Folder
</li>
<p>
<div class="small border-top" style=" font-family:verdana; margin-top:8px;padding:8px; color:#4682B4">
<br>The largest folder analysis, provides insight into what the largest folder size is, and if it has reached the archiving threshold.
</div>
<div class="number border">
<div class="value">{{ row.files}}</div>
<div class="unit small">Files</div>
</p>
</div>
<div align="center" class="bold">
Largest Folder
</div>
<br>
<div class="stat-board ">
{% if row.size > 1000 %}
{% if row.max_folder_size > 1000 %}
<div class="number border">
<div class="value">{{ (row.size / 1000) | round(2) }}</div>
<div class="value">{{ (row.max_folder_size / 1000) | round(2) }}</div>
<div class="unit small">GB Used</div>
</div>
<div class="number border">
@ -262,7 +299,7 @@
</div>
{% else %}
<div class="number border">
<div class="value">{{ row.size }}</div>
<div class="value">{{ row.max_folder_size }}</div>
<div class="unit small">MB Used</div>
</div>
<div class="number border">
@ -276,7 +313,11 @@
{% endif %}
{% if loop.index == nodes|length %}
<script>$('.busy').slideUp()</script>
<script>
setTimeout(function(){
$('.busy').slideUp('slow')
},1300)
</script>
{% endif %}
{% endfor %}
<div>

4
src/utils/charting.py
Unescape View File

@ -42,7 +42,9 @@ class Graph :
def scatter(self,**args):
pass
class ImageGraphs (Graph) :
"""
This framework is designed around matplotlib and generates an image that can be downloaded
"""
def __init__(self,format,**args) :
"""
@param width width in pixels

20
src/utils/ml/analytics.py
Unescape View File

@ -20,6 +20,9 @@ class analytics :
self.cache['key'] = args['key']
self.cache['name'] = self.__class__.__name__
self.init()
def get_formatted_date(self,row):
m = {1:"Jan",2:"Feb",3:"Mar",4:"Apr",5:"May",6:"Jun",7:"Jul",8:"Aug",9:"Sep",10:"Oct",11:"Nov",12:"Dec"}
return "-".join([m[row['month']],str(row['day']),str(row['year'])]) +" "+ " ".join([str(row['hour']),'h :',str(row['minute']),'min' ])
def init(self):
"""
Store logs as is per node i.e this enables to see the latest pull
@ -83,7 +86,7 @@ class apps(analytics) :
"""
analytics.init(self)
grid = {"width":"100%","editing":False,"rowClass":"small"}
grid['fields'] = [{"name":"name","title":"Process","headercss":"small"},{"name":"cpu","title":"CPU Usage","headercss":"small","type":"number"},{"name":"mem","title":"RAM Usage","headercss":"small","type":"number"},{"name":"status","title":"Status","headercss":"small","align":"center"}]
grid['fields'] = [{"name":"name","title":"Process","headercss":"small"},{"name":"cpu","title":"CPU Usage","headercss":"small","type":"number"},{"name":"mem","title":"RAM Usage","headercss":"small","type":"number"},{"name":"status","title":"Status","headercss":"small","align":"center","width":"32px"}]
self.set('grid',grid)
def summary(self,data):
@ -92,15 +95,17 @@ class apps(analytics) :
In terms of {crash,idle,running} counts
"""
r = []
for node in data :
logs = data[node]['logs']
date = data[node]['date']['long']
formatted_date = self.get_formatted_date(data[node]['date'])
df = pd.DataFrame(logs)
df = df[df.name.str.contains('other',na=False)==False]
crash = df.status.str.contains('X').sum()
idle = df.status.str.contains('S').sum()
running = df.shape[0] - crash - idle
r.append({"date":date,"node":node,"running":running,"idle":idle,"crash":crash})
r.append({"date":date,"node":node,"running":running,"idle":idle,"crash":crash,"formatted_date":formatted_date})
return r
# logs = pd.DataFrame(self.get('logs'))
@ -137,11 +142,12 @@ class apps(analytics) :
X = [[other_df.cpu.sum(),watch_df.cpu.sum()],[other_df.mem.sum(),watch_df.mem.sum()]]
date= data[node]['date']['long']
formatted_date = self.get_formatted_date(data[node]['date'])
q.append({"node":node, "x":X,"labels":labels, "title":title,"series":series,"ylabel":ylabel})
crash = watch_df.status.str.contains('X').sum()
idle = watch_df.status.str.contains('S').sum()
running = N - crash - idle
r.append( {"x":[crash,idle,running],"labels":['Crash','Idle','Running'],"title":"","date":date})
r.append( {"x":[crash,idle,running],"labels":['Crash','Idle','Running'],"title":"","date":date,"formatted_date":formatted_date})
self.set("resource",q)
self.set("status",r)
@ -187,12 +193,16 @@ class folders(analytics):
else:
max_size = 0
self.set('max_size',max_size)
q = []
for node in data :
df = pd.DataFrame(data[node]['logs'])
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)})
formatted_date = self.get_formatted_date(data[node]['date'])
r.append({"node":node,"folders":N, "max_size":max_size,"max_folder_size":np.round(df.size_in_kb.max()*.000001,2),"avg_folder_size":np.round(df.size_in_kb.mean()*.000001,2),"age":df.age_in_days.values[0].round(2),"avg_files_folder":df.files.max().round(2),"formatted_date":formatted_date})
X = [[np.round(df.size_in_kb.mean()*.000001,2),np.round(df.size_in_kb.max()*.000001,2)],[df.files.mean().round(2),df.files.max().round(2)]]
q.append({"node":node, "x":X,"labels":['Average','Largest'], "title":"","series":['Size (MB)','Files'],"ylabel":""})
self.set("analysis",q)
return r
# for id in logs :

Write Preview
Loading…
Cancel
Save