Merge branch 'graphs' of steve/monitor into community

src/api/index.py

@@ -59,7 +59,7 @@ def home():
 	try:
 		gReader = factory.instance(type=class_read,args=p)
 		apps = gReader.view('summary/nodes',key=p['uid'])
-		
+
 	except Exception, e:
 		print (e)
 	return render_template('dashboard.html',context=context,title=title,app_names=apps)
@@ -69,7 +69,6 @@ def get_nodes():
 	"""
 		This function returns the labels of applications for every node registered
 		@param None
-		e.g: apps@zulu.org
 	"""
 	r = []
 	try:
@@ -83,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
+		@param node identifier e.g: apps@zulu.org 								<--------------------no it doesnt
 	"""
 	r = []
 	try:
@@ -174,11 +173,11 @@ def app_status() :
 		#
 		print[nid,aid]
 		r = r[nid][aid]
-	
+
 	except Exception,e:
 		print e
-	
+
-	return json.dumps(r)	
+	return json.dumps(r)
 #@app.route('/get/<id>')
 #def procs(id):
 	#try:

src/api/static/js/dashboard.js

@@ -20,19 +20,31 @@ dashboard = {
 
         getData.done(function(results) {
             var data = JSON.parse(results)
-            var app = data['Chrome'];
+            var node = data['apps@michaels-MBP'];
+            var app = node['chrome'];
+            var cpu = app['cpu'];
+            var memory_used = app['memory_used'];
             console.log('data...',data)
+            console.log('node...',node)
+            console.log('app...',app)
+            console.log('cpu...',cpu)
+            console.log('memory_used...', memory_used)
+
 
 // monitoring apps chart
         var dataChart = {
-          labels: ['9:00AM', '12:00AM', '3:00PM', '6:00PM', '9:00PM', '12:00PM', '3:00AM', '6:00AM'],
+          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: [app.memory_used, app.cpu, ] // TODO: Check the order, the graph is by index not name.
+          series: [cpu, memory_used, [1,2,3,5], ] // TODO: Check the order, the graph is by index not name.
         };
 
+        dataChartArray = dataChart.series
+        var maxlist = dataChartArray.map(dataChartArray => Math.max.apply(null, dataChartArray));
+        maxNum = Math.max.apply(null, maxlist)
+
         var optionsChart = {
           lineSmooth: false,
           low: 0,
-          high: 100,
+          high: maxNum + 1,
           showArea: true,
           height: "245px",
           axisX: {
@@ -60,7 +72,7 @@ dashboard = {
 // cpu and memory --------------------------
         var data = {
           labels: ['Jan', 'Feb', 'Mar', 'Apr', 'Mai', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
-          series: [app.cpu, app.memory_used]
+          series: [cpu, memory_used]
 
         };
 

src/api/templates/dashboard.html

@@ -79,7 +79,7 @@
             ]
 
             jx.utils.patterns.observer(lobservers,"init")
-        	//dashboard.initChartist();
+        	  dashboard.initChartist();
 
     	});
 	</script>
@@ -156,7 +156,16 @@
                               </a>
                               <ul class="dropdown-menu">
                                   {% for name in app_names %}
-                                <div class="action"><i class="fa fa-angle-right"></i> {{name|safe}}</div>
+                                <div class="action" data-name="{{name}}" id="app_names"><i class="fa fa-angle-right"></i><a href='#'>{{name|safe}}</a>
+																	<script type="text/javascript">onclick=function(){
+																		console.log('name...', "{{ name }}") //this works, but returns same variable......
+
+																		var appName = $('#app_names').data("name");
+																		console.log('name...', appName )
+
+																	}</script>
+																</div>
+
 
                                 {% endfor %}
                               </ul>
@@ -301,10 +310,9 @@
 
                                 <div class="footer">
                                     <div class="chart-legend">
-                                        <!-- confirm these three are right with new API. -->
                                         <i class="fa fa-circle text-info"></i> cpu usage
-                                        <i class="fa fa-circle text-danger"></i> memory usage
+                                        <i class="fa fa-circle text-warning"></i> memory used
-                                        <i class="fa fa-circle text-warning"></i> memory available
+																				<i class="fa fa-circle text-danger"></i> available line
                                     </div>
                                     <hr>
                                     <div class="stats">