X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=www%2Fmonitor.html;h=04d530384296b0566161793c7f61387204ff0acc;hb=da1b8bafd379451fdbd223f111d62d8fa1e6f85a;hp=b7417af90303b7c776e59a1d2bab93470a6eb784;hpb=be3f0baeee33cee5490375eeb76e12f62a487d63;p=psensor.git

diff --git a/www/monitor.html b/www/monitor.html
index b7417af..04d5303 100644
--- a/www/monitor.html
+++ b/www/monitor.html
@@ -3,159 +3,109 @@
     <meta charset="utf-8">
     <title>Psensor Server Monitoring</title>
 
+    <link type="text/css"
+	  rel="stylesheet"
+href="http://fonts.googleapis.com/css?family=Ubuntu:regular,bold&subset=Latin">
+
     <link type="text/css" href="style.css" rel="stylesheet" />	
     <script type="text/javascript" src="jquery.js"></script>
     <script type="text/javascript" src="psensor.js"></script>
     <script>  
-      $(document).ready(function() {          
-          $.getJSON("/api/1.0/sensors", function(data) {
-              $.each(data, function(i, item) {
-                  var sname = item["name"];
-                  var svalue = item["last_measure"]["value"];
-                  var smin = item["min"];
-                  var smax = item["max"];
-                  var stype = item["type"];
-                  var stype_str;
-                  var unit;
-
-                  unit = type_to_unit(stype);
-                  stype_str = type_to_str(stype);
-
-                  $("#sensors").append("<tr><td>"+sname+"</td><td>"+svalue+unit+"</td><td>"+smin+unit+"</td><td>"+smax+unit+"</td><td>"+stype_str+"</td></tr>");                 
-              });          
-          });
-
-          $.getJSON("/api/1.0/sysinfo", function(data) {
-              var load = Math.round(data["load"] * 100);
-              var load_1 = Math.round(data["load_1"]*1000)/1000;
-              var load_5 = Math.round(data["load_5"]*1000)/1000;
-              var load_15 = Math.round(data["load_15"]*1000)/1000;
-              var uptime = data["uptime"];
-              var uptime_s = uptime % 60;
-              var uptime_mn = Math.floor((uptime / 60) % 60);
-              var uptime_h = Math.floor((uptime / (60*60)) % 24);
-              var uptime_d = Math.floor(uptime / (60*60*24));
-
-              $("#cpu").append("<tr><td>"+load+"%</td><td>"+load_1+"</td><td>"+load_5+"</td><td>"+load_15+"</td></tr>");
+	$(document).ready(function() {          
+		update_menu();
 
-              $("#uptime").append(uptime_d+"d "+uptime_h+"h "+uptime_mn+"mn");
+		update_summary_sensors();
+		update_summary_sysinfo();      
 
-              var ram = data["ram"];
-              var swap = data["swap"];
-              var mu = data["mem_unit"];
+      		$(document).ready(function() {
+			setInterval(function() {
+				update_summary_sensors();
+				update_summary_sysinfo();
+      			}, 5000);
+      		});
+         
 
-	      var ramtotal = ram["total"]*mu;
-              var ramfree = ram["free"]*mu;
-              var ramused = (ram["total"] - ram["free"])*mu;
-              var ramshared = ram["shared"]*mu;
-              var rambuffer = ram["buffer"]*mu;
-              
-  
-              $("#memory").append("<td>"+format_mem_size(ramtotal)+"</td>"
-                                  +"<td>"+format_mem_size(ramused)+"</td>"
-                                  +"<td>"+format_mem_size(ramfree)+"</td>"
-                                  +"<td>"+format_mem_size(ramshared)+"</td>"
-                                  +"<td>"+format_mem_size(rambuffer)+"</td>");
-
-              $("#swap").append("<td>"+format_mem_size(swap["total"]*mu)+"</td>"
-                                +"<td>"+format_mem_size(swap["total"]*mu-swap["free"]*mu)+"</td>"
-                                +"<td>"+format_mem_size(swap["free"]*mu)+"</td>");
-
-              var netdata = data["net"];
-              $.each(netdata, function(i, item) {
-                  $("#net").append("<tr><td>"+item["name"]+"</td>"
-                                   +"<td>"+format_mem_size(item["bytes_in"])+"</td>"
-                                   +"<td>"+format_mem_size(item["bytes_out"])+"</td></tr>");
-              });
-          });
       });
     </script>
   </head>
   <body>
-    <div class='page'>
-      <div class='page-header'>
-	<h1>Psensor Server Monitoring</h1>
-      </div>
-
-      <div class='page-content'>
-
-	<p id='uptime'><strong>Uptime</strong>: </p>
 
-	<h2>CPU</h2>
-
-	<div>
-	  <table id='cpu' border='0' cellspacing='0' cellpadding='0'>
-	    <thead>
-	      <tr>
-		<th>Current usage</th>
-		<th>Load 1mn</th>
-		<th>Load 5mn</th>
-		<th>Load 15mn</th>
-	      </tr>
-	    </thead>
-	    <tbody></tbody>
-	  </table>
-	</div>
-	
-	<h2>Memory</h2>
-
-	<div>
-	  <table border='0' cellspacing='0' cellpadding='0'>
-	    <thead>
-	      <tr>
-		<th></th>
-		<th>Total</th>
-		<th>Used</th>
-		<th>Free</th>
-		<th>Shared</th>
-		<th>Buffer</th>
-	      </tr>
-	    </thead>
-	      <tbody>
-		<tr id='memory'><td>Memory</td></tr>
-		<tr id='swap'><td>Swap</td></tr>
-	      </tbody>
-	    </table>
-	</div>
-
-	<h2>Network</h2>
-
-	<div>
-	  <table id='net' border='0' cellspacing='0' cellpadding='0'>
-	    <thead>
-	      <tr>
-		<th>Interface</th>
-		<th>Bytes In</th>
-		<th>Bytes Out</th>
-	      </tr>
-	    </thead>
-	    <tbody>
-	    </tbody>
-	  </table>
-	</div>
-
-	<h2>Sensors</h2>
-
-	<div>
-	  <table id='sensors' border='0' cellspacing='0' cellpadding='0'>
-	    <thead>
-	      <tr>
-		<th>Name</th>
-		<th>Value</th>
-		<th>Min</th>
-		<th>Max</th>
-		<th>Type</th>
-	      </tr>
-	    </thead>
-	    <tbody></tbody>
-	  </table>
-	</div>
-      </div>
-      </div>
+    <div id="menu">
+      <ul id="menu-list">
+	<li><em><a href="monitor.html">All</a></em></li>
+      </ul>
+    </div>
+      
+    <div id="main">
+      <h1>System Monitoring</h1>
+      
+      <p><em>Uptime</em>: <span id='uptime'></span></p>
+      
+      <h2>CPU</h2>
+      
+      <table id='cpu'>
+	<thead>
+	  <tr>
+	    <th>Current usage</th>
+	    <th>Load 1mn</th>
+	    <th>Load 5mn</th>
+	    <th>Load 15mn</th>
+	  </tr>
+	</thead>
+	<tbody></tbody>
+      </table>
+      
+      <h2>Memory</h2>
+      
+      <table>
+	<thead>
+	  <tr>
+	    <th></th>
+	    <th>Total</th>
+	    <th>Used</th>
+	    <th>Free</th>
+	    <th>Shared</th>
+	    <th>Buffer</th>
+	  </tr>
+	</thead>
+	<tbody>
+	<tr id='memory'></tr>
+	<tr id='swap'></tr>
+	</tbody>
+      </table>
+      
+      <h2>Network</h2>
+      
+      <table id='net'>
+	<thead>
+	  <tr>
+	    <th>Interface</th>
+	    <th>Bytes In</th>
+	    <th>Bytes Out</th>
+	  </tr>
+	</thead>
+	<tbody>
+	</tbody>
+      </table>
+      
+      <h2>Sensors</h2>
+      
+      <table id='sensors'>
+	<thead>
+	  <tr>
+	    <th>Name</th>
+	    <th>Value</th>
+	  <th>Min</th>
+	    <th>Max</th>
+	    <th>Type</th>
+	  </tr>
+	</thead>
+      <tbody id ="sensors"></tbody>
+      </table>
     </div>
-      <div class='page-footer'>
-	<a href='http://wpitchoune.net/psensor'>Psensor Server</a> - (c)2011 jeanfi@gmail.com 
-      </div>
 
+    <div id="footer">
+      Generated by <a href='http://wpitchoune.net/psensor'>psensor-server</a>
+    </div>
   </body>
 </html>