Merge branch 'issue2252' into develop

Author: nicolargo

conf/glances.conf

@@ -461,6 +461,14 @@ port_default_gateway=True
 #web_4_url=https://blog.nicolargo.com/nonexist
 #web_4_description=Intranet
 
+[vms]
+disable=False
+# Define the maximum VMs size name (default is 20 chars)
+max_name_size=20
+# By default, Glances only display running VMs
+# Set the following key to True to display all VMs
+all=False
+
 [containers]
 disable=False
 # Only show specific containers (comma-separated list of container name or regular expression)

glances/main.py

@@ -692,6 +692,7 @@ def init_ui_mode(self, args):
             disable(args, 'alert')
             disable(args, 'amps')
             disable(args, 'containers')
+            disable(args, 'vms')
 
         # Manage full quicklook option
         if getattr(args, 'full_quicklook', False):

glances/outputs/glances_curses.py

@@ -84,6 +84,7 @@ class _GlancesCurses:
         'T': {'switch': 'network_sum'},
         'u': {'sort_key': 'username'},
         'U': {'switch': 'network_cumul'},
+        'V': {'switch': 'disable_vms'},
         'w': {'handler': '_handle_clean_logs'},
         'W': {'switch': 'disable_wifi'},
         'x': {'handler': '_handle_clean_critical_logs'},
@@ -124,7 +125,7 @@ class _GlancesCurses:
     _left_sidebar_max_width = 34
 
     # Define right sidebar
-    _right_sidebar = ['containers', 'processcount', 'amps', 'processlist', 'alert']
+    _right_sidebar = ['vms', 'containers', 'processcount', 'amps', 'processlist', 'alert']
 
     def __init__(self, config=None, args=None):
         # Init

glances/outputs/static/css/style.scss

@@ -145,6 +145,12 @@ body {
     padding: 0px 5px 0px 5px;
     white-space: nowrap;
 }
+
+#vms-plugin .table-cell {
+    padding: 0px 10px 0px 10px;
+    white-space: nowrap;
+}
+
 #containers-plugin .table-cell {
     padding: 0px 10px 0px 10px;
     white-space: nowrap;

glances/outputs/static/js/App.vue

@@ -79,6 +79,10 @@
                     </div>
                 </div>
                 <div class="col-sm-18">
+                    <glances-plugin-vms
+                        v-if="!args.disable_vms"
+                        :data="data"
+                    ></glances-plugin-vms>
                     <glances-plugin-containers
                         v-if="!args.disable_containers"
                         :data="data"
@@ -126,6 +130,7 @@ import GlancesPluginSmart from './components/plugin-smart.vue';
 import GlancesPluginSensors from './components/plugin-sensors.vue';
 import GlancesPluginSystem from './components/plugin-system.vue';
 import GlancesPluginUptime from './components/plugin-uptime.vue';
+import GlancesPluginVms from './components/plugin-vms.vue';
 import GlancesPluginWifi from './components/plugin-wifi.vue';
 
 import uiconfig from './uiconfig.json';
@@ -159,6 +164,7 @@ export default {
         GlancesPluginSmart,
         GlancesPluginSystem,
         GlancesPluginUptime,
+        GlancesPluginVms,
         GlancesPluginWifi
     },
     data() {
@@ -374,6 +380,11 @@ export default {
                 this.store.args.disable_ports = !this.store.args.disable_ports;
             });
 
+            // V => Enable/disable VMs stats
+            hotkeys('shift+V', () => {
+                this.store.args.disable_vms = !this.store.args.disable_vms;
+            });
+
             // 'W' > Enable/Disable Wifi plugin
             hotkeys('shift+W', () => {
                 this.store.args.disable_wifi = !this.store.args.disable_wifi;

glances/outputs/static/js/components/help.vue

@@ -60,6 +60,9 @@
                     <div class="divTableCell">
                         {{ help.sort_io_rate }}
                     </div>
+                    <div class="divTableCell">
+                        {{ help.show_hide_vms }}
+                    </div>
                     <div class="divTableCell">
                         {{ help.show_hide_containers }}
                     </div>

glances/outputs/static/js/components/plugin-vms.vue

@@ -0,0 +1,158 @@
+<template>
+    <section id="vms-plugin" class="plugin" v-if="vms.length">
+        <span class="title">VMs</span>
+        {{ vms.length }} sorted by {{ sorter.getColumnLabel(sorter.column) }}
+        <div class="table">
+            <div class="table-row">
+                <div class="table-cell text-left" v-show="showEngine">Engine</div>
+                <div
+                    class="table-cell text-left"
+                    :class="['sortable', sorter.column === 'name' && 'sort']"
+                    @click="args.sort_processes_key = 'name'"
+                >
+                    Name
+                </div>
+                <div class="table-cell">Status</div>
+                <div class="table-cell">Core</div>
+                <div
+                    class="table-cell"
+                    :class="['sortable', sorter.column === 'memory_usage' && 'sort']"
+                    @click="args.sort_processes_key = 'memory_usage'"
+                >
+                    MEM
+                </div>
+                <div class="table-cell text-left">/MAX</div>
+                <div
+                    class="table-cell"
+                    :class="['sortable', sorter.column === 'load_1min' && 'sort']"
+                    @click="args.sort_processes_key = 'load_1min'"
+                >
+                     LOAD 1/5/15min
+                </div>
+                <div class="table-cell text-right">Release</div>
+            </div>
+            <div
+                class="table-row"
+                v-for="(vm, vmId) in vms"
+                :key="vmId"
+            >
+                <div class="table-cell text-left" v-show="showEngine">{{ vm.engine }}</div>
+                <div class="table-cell text-left">{{ vm.name }}</div>
+                <div class="table-cell" :class="vm.status == 'stopped' ? 'careful' : 'ok'">
+                    {{ vm.status }}
+                </div>
+                <div class="table-cell">
+                    {{ $filters.number(vm.cpu_count, 1) }}
+                </div>
+                <div class="table-cell">
+                    {{ $filters.bytes(vm.memory_usage) }}
+                </div>
+                <div class="table-cell text-left">
+                    /{{ $filters.bytes(vm.memory_total) }}
+                </div>
+                <div class="table-cell">
+                    {{ $filters.number(vm.load_1min) }}/{{ $filters.number(vm.load_5min) }}/{{ $filters.number(vm.load_15min) }}
+                </div>
+                <div class="table-cell text-right">
+                    {{ vm.release }}
+                </div>
+            </div>
+        </div>
+    </section>
+</template>
+
+<script>
+import { orderBy } from 'lodash';
+import { store } from '../store.js';
+
+export default {
+    props: {
+        data: {
+            type: Object
+        }
+    },
+    data() {
+        return {
+            store,
+            sorter: undefined
+        };
+    },
+    computed: {
+        args() {
+            return this.store.args || {};
+        },
+        sortProcessesKey() {
+            return this.args.sort_processes_key;
+        },
+        stats() {
+            return this.data.stats['vms'];
+        },
+        views() {
+            return this.data.views['vms'];
+        },
+        vms() {
+            const { sorter } = this;
+            const vms = (this.stats || []).map(
+                (vmData) => {
+                    return {
+                        'id': vmData.id,
+                        'name': vmData.name,
+                        'status': vmData.status != undefined ? vmData.status : '?',
+                        'cpu_count': vmData.cpu_count != undefined ? vmData.cpu_count : '?',
+                        'memory_usage': vmData.memory_usage != undefined ? vmData.memory_usage : '?',
+                        'memory_total': vmData.memory_total != undefined ? vmData.memory_total : '?',
+                        'load_1min': vmData.load_1min != undefined ? vmData.load_1min : '?',
+                        'load_5min': vmData.load_5min != undefined ? vmData.load_5min : '?',
+                        'load_15min': vmData.load_15min != undefined ? vmData.load_15min : '?',
+                        'release': vmData.release,
+                        'image': vmData.image,
+                        'engine': vmData.engine,
+                        'engine_version': vmData.engine_version,
+                    };
+                }
+            );
+            return orderBy(
+                vms,
+                [sorter.column].reduce((retval, col) => {
+                    if (col === 'memory_usage') {
+                        col = ['memory_usage'];
+                    }
+                    return retval.concat(col);
+                }, []),
+                [sorter.isReverseColumn(sorter.column) ? 'desc' : 'asc']
+            );
+        },
+        showEngine() {
+            return this.views.show_engine_name;
+        },
+    },
+    watch: {
+        sortProcessesKey: {
+            immediate: true,
+            handler(sortProcessesKey) {
+                const sortable = ['load_1min', 'memory_usage', 'name'];
+                function isReverseColumn(column) {
+                    return !['name'].includes(column);
+                }
+                function getColumnLabel(value) {
+                    const labels = {
+                        load_1min: 'load',
+                        memory_usage: 'memory consumption',
+                        name: 'VM name',
+                        None: 'None'
+                    };
+                    return labels[value] || value;
+                }
+                if (!sortProcessesKey || sortable.includes(sortProcessesKey)) {
+                    this.sorter = {
+                        column: this.args.sort_processes_key || 'load_1min',
+                        auto: !this.args.sort_processes_key,
+                        isReverseColumn,
+                        getColumnLabel
+                    };
+                }
+            }
+        }
+    }
+};
+</script>

glances/outputs/static/public/glances.js

@@ -227,7 +227,7 @@ def update(self) -> List[Dict]:
         for engine, watcher in iteritems(self.watchers):
             version, containers = watcher.update(all_tag=self._all_tag())
             for container in containers:
-                container["engine"] = 'docker'
+                container["engine"] = engine
             stats.extend(containers)
 
         # Sort and update the stats
@@ -307,6 +307,9 @@ def msg_curse(self, args=None, max_width: Optional[int] = None) -> List[str]:
         ret.append(self.curse_add_line(msg))
         msg = f' sorted by {sort_for_human[self.sort_key]}'
         ret.append(self.curse_add_line(msg))
+        if not self.views['show_engine_name']:
+            msg = f' (served by {self.stats[0].get("engine", "")})'
+        ret.append(self.curse_add_line(msg))
         ret.append(self.curse_new_line())
         # Header
         ret.append(self.curse_new_line())
@@ -430,25 +433,29 @@ def msg_curse(self, args=None, max_width: Optional[int] = None) -> List[str]:
 
     @staticmethod
     def container_alert(status: str) -> str:
-        """Analyse the container status."""
+        """Analyse the container status.
+        One of created, restarting, running, removing, paused, exited, or dead
+        """
         if status == 'running':
             return 'OK'
-        if status == 'exited':
-            return 'WARNING'
         if status == 'dead':
-            return 'CRITICAL'
-        return 'CAREFUL'
+            return 'ERROR'
+        if status in ['created', 'restarting', 'exited']:
+            return 'WARNING'
+        return 'INFO'
 
 
 def sort_docker_stats(stats: List[Dict[str, Any]]) -> Tuple[str, List[Dict[str, Any]]]:
-    # Sort Docker stats using the same function than processes
-    sort_by = glances_processes.sort_key
-    sort_by_secondary = 'memory_usage'
-    if sort_by == 'memory_percent':
+    # Make VM sort related to process sort
+    if glances_processes.sort_key == 'memory_percent':
         sort_by = 'memory_usage'
         sort_by_secondary = 'cpu_percent'
-    elif sort_by in ['username', 'io_counters', 'cpu_times']:
+    elif glances_processes.sort_key == 'name':
+        sort_by = 'name'
+        sort_by_secondary = 'cpu_percent'
+    else:
         sort_by = 'cpu_percent'
+        sort_by_secondary = 'memory_usage'
 
     # Sort docker stats
     sort_stats_processes(

glances/plugins/containers/__init__.py

@@ -1,3 +1,11 @@
+#
+# This file is part of Glances.
+#
+# SPDX-FileCopyrightText: 2024 Nicolas Hennion <nicolas@nicolargo.com>
+#
+# SPDX-License-Identifier: LGPL-3.0-only
+#
+
 from typing import Any, Dict, Protocol, Tuple