Kernel info, uptime being sent to dashboard

src/rockstor/smart_manager/dc2.py

@@ -0,0 +1,95 @@
+from gevent import monkey
+monkey.patch_all()
+import gevent
+from socketio.server import SocketIOServer
+from socketio import socketio_manage
+from socketio.namespace import BaseNamespace
+from socketio.mixins import BroadcastMixin
+
+from django.conf import settings
+from system.osi import (uptime, kernel_info)
+
+import logging
+logger = logging.getLogger(__name__)
+
+
+class DashboardNamespace(BaseNamespace, BroadcastMixin):
+    def initialize(self):
+        pass
+
+
+class SysinfoNamespace(BaseNamespace, BroadcastMixin):
+    start = False
+    supported_kernel = settings.SUPPORTED_KERNEL_VERSION
+
+    def initialize(self):
+        self.emit("sysinfo", {"sysinfo": "connected"})
+        self.start = True
+        gevent.spawn(self.send_uptime)
+        gevent.spawn(self.send_kernel_info)
+
+    def recv_disconnect(self):
+        self.start = False
+        self.disconnect(silent=True)
+
+    def send_uptime(self):
+
+        while self.start:
+            if not self.start:
+                break
+            self.emit('uptime', {'uptime': uptime()})
+            # seconds not displayed
+            gevent.sleep(30)
+
+    def send_kernel_info(self):
+        while self.start:
+            if not self.start:
+                break
+            try:
+                self.emit('kernel_info', {'kernel_info':
+                                          kernel_info(self.supported_kernel)})
+            except:
+                self.error('unsupported_kernel', 'the kernel is bad')
+            # kernel information doesn't change that much
+            gevent.sleep(1000)
+
+
+class Application(object):
+    def __init__(self):
+        self.buffer = []
+
+    def __call__(self, environ, start_response):
+        path = environ['PATH_INFO'].strip('/') or 'index.html'
+
+        if path.startswith('/static') or path == 'index.html':
+            try:
+                data = open(path).read()
+            except Exception:
+                return not_found(start_response)
+
+            if path.endswith(".js"):
+                content_type = "text/javascript"
+            elif path.endswith(".css"):
+                content_type = "text/css"
+            elif path.endswith(".swf"):
+                content_type = "application/x-shockwave-flash"
+            else:
+                content_type = "text/html"
+
+            start_response('200 OK', [('Content-Type', content_type)])
+            return [data]
+        if path.startswith("socket.io"):
+            socketio_manage(environ, {'/sysinfo': SysinfoNamespace})
+            socketio_manage(environ, {'/dashboard': DashboardNamespace})
+
+
+def not_found(start_response):
+    start_response('404 Not Found', [])
+    return ['<h1>Not found</h1>']
+
+
+def main():
+    logger.debug('Listening on port http://127.0.0.1:8080 and on port 10843 (flash policy server)')
+    server = SocketIOServer(('127.0.0.1', 8080), Application(),
+                            resource="socket.io", policy_server=True).serve_forever()
+

src/rockstor/storageadmin/static/storageadmin/js/rockstor.js

@@ -441,42 +441,7 @@ function fetchKernelInfo() {
 	}
     });
 }
