mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code

Fixes #1429: Fixed uptime formatting on device status page

Browse Source
This commit is contained in:
Jeremy Stretch
2017-08-16 11:20:52 -04:00
parent 9a25b5458d
commit 70a6b171d0
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
netbox/templates/dcim/device_status.html
View File

@ -80,13 +80,19 @@ $(document).ready(function() {
$('#model').html(json['get_facts']['model']); $('#model').html(json['get_facts']['model']);
$('#serial_number').html(json['get_facts']['serial_number']); $('#serial_number').html(json['get_facts']['serial_number']);
$('#os_version').html(json['get_facts']['os_version']); $('#os_version').html(json['get_facts']['os_version']);
$('#uptime').html(json['get_facts']['uptime']); // Calculate uptime
var uptime = json['get_facts']['uptime'];
console.log(uptime);
var uptime_days = Math.floor(uptime / 86400);
var uptime_hours = Math.floor(uptime % 86400 / 3600);
var uptime_minutes = Math.floor(uptime % 3600 / 60);
$('#uptime').html(uptime_days + "d " + uptime_hours + "h " + uptime_minutes + "m");
$.each(json['get_environment']['cpu'], function(name, obj) { $.each(json['get_environment']['cpu'], function(name, obj) {
var row="<tr><td>" + name + "</td><td>" + obj['%usage'] + "%</td></tr>"; var row="<tr><td>" + name + "</td><td>" + obj['%usage'] + "%</td></tr>";
$("#cpu").after(row) $("#cpu").after(row)
}); });
$('#memory').after("<tr><td>Used</td><td>" + json['get_environment']['memory']['used_ram'] + "MB</td></tr>"); $('#memory').after("<tr><td>Used</td><td>" + json['get_environment']['memory']['used_ram'] + "</td></tr>");
$('#memory').after("<tr><td>Available</td><td>" + json['get_environment']['memory']['available_ram'] + "MB</td></tr>"); $('#memory').after("<tr><td>Available</td><td>" + json['get_environment']['memory']['available_ram'] + "</td></tr>");
$.each(json['get_environment']['temperature'], function(name, obj) { $.each(json['get_environment']['temperature'], function(name, obj) {
var style = "success"; var style = "success";
if (obj['is_alert']) { if (obj['is_alert']) {