Merge 7ff2e8899f into a332be6a7b

management/daemon.py

@@ -574,6 +574,11 @@ def system_status():
 		pool.join()
 	return json_response(output.items)
 
+@app.route('/system/uptime')
+@authorized_personnel_only
+def show_uptime():
+	return utils.shell("check_output", ["/usr/bin/uptime", "--pretty"])
+
 @app.route('/system/updates')
 @authorized_personnel_only
 def show_updates():

management/templates/system-status.html

@@ -39,6 +39,9 @@
 <div class="row">
 	<div class="col-md-push-9 col-md-3">
 
+<div id="system-uptime" style="display: none; margin-bottom: 1em;">
+</div>
+
 <div id="system-reboot-required" style="display: none; margin-bottom: 1em;">
 	<button type="button" class="btn btn-danger" onclick="confirm_reboot(); return false;">Reboot Box</button>
 	<div>No reboot is necessary.</div>
@@ -83,6 +86,15 @@ function show_system_status() {
       $('#system-privacy-setting p').toggle(r);
     });
 
+  api(
+    "/system/uptime",
+    "GET",
+    { },
+    function(r) {
+      $('#system-uptime').text(r);
+      $('#system-uptime').show();
+    });
+
   api(
     "/system/reboot",
     "GET",