-
-function displayLoadAvg(data) {
-    var n = parseInt(data.results[0]['uptime']);
-    var load_1 = parseFloat(data.results[0]['load_1']);
-    var load_5 = parseFloat(data.results[0]['load_5']);
-    var load_15 = parseFloat(data.results[0]['load_15']);
-    var secs = n % 60;
-    var mins = Math.round(n/60) % 60;
-    var hrs = Math.round(n / (60*60)) % 24;
-    var days = Math.round(n / (60*60*24)) % 365;
-    var yrs = Math.round(n / (60*60*24*365));
-    var str = 'Uptime: ';
-    if (RockStorGlobals.kernel) {
-	str = 'Linux: ' + RockStorGlobals.kernel + '         ' + str;
-    }
-    if (yrs == 1) {
-	str += yrs + ' year, ';
-    } else if (yrs > 1) {
-	str += yrs + ' years, ';
-    }
-    if (days == 1) {
-	str += days + ' day, ';
-    } else if (days > 1) {
-	str += days + ' days, ';
-    }
-    if (hrs < 10) {
-	str += '0';
-    }
-    str += hrs + ':';
-    if (mins < 10) {
-	str += '0';
-    }
-    str += mins;
-    str += ' &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Load: ' + load_1 + ', ' + load_5 + ', ' + load_15;
-    $('#appliance-loadavg').html(str);
-}
+*/
 
 function fetchServerTime() {
     RockStorGlobals.serverTimeTimer = window.setInterval(function() {

src/rockstor/storageadmin/static/storageadmin/js/router.js

@@ -122,18 +122,12 @@ var AppRouter = Backbone.Router.extend({
 	if (RockStorGlobals.currentAppliance == null) {
 	    setApplianceName();
 	}
-	if (!RockStorGlobals.loadAvgDisplayed) {
-	    updateLoadAvg();
-	}
 	if (!RockStorGlobals.serverTimeFetched) {
 	    fetchServerTime();
 	}
 	if (!RockStorGlobals.browserChecked) {
 	    checkBrowser();
 	}
-	if (!RockStorGlobals.kernel) {
-	    fetchKernelInfo();
-	}
 
 	// set a timer to get current rockstor version and checkif there is an
 	// update available
@@ -887,5 +881,53 @@ $(document).ready(function() {
 	$('#contrib-form').submit()
 	$('#donate-modal').modal('hide');
     });
-    Rockstorsocket = io.connect('/dashboard', {secure: 'false', url: 'http://192.168.56.105:8080'});
+    var $loadavg = $('#appliance-loadavg');
+    var socket = io.connect('/sysinfo', {'secure': true});
+
+
+    socket.on('sysinfo', function(data) {
+	console.log(data);
+    });
+
+    socket.on('uptime', function(data) {
+	displayLoadAvg(data);
+    });
+
+    socket.on('kernel_info', function(data) {
+	$loadavg.text('Linux: ' + data.kernel_info);
+    });
+
+    socket.on('unsupported_kernel', function() {
+	console.log('unsupported kernel');
+    });
 });
+
+
+function displayLoadAvg(data) {
+    var n = parseInt(data.uptime);
+    var secs = n % 60;
+    var mins = Math.round(n/60) % 60;
+    var hrs = Math.round(n / (60*60)) % 24;
+    var days = Math.round(n / (60*60*24)) % 365;
+    var yrs = Math.round(n / (60*60*24*365));
+    var str = 'Uptime: ';
+    if (yrs == 1) {
+	str += yrs + ' year, ';
+    } else if (yrs > 1) {
+	str += yrs + ' years, ';
+    }
+    if (days == 1) {
+	str += days + ' day, ';
+    } else if (days > 1) {
+	str += days + ' days, ';
+    }
+    if (hrs < 10) {
+	str += '0';
+    }
+    str += hrs + ':';
+    if (mins < 10) {
+	str += '0';
+    }
+    str += mins;
+    $('#uptime').text(str);
+};

src/rockstor/storageadmin/static/storageadmin/js/templates/common/navbar.jst

@@ -21,7 +21,7 @@
     <li><a id="donate_nav" href="#"><i class="fa fa-heart fa-lg" style="color:#BA0707" ></i> Donate</a></li>
   </ul>
   <ul class="nav navbar-nav navbar-right">
-    <li><a href="#version" id="version-msg"></a></li> 
+    <li><a href="#version" id="version-msg"></a></li>
     <li  class="dropdown">
       <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span id="user-name"></span>
 	<span class="fa fa-power-off fa-lg fa-inverse"></i>

src/rockstor/storageadmin/templates/storageadmin/base.html

@@ -100,7 +100,7 @@
     <script src="/static/js/lib/moment.min.js"></script>
     <script src="/static/js/lib/simple-slider.min.js"></script>
     <script src="/static/js/lib/chosen.jquery.js"></script>
-    <script src="/static/js/lib/socket.io.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/0.9.6/socket.io.min.js"></script>
     <script src="/static/storageadmin/js/storageadmin.js"></script>
   </head>
   <body>
@@ -126,7 +126,10 @@
     </div> <!-- navbar -->
     <div id="appliance-breadcrumb">
       <a id="appliance-name" href="#"></a>
+      <div id="uptime"></div>
       <div id="appliance-loadavg"></div>
+
+
     </div>
 
     <div id="wrapper1">