From ca0aaed56c9e99bc4c9482d5de56e042f0f79ad2 Mon Sep 17 00:00:00 2001 From: nicolargo Date: Tue, 26 Jul 2022 10:32:53 +0200 Subject: [PATCH] Drive names truncated in Web UI #2055 --- .../js/components/plugin-diskio/view.html | 10 +++++----- .../js/components/plugin-fs/controller.js | 4 ++-- .../static/js/components/plugin-fs/view.html | 4 ++-- glances/outputs/static/public/glances.js | Bin 2388259 -> 2388268 bytes glances/outputs/static/public/glances.map.js | Bin 2785984 -> 2785993 bytes glances/plugins/glances_diskio.py | 5 +---- 6 files changed, 10 insertions(+), 13 deletions(-) diff --git a/glances/outputs/static/js/components/plugin-diskio/view.html b/glances/outputs/static/js/components/plugin-diskio/view.html index 81e4480a..cec71f00 100644 --- a/glances/outputs/static/js/components/plugin-diskio/view.html +++ b/glances/outputs/static/js/components/plugin-diskio/view.html @@ -7,10 +7,10 @@
IOW/s
-
{{(disk.alias ? disk.alias : disk.name) | min_size:9}}
-
{{disk.bitrate.txps }}
-
{{disk.bitrate.rxps }}
+
{{ (disk.alias ? disk.alias : disk.name) | min_size:32 }}
+
{{ disk.bitrate.txps }}
+
{{ disk.bitrate.rxps }}
-
{{disk.count.txps }}
-
{{disk.count.rxps }}
+
{{ disk.count.txps }}
+
{{ disk.count.rxps }}
diff --git a/glances/outputs/static/js/components/plugin-fs/controller.js b/glances/outputs/static/js/components/plugin-fs/controller.js index b4cfdbab..bdee3605 100644 --- a/glances/outputs/static/js/components/plugin-fs/controller.js +++ b/glances/outputs/static/js/components/plugin-fs/controller.js @@ -22,8 +22,8 @@ export default function GlancesPluginFsController($scope, $filter, GlancesStats, var fsData = stats[i]; var shortMountPoint = fsData['mnt_point']; - if (shortMountPoint.length > 9) { - shortMountPoint = '_' + fsData['mnt_point'].slice(-8); + if (shortMountPoint.length > 22) { + shortMountPoint = '_' + fsData['mnt_point'].slice(-21); } vm.fileSystems.push({ diff --git a/glances/outputs/static/js/components/plugin-fs/view.html b/glances/outputs/static/js/components/plugin-fs/view.html index 0ca9bd3f..52482556 100644 --- a/glances/outputs/static/js/components/plugin-fs/view.html +++ b/glances/outputs/static/js/components/plugin-fs/view.html @@ -7,8 +7,8 @@
Total
-
{{ fs.shortMountPoint }} ({{ fs.name }}) +
{{ fs.shortMountPoint }} + ({{ fs.name }})
{{ fs.used | bytes }} diff --git a/glances/outputs/static/public/glances.js b/glances/outputs/static/public/glances.js index 1e0333364a5f911bd7ffa3403716ac3dff23458f..094fb65743d24c67220397588ae7070d86795559 100644 GIT binary patch delta 276 zcmWN{KQBX39LDjSdzDfxs;EEZw7*FNxu-_;21IxP5(x>l+?%xLrb9;(*2ZvNKu3m7 z=SITp9o!dSGny^F!zbToc*fr&^@d5}17qCiMAcp%eLFPKuKP8`#zXF(a<32|#1smc z#te#>#T-hQM;R3?U=d5GVi`58U=?eqV;vjV#1pGv!?l_+Q%H~Etz zcm5$|_u7+6I2>v>wsOs*kjf3|rgEip_LWLlb%*b=Cpx~{?{||y=dyL%KVbFjS(3)~ SBDs&PKJMtqWc6n${rm$v1A3_U{7rrGyKhwWePHV9TvuK*rRT(q6QgJ`#RV=h%_U~I%oS#t z<0{v<&JAwT<`(nZ<_>qc$9)!fz#

;t?H|90_3 zbuN;ozK`TO{)r@I>&vOQCyl`QC+M6GyZy&n!)*_};O4I7^;$tE>^c`U$3Kh9FOvQJ E0}~N-od5s; diff --git a/glances/outputs/static/public/glances.map.js b/glances/outputs/static/public/glances.map.js index f14559abde30ed6693a18fbf668c08976e3b0604..d967382ff80be0a80f44ad36bad33839015f389c 100644 GIT binary patch delta 402 zcmZ9_yG{Z@6b9fd;D8E4@PZG9VFX6O4*>|m7=&OPCLj!x5P>L6!8FXkEX=_?EWjef zfWq&8aae{GNWdy2Va>^PnK!9WS?Dv>oz@S~e5s)P?y-=&)1h+EXHDeP z0XxFe9k9AW9rD8VL-Ng&$|Pv3wrt=1r9-tEn;=zZhlu(EDo7%NyR-N=9DE&I9G(O3dExuMw~Kq>8O{SC=nE2o81z4plDw-Q*o@&Z{5oTP z-LM?SEXVNi>)Zd5j!t(B7oBSxCX)G=)*0JA3y)=TEhM|>yBN5G5g{p%mn&hF3#XF8 zzivrQusAy;vzKO%fCK|D2tzOoNl3v6q#*-Y$bk%bD8ML;fdb<&0h2HV(@=yNP~msq z9L&Q4l%Nb1SPab`l`4EIqRY56>u75?k6Ma<$27;^BkFQ1rX7A4({`ACrOgcg6t!}q i(eQY2NmKHB-Ky8@w5mrfZ~vsNZfvS6wJ`di;=>QH%6&Ef diff --git a/glances/plugins/glances_diskio.py b/glances/plugins/glances_diskio.py index 2134e974..fa042cfe 100644 --- a/glances/plugins/glances_diskio.py +++ b/glances/plugins/glances_diskio.py @@ -187,10 +187,7 @@ class Plugin(GlancesPlugin): if all([self.get_views(item=i[self.get_key()], key=f, option='hidden') for f in self.hide_zero_fields]): continue # Is there an alias for the disk name ? - disk_real_name = i['disk_name'] - disk_name = self.has_alias(i['disk_name']) - if disk_name is None: - disk_name = disk_real_name + disk_name = self.has_alias(i['disk_name']) if self.has_alias(i['disk_name']) else i['disk_name'] # New line ret.append(self.curse_new_line()) if len(disk_name) > name_max_width: