greatbody
/
glances
mirror of https://github.com/nicolargo/glances
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/nicolargo/glances into develop

pull/834/head
nicolargo 2016-04-02 17:00:19 +02:00
parent 9260c953a8 555ffb2e4d
commit 3d59773a5e
4 changed files with 86 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
glances/outputs/static/html/plugins/cpu.html
View File

@ -1,4 +1,6 @@
<div class="table">
<div class="row">
<div class="col-sm-24 col-md-12 col-lg-8">
<div class="table">
<div class="table-row">
<div class="table-cell text-left title">CPU</div>
<div class="table-cell">{{ statsCpu.total }}%</div>
@ -19,4 +21,62 @@
<div class="table-cell text-left">idle:</div>
<div class="table-cell">{{ statsCpu.idle }}%</div>
</div>
</div>
</div>
<div class="hidden-xs hidden-sm col-md-12 col-lg-8">
<div class="table">
<div class="table-row">
<div class="table-cell text-left">nice:</div>
<div class="table-cell">
{{ statsCpu.nice }}%
</div>
</div>
<div class="table-row" ng-show="statsCpu.irq != undefined">
<div class="table-cell text-left">irq:</div>
<div class="table-cell">
{{ statsCpu.irq }}%
</div>
</div>
<div class="table-row" ng-show="statsCpu.iowait != undefined">
<div class="table-cell text-left">iowait:</div>
<div class="table-cell" ng-class="statsCpu.getDecoration('iowait')">
{{ statsCpu.iowait }}%
</div>
</div>
<div class="table-row" ng-show="statsCpu.steal != undefined">
<div class="table-cell text-left">steal:</div>
<div class="table-cell" ng-class="statsCpu.getDecoration('steal')">
{{ statsCpu.steal }}%
</div>
</div>
</div>
</div>
<div class="hidden-xs hidden-sm hidden-md col-lg-8">
<div class="table">
<div class="table-row">
<div class="table-cell text-left">ctx_sw:</div>
<div class="table-cell" ng-class="statsCpu.getDecoration('ctx_switches')">
{{ statsCpu.ctx_switches }}
</div>
</div>
<div class="table-row">
<div class="table-cell text-left">inter:</div>
<div class="table-cell">
{{ statsCpu.interrupts }}
</div>
</div>
<div class="table-row">
<div class="table-cell text-left">sw_int:</div>
<div class="table-cell">
{{ statsCpu.soft_interrupts }}
</div>
</div>
<div class="table-row" ng-show="!statsSystem.isLinux()">
<div class="table-cell text-left">syscal:</div>
<div class="table-cell">
{{ statsCpu.syscalls }}
</div>
</div>
</div>
</div>
</div>

26
glances/outputs/static/html/plugins/cpu_more.html
View File

@ -1,26 +0,0 @@
<div class="table">
<div class="table-row">
<div class="table-cell text-left">nice:</div>
<div class="table-cell">
{{ statsCpu.nice }}%
</div>
</div>
<div class="table-row" ng-show="statsCpu.irq != undefined">
<div class="table-cell text-left">irq:</div>
<div class="table-cell">
{{ statsCpu.irq }}%
</div>
</div>
<div class="table-row" ng-show="statsCpu.iowait != undefined">
<div class="table-cell text-left">iowait:</div>
<div class="table-cell" ng-class="statsCpu.getDecoration('iowait')">
{{ statsCpu.iowait }}%
</div>
</div>
<div class="table-row" ng-show="statsCpu.steal != undefined">
<div class="table-cell text-left">steal:</div>
<div class="table-cell" ng-class="statsCpu.getDecoration('steal')">
{{ statsCpu.steal }}%
</div>
</div>
</div>

5
glances/outputs/static/html/stats.html
View File

@ -23,12 +23,9 @@
<div class="hidden-xs hidden-sm hidden-md col-lg-6" ng-if="!arguments.disable_quicklook">
<section id="quicklook" class="plugin" ng-include src="'plugins/quicklook.html'"></section>
</div>
<div class="col-sm-6 col-md-4 col-lg-3" ng-if="!arguments.disable_cpu && !arguments.percpu">
<div class="col-sm-6 col-md-8 col-lg-6" ng-if="!arguments.disable_cpu && !arguments.percpu">
<section id="cpu" class="plugin" ng-include src="'plugins/cpu.html'"></section>
</div>
<div class="hidden-xs hidden-sm col-md-4 col-lg-3" ng-if="!arguments.disable_cpu && !arguments.percpu">
<section id="cpu_more" class="plugin" ng-if="statsCpu.nice != undefined" ng-include src="'plugins/cpu_more.html'"></section>
</div>
<div class="col-sm-12 col-md-8 col-lg-6" ng-if="!arguments.disable_cpu && arguments.percpu">
<section id="per_cpu" class="plugin" ng-include src="'plugins/per_cpu.html'"></section>
</div>

8
glances/outputs/static/js/services/plugins/glances_cpu.js
View File

@ -10,6 +10,10 @@ glancesApp.service('GlancesPluginCpu', function() {
this.irq = null;
this.iowait = null;
this.steal = null;
this.ctx_switches = null;
this.interrupts = null;
this.soft_interrupts = null;
this.syscalls = null;
this.setData = function(data, views) {
data = data[_pluginName];
@ -23,6 +27,10 @@ glancesApp.service('GlancesPluginCpu', function() {
this.irq = data.irq;
this.iowait = data.iowait;
this.steal = data.steal;
this.ctx_switches = Math.floor(data.ctx_switches / data.time_since_update);
this.interrupts = Math.floor(data.interrupts / data.time_since_update);
this.soft_interrupts = Math.floor(data.soft_interrupts / data.time_since_update);
this.syscalls = Math.floor(data.syscalls / data.time_since_update);
}
this.getDecoration = function(value) {