diff --git a/src/api/index.py b/src/api/index.py index 30264b6..55facd2 100644 --- a/src/api/index.py +++ b/src/api/index.py @@ -53,9 +53,15 @@ f.close() # from threading import Thread, RLock p = {'uri':'http://dev.the-phi.com:5984','dbname':'monitor','uid':'logs','filename':'logs.JSON'} +p = CONFIG['store']['args'] +class_read = CONFIG['store']['class']['read'] +class_write= CONFIG['store']['class']['write'] factory = DataSourceFactory() -gWriter = factory.instance(type='CouchdbWriter',args=p) -gReader = factory.instance(type='CouchdbReader',args=p) +#gWriter = factory.instance(type='CouchdbWritera',args=p) +#gReader = factory.instance(type='CouchdbReader',args=p) + +gReader = factory.instance(type=class_read,args=p) +gWriter = factory.instance(type=class_write,args=p) mthread = monitor.Monitor(HANDLERS,gWriter,'processes',) @app.route('/get/') @@ -101,8 +107,8 @@ def trends (): series = [] for row in r: series += [item for item in row if str(item['label'])== app] - if len(series) > 24 : - beg = len(series) - 25 + if len(series) > 12 : + beg = len(series) - 13 series = series[beg:] return json.dumps(series) else: @@ -118,4 +124,4 @@ if __name__== '__main__': app.secret_key = 'A0Zr98j/3yX R~XHH!jmN]LWX=?RT' app.run(host='0.0.0.0',debug=True,threaded=True) - \ No newline at end of file + diff --git a/src/api/static/js/dashboard.js b/src/api/static/js/dashboard.js index d73dbb0..bdc975c 100644 --- a/src/api/static/js/dashboard.js +++ b/src/api/static/js/dashboard.js @@ -38,6 +38,12 @@ monitor.processes.init = function(x){ jx.dom.get.children('menu')[0].click() setTimeout(monitor.sandbox.init,3000) } + +/** +* This function renders the grid of processes being monitored, +* @param label label the list of processes belongs to +* @param data dataset of a selected set of processes (works a bit like top) +*/ monitor.processes.render = function(label,data) { data = jx.utils.patterns.visitor(data,function(row){ @@ -55,9 +61,9 @@ monitor.processes.render = function(label,data) { width: $('#latest_processes').width(), height:'auto' } options.paging = true - options.pageSize = 3 + options.pageSize = 4 options.pageIndex = 1 - options.pageButtonCount = 3 + options.pageButtonCount = 4 options.pagerContainer = '#latest_process_pager' options.pagerFormat= "{prev} Page {pageIndex} of {pageCount} {next}" options.pagePrevText= '' @@ -114,8 +120,10 @@ monitor.processes.trend.render = function (logs, key,label) { var frame = $('#trends_chart') jx.dom.set.value('trends_chart','') var context = jx.dom.get.instance('CANVAS') - - var conf = { type: 'line',responsive:true,maintainAspectRatio:true } + context.width = $(frame).width() + context.height= $(frame).height() + + var conf = { type: 'line',responsive:true } conf.data = {} conf.options = { legend: { position: 'bottom' } } conf.options.scales = {} @@ -268,19 +276,22 @@ monitor.sandbox.init = function () { var httpclient = HttpClient.instance() httpclient.get('/sandbox', function (x) { var r = JSON.parse(x.responseText) - monitor.sandbox.render(r); + if (r.length > 0){ + monitor.sandbox.render(r); + } }) } monitor.sandbox.render = function (logs) { months = {1:'Jan',2:'Feb',3:'Mar',4:'Apr',5:'May',6:'Jun',7:'Jul',8:'Aug',9:'Sep',10:'Oct',11:'Nov',12:'Dec'} + var d = ([logs[0].day, '-', months[logs[0].month],'-', logs[0].year, ' ', logs[0].hour, ':', logs[0].minute]).join('') jx.dom.set.value('sandbox_date',d) var options = {width:$('#sandbox_status').width(),height:'auto'} options.data = logs options.paging = true - options.pageSize = 3 + options.pageSize = 4 options.pageIndex = 1 - options.pageButtonCount = 3 + options.pageButtonCount = 4 options.pagerContainer = '#latest_process_pager' options.pagerFormat= "{prev} Page {pageIndex} of {pageCount} {next}" options.pagePrevText= '' @@ -304,4 +315,4 @@ monitor.sandbox.render = function (logs) { var grid = $('#sandbox_status').jsGrid(options) jx.dom.show('inspect_sandbox') -} \ No newline at end of file +} diff --git a/src/api/templates/dashboard.html b/src/api/templates/dashboard.html index 7423728..1a496e8 100644 --- a/src/api/templates/dashboard.html +++ b/src/api/templates/dashboard.html @@ -65,8 +65,8 @@ -
- +
+
@@ -85,4 +85,4 @@
- \ No newline at end of file +