From 5fbcf94ca7158815b50cb77dfe010f28ffcc0afe Mon Sep 17 00:00:00 2001 From: Floran Brutel Date: Fri, 20 Nov 2020 18:48:00 +0100 Subject: [PATCH] Fix sort by disk io in the web ui --- .../components/plugin-process/controller.js | 2 +- .../plugin-processlist/controller.js | 27 ++++++------------ .../components/plugin-processlist/view.html | 4 +-- glances/outputs/static/public/glances.js | Bin 2207085 -> 2206844 bytes glances/outputs/static/public/glances.map.js | Bin 2637194 -> 2636911 bytes 5 files changed, 12 insertions(+), 21 deletions(-) diff --git a/glances/outputs/static/js/components/plugin-process/controller.js b/glances/outputs/static/js/components/plugin-process/controller.js index bc6d8a52..ac689e98 100644 --- a/glances/outputs/static/js/components/plugin-process/controller.js +++ b/glances/outputs/static/js/components/plugin-process/controller.js @@ -10,7 +10,7 @@ export default function GlancesPluginProcessController(ARGUMENTS, hotkeys) { return !(column === 'username' || column === 'name'); }, getColumnLabel: function (column) { - if (_.isEqual(column, ['io_read', 'io_write'])) { + if (column === 'io_read' || column === 'io_write') { return 'io_counters'; } else { return column; diff --git a/glances/outputs/static/js/components/plugin-processlist/controller.js b/glances/outputs/static/js/components/plugin-processlist/controller.js index fe42580e..3a0d1947 100644 --- a/glances/outputs/static/js/components/plugin-processlist/controller.js +++ b/glances/outputs/static/js/components/plugin-processlist/controller.js @@ -37,35 +37,26 @@ export default function GlancesPluginProcesslistController($scope, GlancesStats, } if (process.num_threads === null) { - process.num_threads = -1; + process.num_threads = -1; } if (process.cpu_percent === null) { - process.cpu_percent = -1; + process.cpu_percent = -1; } - if (process.memory_percent === null) { - process.memory_percent = -1; + if (process.memory_percent === null) { + process.memory_percent = -1; } - process.ioRead = null; - process.ioWrite = null; + process.io_read = null; + process.io_write = null; if (process.io_counters) { vm.ioReadWritePresent = true; - process.ioRead = (process.io_counters[0] - process.io_counters[2]) / process.time_since_update; - - if (process.ioRead != 0) { - process.ioRead = $filter('bytes')(process.ioRead); - } - - process.ioWrite = (process.io_counters[1] - process.io_counters[3]) / process.time_since_update; - - if (process.ioWrite != 0) { - process.ioWrite = $filter('bytes')(process.ioWrite); - } + process.io_read = (process.io_counters[0] - process.io_counters[2]) / process.time_since_update; + process.io_write = (process.io_counters[1] - process.io_counters[3]) / process.time_since_update; } process.isNice = process.nice !== undefined && ((data.stats.isWindows && process.nice != 32) || (!data.stats.isWindows && process.nice != 0)); @@ -81,7 +72,7 @@ export default function GlancesPluginProcesslistController($scope, GlancesStats, if (data.isWindows && process.username !== null) { process.username = _.last(process.username.split('\\')); } - + vm.processes.push(process); } } diff --git a/glances/outputs/static/js/components/plugin-processlist/view.html b/glances/outputs/static/js/components/plugin-processlist/view.html index 65ed50fb..207721ff 100644 --- a/glances/outputs/static/js/components/plugin-processlist/view.html +++ b/glances/outputs/static/js/components/plugin-processlist/view.html @@ -32,8 +32,8 @@
{{process.nice | exclamation}}
{{process.status}}
- - + +
{{process.name}}
{{process.cmdline}}
diff --git a/glances/outputs/static/public/glances.js b/glances/outputs/static/public/glances.js index 9858f5d8d299fc1079382f271f9cdfb23b8460b9..73e2003dd868ae9bf49fe61eec010b36d61c9151 100644 GIT binary patch delta 359 zcmaERtBvu`jW))H7RDB)7UmX~7Sq57TFfL7Wo#1EsB45b(8aRN^|oRY;A27)HCzri&7I))D>!K z6wt)Wi!w`6)u(S{k(b);z^6DzcDkRoBG>d&_KLjIKWZxmLAc&JiXPK7brhu_+-*9F z)~sM7r+=`M5}od=rO3env;=I}bb|~YvFQi;#aX7`2Z~R()>VvP2P;;voo=YBC^~(e zuA=pH<}Wfr(>LfSvT?yQ!lak#0i~bt$Vh|D-QKOQ$j&rI>vXU-H znVcZ9-g{DzOOmin4{49HX7cMB%T~Dd(pwnz=xG*=v?jvpRTbRCKk`O;34(^2^I)cD z5kyU@TSV;zkJEHiP_k077?qVx@<-sDOVM2f)@k~~Z>RRBLqn|~7)-L#Lm0$ajFL5< zixMF)1b)&uo7t7~C8-b)c1}xDQ3wY9YWpfqZ+1}P%hx?!PTiC7QP>!=n7esz){rLj z8~^L+lhhYgZ@@~oVX#q41Y_ee3OW_X8r2xoZG-8_ML5$Ah=+UCg+;yGBeq>v6aAV?+!9nQMaY{X#%$0Hv8{yS;$-ZpV4O`ui>PAo9=zV3#Z=bKKqk_u~c|kgT zj=wbIEnjseovzNr=Q8Q^TqdsKq;mU(Jl12BGyL+AoG?S{^04yX&dRJMLm$||0sY{F z0dRpE2H_ZZzzfI02Yv{E0znvpVF}$!@%-ZTTMLFr zrBZ_C7qv=JFOaC!#F6`@%KXhDFFRri3pHjpe?KJ-@r4#S`AL)VoM_Vke{PbCS1by$ z=hLK{cRvc5r!5Nb_a=>WmtSv^=kLlX`7p(ipF-h|Mb190o5)@c3~?vn>*d>Ra`3el z-W}YatfW;~+n|fQU-El6i?F0E@s$=`;{9jiVV-_R4m1Cr6p1^LnAg1jfr4JwVMNqK lu8QA(eH`_3xu1x4x9PmQ8~kVZW`~k|XD{kD@9vOv^$(Yf*f0P9 delta 702 zcmaLSO=uHA6bEp!$uwybP4l%T(YBK|%}XG}SZ&%`inJgGsuX*PDB9Fy8&=|Onxu%g z^biD3mWuD-!JY&KoAw}k5c~j}s3$8Tf<095B%<}E_Tt<0P(<-M;4Yl7FPuGyi!#RRYj;O#;Rg^sIX@bP~9>G z@aZq14J#7ki2xc7L*hCc$vL-<;F%wb7Rq5l0M0(On)-otFbQQ zB{hkwH(5;kSz|u&p95SA)fs6aW?~_&q>WgKjqD+NiJi0)2XPV?aT5;_$v)yGKH?|) z$pO+qI!PDdBtW`J4+)Z9EmRN9eu_-RD^Y$9WOb@2O=ls>_2reK zT$bQGo_2~NrtbzV+Q<8F%a64NSa5y~GCQlUYcMYG5e#&!fTXwcD)Zv(667STZ zho$tJ@ZedG7dPvWGfh$nK52j#vke%=;Af8$(-VGEd!eXiq*5s+tNIZhzyg393tv1I zth@vZP1W2V;lUX>UzUntxOlZJl^_!SBZ=Rwoi5z6i40f9>25u1l+_eIYCvkY&aoS6 zPWV?}gfjZ*{J(|z5nO%iZZ*qPyhe`