diff options
Diffstat (limited to 'glances/outputs/static/js/components/plugin-containers.vue')
| -rw-r--r-- | glances/outputs/static/js/components/plugin-containers.vue | 34 |
1 files changed, 25 insertions, 9 deletions
diff --git a/glances/outputs/static/js/components/plugin-containers.vue b/glances/outputs/static/js/components/plugin-containers.vue index 8383344a..51366399 100644 --- a/glances/outputs/static/js/components/plugin-containers.vue +++ b/glances/outputs/static/js/components/plugin-containers.vue @@ -4,8 +4,8 @@ {{ containers.length }} sorted by {{ sorter.getColumnLabel(sorter.column) }} <div class="table"> <div class="table-row"> - <div class="table-cell text-left">Engine</div> - <div class="table-cell text-left">Pod</div> + <div class="table-cell text-left" v-show="showEngine">Engine</div> + <div class="table-cell text-left" v-show="showPod">Pod</div> <div class="table-cell text-left" :class="['sortable', sorter.column === 'name' && 'sort']" @@ -29,7 +29,7 @@ > MEM </div> - <div class="table-cell">/MAX</div> + <div class="table-cell text-left">/MAX</div> <div class="table-cell">IOR/s</div> <div class="table-cell">IOW/s</div> <div class="table-cell">RX/s</div> @@ -41,8 +41,8 @@ v-for="(container, containerId) in containers" :key="containerId" > - <div class="table-cell text-left">{{ container.engine }}</div> - <div class="table-cell text-left">{{ container.pod_id || '-' }}</div> + <div class="table-cell text-left" v-show="showEngine">{{ container.engine }}</div> + <div class="table-cell text-left" v-show="showPod">{{ container.pod_id || '-' }}</div> <div class="table-cell text-left">{{ container.name }}</div> <div class="table-cell" :class="container.status == 'Paused' ? 'careful' : 'ok'"> {{ container.status }} @@ -56,8 +56,8 @@ <div class="table-cell"> {{ $filters.bytes(container.memory_usage) }} </div> - <div class="table-cell"> - {{ $filters.bytes(container.limit) }} + <div class="table-cell text-left"> + /{{ $filters.bytes(container.limit) }} </div> <div class="table-cell"> {{ $filters.bytes(container.io_rx) }} @@ -105,18 +105,28 @@ export default { stats() { return this.data.stats['containers']; }, + views() { + return this.data.views['containers']; + }, containers() { const { sorter } = this; const containers = (this.stats || []).map( (containerData) => { - // prettier-ignore + let memory_usage_no_cache = '?' + if (containerData.memory.usage != undefined) { + memory_usage_no_cache = containerData.memory.usage; + if (containerData.memory.inactive_file != undefined) { + memory_usage_no_cache = memory_usage_no_cache - containerData.memory.inactive_file; + } + } + return { 'id': containerData.id, 'name': containerData.name, 'status': containerData.status, 'uptime': containerData.uptime, 'cpu_percent': containerData.cpu.total, - 'memory_usage': containerData.memory.usage != undefined ? containerData.memory.usage : '?', + 'memory_usage': memory_usage_no_cache, 'limit': containerData.memory.limit != undefined ? containerData.memory.limit : '?', 'io_rx': containerData.io_rx != undefined ? containerData.io_rx : '?', 'io_wx': containerData.io_wx != undefined ? containerData.io_wx : '?', @@ -139,6 +149,12 @@ export default { }, []), [sorter.isReverseColumn(sorter.column) ? 'desc' : 'asc'] ); + }, + showEngine() { + return this.views.show_engine_name; + }, + showPod() { + return this.views.show_pod_name; } }, watch: { |