diff options
Diffstat (limited to 'glances/outputs/static/js/components')
5 files changed, 53 insertions, 79 deletions
diff --git a/glances/outputs/static/js/components/help.vue b/glances/outputs/static/js/components/help.vue index 468f1a1c..a08d7667 100644 --- a/glances/outputs/static/js/components/help.vue +++ b/glances/outputs/static/js/components/help.vue @@ -266,7 +266,7 @@ export default { }; }, mounted() { - fetch('api/3/help', { method: 'GET' }) + fetch('api/4/help', { method: 'GET' }) .then((response) => response.json()) .then((response) => (this.help = response)); } diff --git a/glances/outputs/static/js/components/plugin-alert.vue b/glances/outputs/static/js/components/plugin-alert.vue index 73db0502..4a9393af 100644 --- a/glances/outputs/static/js/components/plugin-alert.vue +++ b/glances/outputs/static/js/components/plugin-alert.vue @@ -11,6 +11,7 @@ <div class="table-row" v-for="(alert, alertId) in alerts" :key="alertId"> <div class="table-cell text-left"> {{ formatDate(alert.begin) }} + {{ alert.tz }} ({{ alert.ongoing ? 'ongoing' : alert.duration }}) - <span v-show="!alert.ongoing"> {{ alert.level }} on </span> <span :class="alert.level.toLowerCase()"> @@ -41,10 +42,11 @@ export default { alerts() { return (this.stats || []).map((alertalertStats) => { const alert = {}; + var tzoffset = new Date().getTimezoneOffset(); alert.name = alertalertStats[3]; alert.level = alertalertStats[2]; - alert.begin = alertalertStats[0] * 1000; - alert.end = alertalertStats[1] * 1000; + alert.begin = alertalertStats[0] * 1000 - tzoffset * 60 * 1000; + alert.end = alertalertStats[1] * 1000 - tzoffset * 60 * 1000; alert.ongoing = alertalertStats[1] == -1; alert.min = alertalertStats[6]; alert.mean = alertalertStats[5]; diff --git a/glances/outputs/static/js/components/plugin-fs.vue b/glances/outputs/static/js/components/plugin-fs.vue index f7dd5880..e01bf502 100644 --- a/glances/outputs/static/js/components/plugin-fs.vue +++ b/glances/outputs/static/js/components/plugin-fs.vue @@ -10,8 +10,8 @@ </div> <div class="table-row" v-for="(fs, fsId) in fileSystems" :key="fsId"> <div class="table-cell text-left"> - {{ fs.shortMountPoint }} - <span v-if="fs.shortMountPoint.length <= 12" class="visible-lg-inline"> + {{ $filters.minSize(fs.alias ? fs.alias : fs.mountPoint, 36, begin=false) }} + <span v-if="(fs.alias ? fs.alias : fs.mountPoint).length + fs.name.length <= 34" class="visible-lg-inline"> ({{ fs.name }}) </span> </div> @@ -55,18 +55,14 @@ export default { }, fileSystems() { const fileSystems = this.stats.map((fsData) => { - let shortMountPoint = fsData['mnt_point']; - if (shortMountPoint.length > 22) { - shortMountPoint = '_' + fsData['mnt_point'].slice(-21); - } return { name: fsData['device_name'], mountPoint: fsData['mnt_point'], - shortMountPoint: shortMountPoint, percent: fsData['percent'], size: fsData['size'], used: fsData['used'], - free: fsData['free'] + free: fsData['free'], + alias: fsData['alias'] !== undefined ? fsData['alias'] : null }; }); return orderBy(fileSystems, ['mnt_point']); diff --git a/glances/outputs/static/js/components/plugin-process.vue b/glances/outputs/static/js/components/plugin-process.vue index 36cf2500..05b053fb 100644 --- a/glances/outputs/static/js/components/plugin-process.vue +++ b/glances/outputs/static/js/components/plugin-process.vue @@ -64,13 +64,13 @@ export default { } function getColumnLabel(value) { const labels = { - io_counters: 'disk IO', cpu_percent: 'CPU consumption', memory_percent: 'memory consumption', - cpu_times: 'process time', username: 'user name', - name: 'process name', timemillis: 'process time', + cpu_times: 'process time', + io_counters: 'disk IO', + name: 'process name', None: 'None' }; return labels[value] || value; diff --git a/glances/outputs/static/js/components/plugin-processlist.vue b/glances/outputs/static/js/components/plugin-processlist.vue index 462fce61..ca9951bc 100644 --- a/glances/outputs/static/js/components/plugin-processlist.vue +++ b/glances/outputs/static/js/components/plugin-processlist.vue @@ -3,112 +3,88 @@ <section id="processlist-plugin" class="plugin"> <div class="table"> <div class="table-row"> - <div - class="table-cell" - :class="['sortable', sorter.column === 'cpu_percent' && 'sort']" - @click="$emit('update:sorter', 'cpu_percent')" - > + <div class="table-cell width-50" :class="['sortable', sorter.column === 'cpu_percent' && 'sort']" + @click="$emit('update:sorter', 'cpu_percent')"> CPU% </div> - <div - class="table-cell" - :class="['sortable', sorter.column === 'memory_percent' && 'sort']" - @click="$emit('update:sorter', 'memory_percent')" - > + <div class="table-cell width-50" :class="['sortable', sorter.column === 'memory_percent' && 'sort']" + @click="$emit('update:sorter', 'memory_percent')"> MEM% </div> - <div class="table-cell hidden-xs hidden-sm">VIRT</div> - <div class="table-cell hidden-xs hidden-sm">RES</div> - <div class="table-cell">PID</div> - <div - class="table-cell text-left" - :class="['sortable', sorter.column === 'username' && 'sort']" - @click="$emit('update:sorter', 'username')" - > + <div class="table-cell width-75 hidden-xs hidden-sm">VIRT</div> + <div class="table-cell width-75 hidden-xs hidden-sm">RES</div> + <div class="table-cell width-75">PID</div> + <div class="table-cell width-100 text-left" :class="['sortable', sorter.column === 'username' && 'sort']" + @click="$emit('update:sorter', 'username')"> USER </div> - <div - class="table-cell hidden-xs hidden-sm" + <div class="table-cell width-100 hidden-xs hidden-sm" :class="['sortable', sorter.column === 'timemillis' && 'sort']" - @click="$emit('update:sorter', 'timemillis')" - > + @click="$emit('update:sorter', 'timemillis')"> TIME+ </div> - <div - class="table-cell text-left hidden-xs hidden-sm" + <div class="table-cell width-75 text-left hidden-xs hidden-sm" :class="['sortable', sorter.column === 'num_threads' && 'sort']" - @click="$emit('update:sorter', 'num_threads')" - > + @click="$emit('update:sorter', 'num_threads')"> THR </div> - <div class="table-cell">NI</div> - <div class="table-cell">S</div> - <div - v-show="ioReadWritePresent" - class="table-cell hidden-xs hidden-sm" + <div class="table-cell width-50">NI</div> + <div class="table-cell width-50">S</div> + <div v-show="ioReadWritePresent" class="table-cell width-75 hidden-xs hidden-sm" :class="['sortable', sorter.column === 'io_counters' && 'sort']" - @click="$emit('update:sorter', 'io_counters')" - > + @click="$emit('update:sorter', 'io_counters')"> IOR/s </div> - <div - v-show="ioReadWritePresent" - class="table-cell text-left hidden-xs hidden-sm" + <div v-show="ioReadWritePresent" class="table-cell width-75 text-left hidden-xs hidden-sm" :class="['sortable', sorter.column === 'io_counters' && 'sort']" - @click="$emit('update:sorter', 'io_counters')" - > + @click="$emit('update:sorter', 'io_counters')"> IOW/s </div> - <div - class="table-cell text-left" - :class="['sortable', sorter.column === 'name' && 'sort']" - @click="$emit('update:sorter', 'name')" - > + <div class="table-cell text-left" :class="['sortable', sorter.column === 'name' && 'sort']" + @click="$emit('update:sorter', 'name')"> Command </div> </div> - <div - class="table-row" - v-for="(process, processId) in processes" - :key="processId" - > - <div class="table-cell" :class="getCpuPercentAlert(process)"> + <div class="table-row" v-for="(process, processId) in processes" :key="processId"> + <div class="table-cell width-50" :class="getCpuPercentAlert(process)"> {{ process.cpu_percent == -1 ? '?' : $filters.number(process.cpu_percent, 1) }} </div> - <div class="table-cell" :class="getMemoryPercentAlert(process)"> + <div class="table-cell width-50" :class="getMemoryPercentAlert(process)"> {{ process.memory_percent == -1 ? '?' : $filters.number(process.memory_percent, 1) }} </div> - <div class="table-cell hidden-xs hidden-sm"> + <div class="table-cell width-75"> {{ $filters.bytes(process.memvirt) }} </div> - <div class="table-cell hidden-xs hidden-sm"> + <div class="table-cell width-75"> {{ $filters.bytes(process.memres) }} </div> - <div class="table-cell"> + <div class="table-cell width-75"> {{ process.pid }} </div> - <div class="table-cell text-left"> + <div class="table-cell width-100 text-left"> {{ process.username }} </div> - <div class="table-cell hidden-xs hidden-sm" v-if="process.timeplus != '?'"> + <div class="table-cell width-100 hidden-xs hidden-sm" v-if="process.timeplus != '?'"> <span v-show="process.timeplus.hours > 0" class="highlight">{{ process.timeplus.hours }}h</span> - {{ $filters.leftPad(process.timeplus.minutes, 2, '0') }}:{{ $filters.leftPad(process.timeplus.seconds, 2, '0') }} - <span v-show="process.timeplus.hours <= 0">.{{ $filters.leftPad(process.timeplus.milliseconds, 2, '0') }}</span> + {{ $filters.leftPad(process.timeplus.minutes, 2, '0') }}:{{ $filters.leftPad(process.timeplus.seconds, + 2, '0') }} + <span v-show="process.timeplus.hours <= 0">.{{ $filters.leftPad(process.timeplus.milliseconds, 2, '0') + }}</span> </div> - <div class="table-cell hidden-xs hidden-sm" v-if="process.timeplus == '?'">?</div> - <div class="table-cell text-left hidden-xs hidden-sm"> + <div class="table-cell width-75 hidden-xs hidden-sm" v-if="process.timeplus == '?'">?</div> + <div class="table-cell width-75 text-left hidden-xs hidden-sm"> {{ process.num_threads == -1 ? '?' : process.num_threads }} </div> - <div class="table-cell" :class="{ nice: process.isNice }"> + <div class="table-cell width-50" :class="{ nice: process.isNice }"> {{ $filters.exclamation(process.nice) }} </div> - <div class="table-cell" :class="{ status: process.status == 'R' }"> + <div class="table-cell width-50" :class="{ status: process.status == 'R' }"> {{ process.status }} </div> - <div class="table-cell hidden-xs hidden-sm" v-show="ioReadWritePresent"> + <div class="table-cell width-75 hidden-xs hidden-sm" v-show="ioReadWritePresent"> {{ $filters.bytes(process.io_read) }} </div> - <div class="table-cell text-left hidden-xs hidden-sm" v-show="ioReadWritePresent"> + <div class="table-cell width-75 text-left hidden-xs hidden-sm" v-show="ioReadWritePresent"> {{ $filters.bytes(process.io_write) }} </div> <div class="table-cell text-left" v-show="args.process_short_name"> @@ -159,8 +135,8 @@ export default { process.memvirt = '?'; process.memres = '?'; if (process.memory_info) { - process.memvirt = process.memory_info[1]; - process.memres = process.memory_info[0]; + process.memvirt = process.memory_info.vms; + process.memres = process.memory_info.rss; } process.timeplus = '?'; |