diff options
Diffstat (limited to 'glances/outputs/static/js/services/plugins')
5 files changed, 60 insertions, 13 deletions
diff --git a/glances/outputs/static/js/services/plugins/glances_alert.js b/glances/outputs/static/js/services/plugins/glances_alert.js index 0b1466df..cc434d1a 100644 --- a/glances/outputs/static/js/services/plugins/glances_alert.js +++ b/glances/outputs/static/js/services/plugins/glances_alert.js @@ -3,10 +3,15 @@ glancesApp.service('GlancesPluginAlert', function () { var _alerts = []; this.setData = function (data, views) { + data = data[_pluginName]; _alerts = []; - for (var i = 0; i < data[_pluginName].length; i++) { - var alertData = data[_pluginName][i]; + if(!_.isArray(data)) { + data = []; + } + + for (var i = 0; i < data.length; i++) { + var alertData = data[i]; var alert = {}; alert.name = alertData[3]; diff --git a/glances/outputs/static/js/services/plugins/glances_diskio.js b/glances/outputs/static/js/services/plugins/glances_diskio.js index 2ba1a396..42306e5a 100644 --- a/glances/outputs/static/js/services/plugins/glances_diskio.js +++ b/glances/outputs/static/js/services/plugins/glances_diskio.js @@ -1,18 +1,26 @@ -glancesApp.service('GlancesPluginDiskio', function() { +glancesApp.service('GlancesPluginDiskio', function($filter) { var _pluginName = "diskio"; this.disks = []; this.setData = function(data, views) { data = data[_pluginName]; + data = $filter('orderBy')(data,'disk_name'); this.disks = []; for (var i = 0; i < data.length; i++) { var diskioData = data[i]; + var timeSinceUpdate = diskioData['time_since_update']; var diskio = { 'name': diskioData['disk_name'], - 'readBytes': diskioData['read_bytes'], - 'writeBytes': diskioData['write_bytes'] + 'bitrate': { + 'txps': $filter('bytes')(diskioData['read_bytes'] / timeSinceUpdate), + 'rxps': $filter('bytes')(diskioData['write_bytes'] / timeSinceUpdate) + }, + 'count': { + 'txps': $filter('bytes')(diskioData['read_count'] / timeSinceUpdate), + 'rxps': $filter('bytes')(diskioData['write_count'] / timeSinceUpdate) + } }; this.disks.push(diskio); diff --git a/glances/outputs/static/js/services/plugins/glances_folders.js b/glances/outputs/static/js/services/plugins/glances_folders.js new file mode 100644 index 00000000..a8ceb98c --- /dev/null +++ b/glances/outputs/static/js/services/plugins/glances_folders.js @@ -0,0 +1,30 @@ +glancesApp.service('GlancesPluginFolders', function() { + var _pluginName = "folders"; + var _view = {}; + this.folders = []; + + this.setData = function(data, views) { + _view = views[_pluginName]; + data = data[_pluginName]; + this.folders = []; + + for (var i = 0; i < data.length; i++) { + var folderData = data[i]; + + var folder = { + 'path': folderData['path'], + 'size': folderData['size'] + }; + + this.folders.push(folder); + } + }; + + this.getDecoration = function(mountPoint, field) { + if(_view[mountPoint][field] == undefined) { + return; + } + + return _view[mountPoint][field].decoration.toLowerCase(); + }; +}); diff --git a/glances/outputs/static/js/services/plugins/glances_processcount.js b/glances/outputs/static/js/services/plugins/glances_processcount.js index 3f5bb78c..163f6b49 100644 --- a/glances/outputs/static/js/services/plugins/glances_processcount.js +++ b/glances/outputs/static/js/services/plugins/glances_processcount.js @@ -10,10 +10,10 @@ glancesApp.service('GlancesPluginProcessCount', function() { this.setData = function(data, views) { data = data[_pluginName]; - this.total = data['total']; - this.running = data['running']; - this.sleeping = data['sleeping']; - this.stopped = data['stopped']; - this.thread = data['thread']; + this.total = data['total'] || 0; + this.running = data['running'] || 0; + this.sleeping = data['sleeping'] || 0; + this.stopped = data['stopped'] || 0; + this.thread = data['thread'] || 0; }; }); diff --git a/glances/outputs/static/js/services/plugins/glances_processlist.js b/glances/outputs/static/js/services/plugins/glances_processlist.js index 7a510812..365e2519 100644 --- a/glances/outputs/static/js/services/plugins/glances_processlist.js +++ b/glances/outputs/static/js/services/plugins/glances_processlist.js @@ -1,9 +1,11 @@ glancesApp.service('GlancesPluginProcessList', function($filter, GlancesPlugin) { var _pluginName = "processlist"; + var _ioReadWritePresent = false; this.processes = []; this.setData = function(data, views) { this.processes = []; + this.ioReadWritePresent = false; for (var i = 0; i < data[_pluginName].length; i++) { var process = data[_pluginName][i]; @@ -13,10 +15,12 @@ glancesApp.service('GlancesPluginProcessList', function($filter, GlancesPlugin) process.timeplus = $filter('timedelta')(process.cpu_times); process.timemillis = $filter('timemillis')(process.cpu_times); - process.ioRead = '?'; - process.ioWrite = '?'; + process.ioRead = null; + process.ioWrite = null; if (process.io_counters) { + this.ioReadWritePresent = true; + process.ioRead = (process.io_counters[0] - process.io_counters[2]) / process.time_since_update; if (process.ioRead != 0) { @@ -30,7 +34,7 @@ glancesApp.service('GlancesPluginProcessList', function($filter, GlancesPlugin) } } - process.isNice = process.nice !== undefined && ((data['system'].os_name === 'Windows' && nice != 32) || (!data['system'].os_name === 'Windows' && process.nice != 0)); + process.isNice = process.nice !== undefined && ((data['system'].os_name === 'Windows' && process.nice != 32) || (data['system'].os_name !== 'Windows' && process.nice != 0)); this.processes.push(process); } |