From 9b25ed97b01c6079547e8e18bba21daf564216ce Mon Sep 17 00:00:00 2001 From: michael mead Date: Mon, 7 Aug 2017 22:46:25 -0500 Subject: [PATCH 1/3] start template --- .init.sh.un~ | Bin 0 -> 1022 bytes .install.sh.un~ | Bin 0 -> 559 bytes src/api/static/js/dashboard.js | 4 +++- src/api/templates/dashboard.html | 20 ++++++++++++-------- 4 files changed, 15 insertions(+), 9 deletions(-) create mode 100644 .init.sh.un~ create mode 100644 .install.sh.un~ diff --git a/.init.sh.un~ b/.init.sh.un~ new file mode 100644 index 0000000000000000000000000000000000000000..07c1ff01373a053f5ff56e3f99f3ec7d5e1bcca7 GIT binary patch literal 1022 zcmWH`%$*;a=aT=Ffyv48qW;#(Dwj279{*USj5rEZKJ$J&bl*aZpF2%(L6JTK1A{XV z3v-rb7L}AH=A`D8DHJE>r6lE70EM|hQb5cI#7sa80w5ZO86uk`RahXh@fX0-2!$Xn zND5{M!+#(Ei$E2QQq&HC$Rnl0Vs+= vF{cI+9E~|pD9{oBGmH7praL07k+vLquvPXR(1>6x20K3@d@4wXU3 literal 0 HcmV?d00001 diff --git a/.install.sh.un~ b/.install.sh.un~ new file mode 100644 index 0000000000000000000000000000000000000000..fcff924c0d0a30d4d85a72be0cd8061ba41466a8 GIT binary patch literal 559 zcmWH`%$*;a=aT=FfhmC@W6%1Jp2{cgf1Vg1xh+R=V$|J~e_Ted_pDxbvC6Q7fq{Vw zh=s~Bi%Lopb5irl6p9n`Qj+p3fTAoQ86akaVju-)gTxpj8$W$wfyl;R012Q0kQB@i rhW|hS){drVluNA;07l10Xmos)02;~+#H>IJieXSxV2NeZ#^
    {% for name in app_names %} -
    {{name|safe}} - +
    {{name|safe}} +
    From 11aaab210f6ae96f64d7d3a892842265acd29a95 Mon Sep 17 00:00:00 2001 From: michael mead Date: Tue, 8 Aug 2017 22:47:25 -0500 Subject: [PATCH 2/3] start getting nodename passed to init function --- src/api/index.py | 2 +- src/api/static/js/dashboard.js | 16 +++++++++++++--- src/api/templates/dashboard.html | 19 +++---------------- 3 files changed, 17 insertions(+), 20 deletions(-) diff --git a/src/api/index.py b/src/api/index.py index dd3c1e3..39b86e7 100644 --- a/src/api/index.py +++ b/src/api/index.py @@ -82,7 +82,7 @@ def get_nodes(): def get_apps(): """ This function returns the applications for a given node - @param node identifier e.g: apps@zulu.org <--------------------no it doesnt + @param node identifier e.g: apps@zulu.org """ r = [] try: diff --git a/src/api/static/js/dashboard.js b/src/api/static/js/dashboard.js index f1131b3..49b4120 100755 --- a/src/api/static/js/dashboard.js +++ b/src/api/static/js/dashboard.js @@ -1,5 +1,12 @@ type = ['','info','success','warning','danger']; +function getNode(name){ + var nodeName = {} + nodeName.name = name + console.log('nodename...', nodeName.name) + // dashboard.initChartist(nodeName) +} + dashboard = { initPickColor: function(){ $('.pick-class-label').click(function(){ @@ -17,11 +24,14 @@ dashboard = { initChartist: function(){ var getData = $.get('/1/app/usage/trend'); - function loadDashboard(name){ - console.log('loadDashboard...', name); - } getData.done(function(results) { var data = JSON.parse(results) + // if (typeof nodeName === 'undefined'){ + // console.log("undefined nodename.........") + // } else { + // var node = data[nodeName.name] + // console.log('data.name..', data[name]) + // } var node = data['apps@michaels-MBP']; var app = node['chrome']; var cpu = app['cpu']; diff --git a/src/api/templates/dashboard.html b/src/api/templates/dashboard.html index 402d725..61e187a 100644 --- a/src/api/templates/dashboard.html +++ b/src/api/templates/dashboard.html @@ -155,22 +155,9 @@
      - {% for name in app_names %} -
      {{name|safe}} - -
      - - + {% for name in app_names %} + {% endfor %}
    From 5630d7383c5237b4cc229b00d45920067eac5542 Mon Sep 17 00:00:00 2001 From: michael mead Date: Thu, 10 Aug 2017 22:23:57 -0500 Subject: [PATCH 3/3] some bugs here, and we probably want to refactor but you can select nodes from dropdown, a couple things return undefined, but I don't know if thats just old stuff --- src/api/index.py | 10 ++++++++-- src/api/static/js/dashboard.js | 22 ++++++++++++---------- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/src/api/index.py b/src/api/index.py index 39b86e7..6e19647 100644 --- a/src/api/index.py +++ b/src/api/index.py @@ -96,7 +96,6 @@ def get_apps(): return json.dumps(r) - @app.route('/1/get/summary/') def get_summary(id): """ @@ -119,6 +118,8 @@ def get_summary(id): except Exception,e: print (e) return json.dumps(r) + + @app.route("/1/sys/usage/trend") def get_usage_trend(): """ @@ -135,6 +136,7 @@ def get_usage_trend(): print (e) return json.dumps(r) + @app.route("/1/app/usage/trend") def get_usage_detail(): """ @@ -153,6 +155,8 @@ def get_usage_detail(): except Exception,e: print (e) return json.dumps(r) + + @app.route('/1/app/status') def app_status() : """ @@ -178,6 +182,8 @@ def app_status() : print e return json.dumps(r) + + #@app.route('/get/') #def procs(id): #try: @@ -282,7 +288,7 @@ def sandbox(): #headers = {"content-disposition":"attachment; filename=requirements.txt"} #return Response(stream,mimetype='text/plain',headers=headers) -@app.route('/dashboard') +@app.route('/dashboard/') def dashboard(): context = PARAMS['context'] if 'title' in PARAMS : diff --git a/src/api/static/js/dashboard.js b/src/api/static/js/dashboard.js index 49b4120..2859b86 100755 --- a/src/api/static/js/dashboard.js +++ b/src/api/static/js/dashboard.js @@ -4,7 +4,7 @@ function getNode(name){ var nodeName = {} nodeName.name = name console.log('nodename...', nodeName.name) - // dashboard.initChartist(nodeName) + dashboard.initChartist(nodeName) } dashboard = { @@ -22,17 +22,19 @@ dashboard = { }); }, - initChartist: function(){ + initChartist: function(nodeName){ var getData = $.get('/1/app/usage/trend'); getData.done(function(results) { var data = JSON.parse(results) - // if (typeof nodeName === 'undefined'){ - // console.log("undefined nodename.........") - // } else { - // var node = data[nodeName.name] - // console.log('data.name..', data[name]) - // } - var node = data['apps@michaels-MBP']; + if (typeof nodeName === 'undefined'){ + var node = data['apps@michaels-MBP']; + console.log("undefined nodename.........") + } else { + console.log('this is nodeName...', nodeName) + console.log('this is nodeName.name...', nodeName.name) + var node = data[nodeName.name] + console.log('data.name..', data[name]) + } var app = node['chrome']; var cpu = app['cpu']; var memory_used = app['memory_used']; @@ -46,7 +48,7 @@ dashboard = { // monitoring apps chart var dataChart = { labels: ['24','23','22','21','20','19','18','17','16','15','14','13','12','11','10','9','8','7','6','5','4','3','2','1' ], - series: [cpu, memory_used, [1,2,3,5], ] // TODO: Check the order, the graph is by index not name. + series: [cpu, memory_used, [0,0.1,0.3,0.2,0.4,0.6,0.2], ] // TODO: Check the order, the graph is by index not name. }; dataChartArray = dataChart.series