Merge branch 'nodeTemplate' of steve/monitor into community

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:
@@ -96,7 +96,6 @@ def get_apps():
 	return json.dumps(r)
 
 
-
 @app.route('/1/get/summary/<id>')
 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/<id>')
 #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/<node>')
 def dashboard():
 	context = PARAMS['context']
 	if 'title' in PARAMS :

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(){
@@ -15,12 +22,19 @@ dashboard = {
         });
     },
 
-    initChartist: function(){
+    initChartist: function(nodeName){
         var getData = $.get('/1/app/usage/trend');
-
         getData.done(function(results) {
             var data = JSON.parse(results)
-            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'];
@@ -34,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

src/api/templates/dashboard.html

@@ -155,18 +155,9 @@
 									<b class="caret"></b>
                               </a>
                               <ul class="dropdown-menu">
-                                  {% for name in app_names %}
+                                {% for name in app_names %}
-                                <div class="action" data-name="{{name}}" id="app_names"><i class="fa fa-angle-right"></i><a href='#'>{{name|safe}}</a>
+                                	<div class="action" data-name="{{name}}" id="app_names"><i class="fa fa-angle-right"></i>
-																	<script type="text/javascript">onclick=function(){
+																	<a href='#' onclick="getNode('{{name}}')">{{name|safe}}</a></div>
-																		console.log('name...', "{{ name }}") //this works, but returns same variable......
-
-																		var appName = $('#app_names').data("name");
-																		console.log('name...', appName )
-
-																	}</script>
-																</div>
-
-
                                 {% endfor %}
                               </ul>
                         </li>