diff --git a/src/api/index.py b/src/api/index.py index ba4edfd..9dc945d 100644 --- a/src/api/index.py +++ b/src/api/index.py @@ -56,7 +56,7 @@ f.close() # # from threading import Thread, RLock -p = {'uri':'http://localhost:5984','dbname':'monitor','uid':'logs','filename':'logs.JSON'} +p = {'uri':'http://dev.the-phi.com:5984','dbname':'monitor','uid':'logs','filename':'logs.JSON'} factory = DataSourceFactory() gWriter = factory.instance(type='CouchdbWriter',args=p) gReader = factory.instance(type='CouchdbReader',args=p) diff --git a/src/api/static/css/default.css b/src/api/static/css/default.css index 3d64e37..3dd5a05 100644 --- a/src/api/static/css/default.css +++ b/src/api/static/css/default.css @@ -2,6 +2,8 @@ body { font-size:14px; font-family:sans-serif; font-weight:lighter; + padding:20px; + } .small { font-family:sans-serif; diff --git a/src/api/static/js/dashboard.js b/src/api/static/js/dashboard.js index 90db9fb..2b41336 100644 --- a/src/api/static/js/dashboard.js +++ b/src/api/static/js/dashboard.js @@ -101,19 +101,28 @@ monitor.processes.trend.render = function (logs, key,label) { ] conf.data.datasets = [ ] var x_axis = [] + var _x = {} + var _y = {} var values = jx.utils.patterns.visitor(logs,function(item){ x = new Date(item.year,item.month-1,item.day,item.hour,item.minute) y = item[key] - x_axis.push(x) - - return {x:x,y:y} + if (_x[x] == null ||(_x[x] == null && _y[y] == null)) { + _x[x] = 1 + _y[y] = 1 + x_axis.push(x) + console.log([x,y]) + return {x:x,y:y} + + } else { + return null + } }) var serie = {label:label,data:values} i = parseInt(Math.random() * (COLORS.length - 1)) serie.backgroundColor = 'transparent' - serie.borderColor = COLORS[i] + serie.borderColor = COLORS[10] serie.borderWidth = 1 serie.type = 'line' conf.data.datasets.push(serie) diff --git a/src/api/templates/dashboard.html b/src/api/templates/dashboard.html index 502dd92..4f833d1 100644 --- a/src/api/templates/dashboard.html +++ b/src/api/templates/dashboard.html @@ -46,7 +46,7 @@ - + diff --git a/src/monitor.py b/src/monitor.py index 3a35388..e319bc0 100755 --- a/src/monitor.py +++ b/src/monitor.py @@ -226,6 +226,7 @@ class Monitor (Thread): r = self.handler.composite() self.writer.write(label=label,row = r) lock.release() + time.sleep(2) self.prune() diff --git a/src/utils/transport.py b/src/utils/transport.py index 0fdd4c3..1895d01 100644 --- a/src/utils/transport.py +++ b/src/utils/transport.py @@ -503,7 +503,7 @@ class CouchdbWriter(Couchdb,Writer): @param row row to be written """ def write(self,**params): - print self.uid + document = self.dbase.get(self.uid) label = params['label'] row = params['row']