diff --git a/conf/glances.conf b/conf/glances.conf index d8407278..22bd435d 100644 --- a/conf/glances.conf +++ b/conf/glances.conf @@ -13,7 +13,7 @@ check_update=true # Default is 1200 values (~1h with the default refresh rate) history_size=1200 # Set the way Glances should display the date (default is %Y-%m-%d %H:%M:%S %Z) -# strftime_format=%Y-%m-%d %H:%M:%S %Z +#strftime_format=%Y-%m-%d %H:%M:%S %Z # Define external directory for loading additional plugins # The layout follows the glances standard for plugin definitions #plugin_dir=/home/user/dev/plugins diff --git a/docker-compose/glances.conf b/docker-compose/glances.conf index 437411ba..befe1bb3 100755 --- a/docker-compose/glances.conf +++ b/docker-compose/glances.conf @@ -469,8 +469,8 @@ port_default_gateway=False disable=True # 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 +# By default, Glances only display running VMs with states: 'Running', 'Starting' or 'Restarting' +# Set the following key to True to display all VMs regarding their states all=False [containers] diff --git a/docs/api.rst b/docs/api.rst index 85ea8828..a9388bae 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -142,7 +142,7 @@ Get plugin stats:: "refresh": 3.0, "regex": True, "result": None, - "timer": 0.8286657333374023}, + "timer": 0.7421658039093018}, {"count": 0, "countmax": 20.0, "countmin": None, @@ -151,7 +151,7 @@ Get plugin stats:: "refresh": 3.0, "regex": True, "result": None, - "timer": 0.8286099433898926}] + "timer": 0.7420744895935059}] Fields descriptions: @@ -179,7 +179,7 @@ Get a specific item when field matches the given value:: "refresh": 3.0, "regex": True, "result": None, - "timer": 0.8286657333374023}]} + "timer": 0.7421658039093018}]} GET cloud --------- @@ -266,19 +266,19 @@ Get plugin stats:: # curl http://localhost:61208/api/4/cpu {"cpucore": 16, - "ctx_switches": 412311567, - "guest": 0.2, - "idle": 93.0, - "interrupts": 329221917, - "iowait": 0.5, + "ctx_switches": 83690538, + "guest": 0.3, + "idle": 87.8, + "interrupts": 68393590, + "iowait": 0.4, "irq": 0.0, "nice": 0.0, - "soft_interrupts": 143979801, + "soft_interrupts": 28582338, "steal": 0.0, "syscalls": 0, - "system": 3.8, - "total": 6.4, - "user": 2.6} + "system": 3.9, + "total": 13.9, + "user": 7.9} Fields descriptions: @@ -311,7 +311,7 @@ Fields descriptions: Get a specific field:: # curl http://localhost:61208/api/4/cpu/total - {"total": 6.4} + {"total": 13.9} GET diskio ---------- @@ -321,16 +321,16 @@ Get plugin stats:: # curl http://localhost:61208/api/4/diskio [{"disk_name": "nvme0n1", "key": "disk_name", - "read_bytes": 10233366016, - "read_count": 444370, - "write_bytes": 36399039488, - "write_count": 2332914}, + "read_bytes": 6133975552, + "read_count": 204491, + "write_bytes": 12821570560, + "write_count": 455173}, {"disk_name": "nvme0n1p1", "key": "disk_name", - "read_bytes": 13374464, - "read_count": 878, - "write_bytes": 5120, - "write_count": 3}] + "read_bytes": 7476224, + "read_count": 576, + "write_bytes": 1024, + "write_count": 2}] Fields descriptions: @@ -364,10 +364,10 @@ Get a specific item when field matches the given value:: # curl http://localhost:61208/api/4/diskio/disk_name/nvme0n1 {"nvme0n1": [{"disk_name": "nvme0n1", "key": "disk_name", - "read_bytes": 10233366016, - "read_count": 444370, - "write_bytes": 36399039488, - "write_count": 2332914}]} + "read_bytes": 6133975552, + "read_count": 204491, + "write_bytes": 12821570560, + "write_count": 455173}]} GET folders ----------- @@ -394,13 +394,13 @@ Get plugin stats:: # curl http://localhost:61208/api/4/fs [{"device_name": "/dev/mapper/ubuntu--vg-ubuntu--lv", - "free": 862184042496, + "free": 858865106944, "fs_type": "ext4", "key": "mnt_point", "mnt_point": "/", - "percent": 9.5, + "percent": 9.8, "size": 1003736440832, - "used": 90489892864}] + "used": 93808828416}] Fields descriptions: @@ -421,13 +421,13 @@ Get a specific item when field matches the given value:: # curl http://localhost:61208/api/4/fs/mnt_point// {"/": [{"device_name": "/dev/mapper/ubuntu--vg-ubuntu--lv", - "free": 862184042496, + "free": 858865106944, "fs_type": "ext4", "key": "mnt_point", "mnt_point": "/", - "percent": 9.5, + "percent": 9.8, "size": 1003736440832, - "used": 90489892864}]} + "used": 93808828416}]} GET gpu ------- @@ -460,8 +460,8 @@ GET ip Get plugin stats:: # curl http://localhost:61208/api/4/ip - {"address": "192.168.1.26", - "gateway": "192.168.1.1", + {"address": "192.168.0.28", + "gateway": "192.168.0.254", "mask": "255.255.255.0", "mask_cidr": 24, "public_address": "", @@ -479,7 +479,7 @@ Fields descriptions: Get a specific field:: # curl http://localhost:61208/api/4/ip/gateway - {"gateway": "192.168.1.1"} + {"gateway": "192.168.0.254"} GET irq ------- @@ -500,7 +500,10 @@ GET load Get plugin stats:: # curl http://localhost:61208/api/4/load - {"cpucore": 16, "min1": 0.46875, "min15": 0.73095703125, "min5": 0.58447265625} + {"cpucore": 16, + "min1": 0.69970703125, + "min15": 0.9453125, + "min5": 1.05517578125} Fields descriptions: @@ -512,7 +515,7 @@ Fields descriptions: Get a specific field:: # curl http://localhost:61208/api/4/load/min1 - {"min1": 0.46875} + {"min1": 0.69970703125} GET mem ------- @@ -520,16 +523,16 @@ GET mem Get plugin stats:: # curl http://localhost:61208/api/4/mem - {"active": 6656831488, - "available": 7370416128, - "buffers": 215392256, - "cached": 5607911424, - "free": 7370416128, - "inactive": 5146501120, - "percent": 55.1, - "shared": 842547200, - "total": 16422449152, - "used": 9052033024} + {"active": 8330940416, + "available": 7318421504, + "buffers": 286502912, + "cached": 6904299520, + "free": 7318421504, + "inactive": 5188993024, + "percent": 55.4, + "shared": 759005184, + "total": 16422461440, + "used": 9104039936} Fields descriptions: @@ -548,7 +551,7 @@ Fields descriptions: Get a specific field:: # curl http://localhost:61208/api/4/mem/total - {"total": 16422449152} + {"total": 16422461440} GET memswap ----------- @@ -556,13 +559,13 @@ GET memswap Get plugin stats:: # curl http://localhost:61208/api/4/memswap - {"free": 2702700544, - "percent": 37.1, - "sin": 298672128, - "sout": 1976266752, + {"free": 4288933888, + "percent": 0.1, + "sin": 0, + "sout": 4780032, "time_since_update": 1, "total": 4294963200, - "used": 1592262656} + "used": 6029312} Fields descriptions: @@ -587,26 +590,26 @@ Get plugin stats:: # curl http://localhost:61208/api/4/network [{"alias": None, "bytes_all": 0, - "bytes_all_gauge": 7028492055, + "bytes_all_gauge": 3362386796, "bytes_recv": 0, - "bytes_recv_gauge": 6785696329, + "bytes_recv_gauge": 3268049883, "bytes_sent": 0, - "bytes_sent_gauge": 242795726, + "bytes_sent_gauge": 94336913, "interface_name": "wlp0s20f3", "key": "interface_name", "speed": 0, - "time_since_update": 0.834984302520752}, + "time_since_update": 0.7511422634124756}, {"alias": None, "bytes_all": 0, - "bytes_all_gauge": 44559, + "bytes_all_gauge": 4118859, "bytes_recv": 0, - "bytes_recv_gauge": 8878, + "bytes_recv_gauge": 852264, "bytes_sent": 0, - "bytes_sent_gauge": 35681, + "bytes_sent_gauge": 3266595, "interface_name": "mpqemubr0", "key": "interface_name", "speed": 10485760000, - "time_since_update": 0.834984302520752}] + "time_since_update": 0.7511422634124756}] Fields descriptions: @@ -635,15 +638,15 @@ Get a specific item when field matches the given value:: # curl http://localhost:61208/api/4/network/interface_name/wlp0s20f3 {"wlp0s20f3": [{"alias": None, "bytes_all": 0, - "bytes_all_gauge": 7028492055, + "bytes_all_gauge": 3362386796, "bytes_recv": 0, - "bytes_recv_gauge": 6785696329, + "bytes_recv_gauge": 3268049883, "bytes_sent": 0, - "bytes_sent_gauge": 242795726, + "bytes_sent_gauge": 94336913, "interface_name": "wlp0s20f3", "key": "interface_name", "speed": 0, - "time_since_update": 0.834984302520752}]} + "time_since_update": 0.7511422634124756}]} GET now ------- @@ -651,7 +654,7 @@ GET now Get plugin stats:: # curl http://localhost:61208/api/4/now - {"custom": "2024-10-19 09:51:52 CEST", "iso": "2024-10-19T09:51:52+02:00"} + {"custom": "2024-10-20 17:36:56 CEST", "iso": "2024-10-20T17:36:56+02:00"} Fields descriptions: @@ -661,7 +664,7 @@ Fields descriptions: Get a specific field:: # curl http://localhost:61208/api/4/now/iso - {"iso": "2024-10-19T09:51:52+02:00"} + {"iso": "2024-10-20T17:36:56+02:00"} GET percpu ---------- @@ -673,7 +676,7 @@ Get plugin stats:: "dpc": None, "guest": 0.0, "guest_nice": 0.0, - "idle": 29.0, + "idle": 41.0, "interrupt": None, "iowait": 0.0, "irq": 0.0, @@ -682,13 +685,13 @@ Get plugin stats:: "softirq": 0.0, "steal": 0.0, "system": 0.0, - "total": 71.0, - "user": 0.0}, + "total": 59.0, + "user": 2.0}, {"cpu_number": 1, "dpc": None, "guest": 0.0, "guest_nice": 0.0, - "idle": 21.0, + "idle": 32.0, "interrupt": None, "iowait": 0.0, "irq": 0.0, @@ -696,9 +699,9 @@ Get plugin stats:: "nice": 0.0, "softirq": 0.0, "steal": 0.0, - "system": 6.0, - "total": 79.0, - "user": 0.0}] + "system": 8.0, + "total": 68.0, + "user": 2.0}] Fields descriptions: @@ -729,12 +732,12 @@ Get plugin stats:: # curl http://localhost:61208/api/4/ports [{"description": "DefaultGateway", - "host": "192.168.1.1", + "host": "192.168.0.254", "indice": "port_0", "port": 0, "refresh": 30, "rtt_warning": None, - "status": 0.007778, + "status": 0.053219, "timeout": 3}] Fields descriptions: @@ -751,19 +754,19 @@ Fields descriptions: Get a specific field:: # curl http://localhost:61208/api/4/ports/host - {"host": ["192.168.1.1"]} + {"host": ["192.168.0.254"]} Get a specific item when field matches the given value:: - # curl http://localhost:61208/api/4/ports/host/192.168.1.1 - {"192.168.1.1": [{"description": "DefaultGateway", - "host": "192.168.1.1", - "indice": "port_0", - "port": 0, - "refresh": 30, - "rtt_warning": None, - "status": 0.007778, - "timeout": 3}]} + # curl http://localhost:61208/api/4/ports/host/192.168.0.254 + {"192.168.0.254": [{"description": "DefaultGateway", + "host": "192.168.0.254", + "indice": "port_0", + "port": 0, + "refresh": 30, + "rtt_warning": None, + "status": 0.053219, + "timeout": 3}]} GET processcount ---------------- @@ -771,7 +774,7 @@ GET processcount Get plugin stats:: # curl http://localhost:61208/api/4/processcount - {"pid_max": 0, "running": 1, "sleeping": 309, "thread": 1932, "total": 445} + {"pid_max": 0, "running": 2, "sleeping": 292, "thread": 1698, "total": 433} Fields descriptions: @@ -784,7 +787,7 @@ Fields descriptions: Get a specific field:: # curl http://localhost:61208/api/4/processcount/total - {"total": 445} + {"total": 433} GET processlist --------------- @@ -792,54 +795,7 @@ GET processlist Get plugin stats:: # curl http://localhost:61208/api/4/processlist - [{"cmdline": ["/snap/firefox/4698/usr/lib/firefox/firefox", - "-contentproc", - "-childID", - "3", - "-isForBrowser", - "-prefsLen", - "33303", - "-prefMapSize", - "254820", - "-jsInitLen", - "234852", - "-parentBuildID", - "20240801221602", - "-greomni", - "/snap/firefox/4698/usr/lib/firefox/omni.ja", - "-appomni", - "/snap/firefox/4698/usr/lib/firefox/browser/omni.ja", - "-appDir", - "/snap/firefox/4698/usr/lib/firefox/browser", - "{4a974fef-6b63-44bf-bdbf-2539ae77dfab}", - "5010", - "true", - "tab"], - "cpu_percent": 0.0, - "cpu_times": {"children_system": 0.0, - "children_user": 0.0, - "iowait": 0.0, - "system": 70.48, - "user": 416.98}, - "gids": {"effective": 1000, "real": 1000, "saved": 1000}, - "io_counters": [9107456, 0, 0, 0, 0], - "key": "pid", - "memory_info": {"data": 1480765440, - "dirty": 0, - "lib": 0, - "rss": 1424551936, - "shared": 114061312, - "text": 958464, - "vms": 3969282048}, - "memory_percent": 8.674418308833745, - "name": "Isolated Web Co", - "nice": 0, - "num_threads": 30, - "pid": 5641, - "status": "S", - "time_since_update": 1, - "username": "nicolargo"}, - {"cmdline": ["/snap/multipass/13373/usr/bin/qemu-system-x86_64", + [{"cmdline": ["/snap/multipass/13373/usr/bin/qemu-system-x86_64", "-bios", "OVMF.fd", "--enable-kvm", @@ -874,26 +830,73 @@ Get plugin stats:: "cpu_times": {"children_system": 0.0, "children_user": 0.0, "iowait": 0.0, - "system": 2.51, - "user": 4.32}, + "system": 22.71, + "user": 94.97}, "gids": {"effective": 0, "real": 0, "saved": 0}, "io_counters": [0, 0, 0, 0, 0], "key": "pid", - "memory_info": {"data": 1342185472, + "memory_info": {"data": 1370841088, "dirty": 0, "lib": 0, - "rss": 1105702912, + "rss": 1107259392, "shared": 14548992, "text": 6172672, - "vms": 2714804224}, - "memory_percent": 6.7328746264703305, + "vms": 2743562240}, + "memory_percent": 6.742347339620242, "name": "qemu-system-x86_64", "nice": 0, "num_threads": 4, - "pid": 1551737, + "pid": 2532, "status": "S", "time_since_update": 1, - "username": "root"}] + "username": "root"}, + {"cmdline": ["/snap/firefox/4698/usr/lib/firefox/firefox", + "-contentproc", + "-childID", + "2", + "-isForBrowser", + "-prefsLen", + "28642", + "-prefMapSize", + "254494", + "-jsInitLen", + "234852", + "-parentBuildID", + "20240801221602", + "-greomni", + "/snap/firefox/4698/usr/lib/firefox/omni.ja", + "-appomni", + "/snap/firefox/4698/usr/lib/firefox/browser/omni.ja", + "-appDir", + "/snap/firefox/4698/usr/lib/firefox/browser", + "{ea4db225-0ea8-45cd-bd1d-787d0fa1389b}", + "5054", + "true", + "tab"], + "cpu_percent": 0.0, + "cpu_times": {"children_system": 0.0, + "children_user": 0.0, + "iowait": 0.0, + "system": 30.67, + "user": 304.31}, + "gids": {"effective": 1000, "real": 1000, "saved": 1000}, + "io_counters": [6083584, 0, 0, 0, 0], + "key": "pid", + "memory_info": {"data": 893263872, + "dirty": 0, + "lib": 0, + "rss": 922521600, + "shared": 120307712, + "text": 958464, + "vms": 3432329216}, + "memory_percent": 5.617438064144421, + "name": "Isolated Web Co", + "nice": 0, + "num_threads": 30, + "pid": 5317, + "status": "S", + "time_since_update": 1, + "username": "nicolargo"}] Fields descriptions: @@ -917,7 +920,7 @@ GET psutilversion Get plugin stats:: # curl http://localhost:61208/api/4/psutilversion - "6.0.0" + "6.1.0" GET quicklook ------------- @@ -925,19 +928,19 @@ GET quicklook Get plugin stats:: # curl http://localhost:61208/api/4/quicklook - {"cpu": 6.4, + {"cpu": 13.9, "cpu_hz": 4475000000.0, - "cpu_hz_current": 1252996312.5000002, + "cpu_hz_current": 807192187.4999999, "cpu_log_core": 16, "cpu_name": "13th Gen Intel(R) Core(TM) i7-13620H", "cpu_phys_core": 10, - "load": 4.6, - "mem": 55.1, + "load": 5.9, + "mem": 55.4, "percpu": [{"cpu_number": 0, "dpc": None, "guest": 0.0, "guest_nice": 0.0, - "idle": 29.0, + "idle": 41.0, "interrupt": None, "iowait": 0.0, "irq": 0.0, @@ -946,13 +949,13 @@ Get plugin stats:: "softirq": 0.0, "steal": 0.0, "system": 0.0, - "total": 71.0, - "user": 0.0}, + "total": 59.0, + "user": 2.0}, {"cpu_number": 1, "dpc": None, "guest": 0.0, "guest_nice": 0.0, - "idle": 21.0, + "idle": 32.0, "interrupt": None, "iowait": 0.0, "irq": 0.0, @@ -960,14 +963,14 @@ Get plugin stats:: "nice": 0.0, "softirq": 0.0, "steal": 0.0, - "system": 6.0, - "total": 79.0, - "user": 0.0}, + "system": 8.0, + "total": 68.0, + "user": 2.0}, {"cpu_number": 2, "dpc": None, "guest": 0.0, "guest_nice": 0.0, - "idle": 27.0, + "idle": 41.0, "interrupt": None, "iowait": 0.0, "irq": 0.0, @@ -976,13 +979,13 @@ Get plugin stats:: "softirq": 0.0, "steal": 0.0, "system": 1.0, - "total": 73.0, - "user": 2.0}, + "total": 59.0, + "user": 3.0}, {"cpu_number": 3, "dpc": None, "guest": 0.0, "guest_nice": 0.0, - "idle": 30.0, + "idle": 43.0, "interrupt": None, "iowait": 0.0, "irq": 0.0, @@ -991,13 +994,43 @@ Get plugin stats:: "softirq": 0.0, "steal": 0.0, "system": 0.0, - "total": 70.0, - "user": 0.0}, + "total": 57.0, + "user": 1.0}, {"cpu_number": 4, "dpc": None, "guest": 0.0, "guest_nice": 0.0, - "idle": 18.0, + "idle": 30.0, + "interrupt": None, + "iowait": 1.0, + "irq": 0.0, + "key": "cpu_number", + "nice": 0.0, + "softirq": 0.0, + "steal": 0.0, + "system": 2.0, + "total": 70.0, + "user": 11.0}, + {"cpu_number": 5, + "dpc": None, + "guest": 0.0, + "guest_nice": 0.0, + "idle": 42.0, + "interrupt": None, + "iowait": 0.0, + "irq": 0.0, + "key": "cpu_number", + "nice": 0.0, + "softirq": 0.0, + "steal": 0.0, + "system": 0.0, + "total": 58.0, + "user": 1.0}, + {"cpu_number": 6, + "dpc": None, + "guest": 0.0, + "guest_nice": 0.0, + "idle": 26.0, "interrupt": None, "iowait": 2.0, "irq": 0.0, @@ -1005,44 +1038,29 @@ Get plugin stats:: "nice": 0.0, "softirq": 0.0, "steal": 0.0, - "system": 9.0, - "total": 82.0, - "user": 3.0}, - {"cpu_number": 5, - "dpc": None, - "guest": 0.0, - "guest_nice": 0.0, - "idle": 30.0, - "interrupt": None, - "iowait": 0.0, - "irq": 0.0, - "key": "cpu_number", - "nice": 0.0, - "softirq": 0.0, - "steal": 0.0, - "system": 0.0, - "total": 70.0, - "user": 0.0}, - {"cpu_number": 6, - "dpc": None, - "guest": 0.0, - "guest_nice": 0.0, - "idle": 26.0, - "interrupt": None, - "iowait": 0.0, - "irq": 0.0, - "key": "cpu_number", - "nice": 0.0, - "softirq": 0.0, - "steal": 0.0, - "system": 1.0, + "system": 13.0, "total": 74.0, "user": 3.0}, {"cpu_number": 7, "dpc": None, "guest": 0.0, "guest_nice": 0.0, - "idle": 30.0, + "idle": 29.0, + "interrupt": None, + "iowait": 0.0, + "irq": 0.0, + "key": "cpu_number", + "nice": 0.0, + "softirq": 0.0, + "steal": 0.0, + "system": 5.0, + "total": 71.0, + "user": 10.0}, + {"cpu_number": 8, + "dpc": None, + "guest": 0.0, + "guest_nice": 0.0, + "idle": 41.0, "interrupt": None, "iowait": 0.0, "irq": 0.0, @@ -1051,28 +1069,13 @@ Get plugin stats:: "softirq": 0.0, "steal": 0.0, "system": 1.0, - "total": 70.0, - "user": 0.0}, - {"cpu_number": 8, - "dpc": None, - "guest": 0.0, - "guest_nice": 0.0, - "idle": 29.0, - "interrupt": None, - "iowait": 0.0, - "irq": 0.0, - "key": "cpu_number", - "nice": 0.0, - "softirq": 0.0, - "steal": 0.0, - "system": 0.0, - "total": 71.0, - "user": 0.0}, + "total": 59.0, + "user": 2.0}, {"cpu_number": 9, "dpc": None, "guest": 0.0, "guest_nice": 0.0, - "idle": 29.0, + "idle": 43.0, "interrupt": None, "iowait": 0.0, "irq": 0.0, @@ -1080,14 +1083,14 @@ Get plugin stats:: "nice": 0.0, "softirq": 0.0, "steal": 0.0, - "system": 0.0, - "total": 71.0, - "user": 0.0}, + "system": 1.0, + "total": 57.0, + "user": 1.0}, {"cpu_number": 10, "dpc": None, "guest": 0.0, "guest_nice": 0.0, - "idle": 29.0, + "idle": 43.0, "interrupt": None, "iowait": 0.0, "irq": 0.0, @@ -1095,14 +1098,14 @@ Get plugin stats:: "nice": 0.0, "softirq": 0.0, "steal": 0.0, - "system": 0.0, - "total": 71.0, - "user": 0.0}, + "system": 1.0, + "total": 57.0, + "user": 1.0}, {"cpu_number": 11, "dpc": None, "guest": 0.0, "guest_nice": 0.0, - "idle": 30.0, + "idle": 41.0, "interrupt": None, "iowait": 0.0, "irq": 0.0, @@ -1111,13 +1114,13 @@ Get plugin stats:: "softirq": 0.0, "steal": 0.0, "system": 0.0, - "total": 70.0, - "user": 0.0}, + "total": 59.0, + "user": 2.0}, {"cpu_number": 12, "dpc": None, "guest": 0.0, "guest_nice": 0.0, - "idle": 29.0, + "idle": 41.0, "interrupt": None, "iowait": 0.0, "irq": 0.0, @@ -1125,14 +1128,14 @@ Get plugin stats:: "nice": 0.0, "softirq": 0.0, "steal": 0.0, - "system": 0.0, - "total": 71.0, - "user": 0.0}, + "system": 1.0, + "total": 59.0, + "user": 3.0}, {"cpu_number": 13, "dpc": None, "guest": 0.0, "guest_nice": 0.0, - "idle": 28.0, + "idle": 43.0, "interrupt": None, "iowait": 0.0, "irq": 0.0, @@ -1140,14 +1143,14 @@ Get plugin stats:: "nice": 0.0, "softirq": 0.0, "steal": 0.0, - "system": 0.0, - "total": 72.0, + "system": 1.0, + "total": 57.0, "user": 1.0}, {"cpu_number": 14, "dpc": None, "guest": 0.0, "guest_nice": 0.0, - "idle": 29.0, + "idle": 40.0, "interrupt": None, "iowait": 0.0, "irq": 0.0, @@ -1155,14 +1158,14 @@ Get plugin stats:: "nice": 0.0, "softirq": 0.0, "steal": 0.0, - "system": 0.0, - "total": 71.0, - "user": 1.0}, + "system": 1.0, + "total": 60.0, + "user": 2.0}, {"cpu_number": 15, "dpc": None, "guest": 0.0, "guest_nice": 0.0, - "idle": 29.0, + "idle": 41.0, "interrupt": None, "iowait": 0.0, "irq": 0.0, @@ -1171,9 +1174,9 @@ Get plugin stats:: "softirq": 0.0, "steal": 0.0, "system": 0.0, - "total": 71.0, - "user": 0.0}], - "swap": 37.1} + "total": 59.0, + "user": 2.0}], + "swap": 0.1} Fields descriptions: @@ -1211,14 +1214,14 @@ Get plugin stats:: "label": "Ambient", "type": "temperature_core", "unit": "C", - "value": 34, + "value": 35, "warning": 0}, {"critical": None, "key": "label", "label": "Ambient 3", "type": "temperature_core", "unit": "C", - "value": 27, + "value": 31, "warning": 0}] Fields descriptions: @@ -1279,7 +1282,7 @@ Get a specific item when field matches the given value:: "label": "Ambient", "type": "temperature_core", "unit": "C", - "value": 34, + "value": 35, "warning": 0}]} GET smart @@ -1297,10 +1300,10 @@ Get plugin stats:: # curl http://localhost:61208/api/4/system {"hostname": "nicolargo-xps15", - "hr_name": "Ubuntu 24.04 64bit / Linux 6.8.0-45-generic", + "hr_name": "Ubuntu 24.04 64bit / Linux 6.8.0-47-generic", "linux_distro": "Ubuntu 24.04", "os_name": "Linux", - "os_version": "6.8.0-45-generic", + "os_version": "6.8.0-47-generic", "platform": "64bit"} Fields descriptions: @@ -1323,7 +1326,7 @@ GET uptime Get plugin stats:: # curl http://localhost:61208/api/4/uptime - "13 days, 22:13:44" + "1 day, 1:41:45" GET version ----------- @@ -1331,7 +1334,7 @@ GET version Get plugin stats:: # curl http://localhost:61208/api/4/version - "4.2.0_beta04" + "4.2.0" GET vms ------- @@ -1349,7 +1352,7 @@ Get plugin stats:: "load_1min": 0, "load_5min": 0, "memory_total": 1002496000, - "memory_usage": 335556608, + "memory_usage": 338051072, "name": "upstanding-sparrow", "release": "Ubuntu 24.04.1 LTS", "status": "running"}] @@ -1388,7 +1391,7 @@ Get a specific item when field matches the given value:: "load_1min": 0, "load_5min": 0, "memory_total": 1002496000, - "memory_usage": 335556608, + "memory_usage": 338051072, "name": "upstanding-sparrow", "release": "Ubuntu 24.04.1 LTS", "status": "running"}]} @@ -1400,8 +1403,8 @@ Get plugin stats:: # curl http://localhost:61208/api/4/wifi [{"key": "ssid", - "quality_level": -56.0, - "quality_link": 54.0, + "quality_level": -69.0, + "quality_link": 41.0, "ssid": "wlp0s20f3"}] Get a specific field:: @@ -1413,8 +1416,8 @@ Get a specific item when field matches the given value:: # curl http://localhost:61208/api/4/wifi/ssid/wlp0s20f3 {"wlp0s20f3": [{"key": "ssid", - "quality_level": -56.0, - "quality_link": 54.0, + "quality_level": -69.0, + "quality_link": 41.0, "ssid": "wlp0s20f3"}]} GET all stats @@ -1459,34 +1462,34 @@ GET stats history History of a plugin:: # curl http://localhost:61208/api/4/cpu/history - {"system": [["2024-10-19T09:51:53.543009", 3.8], - ["2024-10-19T09:51:54.787842", 0.7], - ["2024-10-19T09:51:55.795865", 0.7]], - "user": [["2024-10-19T09:51:53.543003", 2.6], - ["2024-10-19T09:51:54.787840", 0.9], - ["2024-10-19T09:51:55.795860", 0.9]]} + {"system": [["2024-10-20T17:36:57.989944", 3.9], + ["2024-10-20T17:36:59.440007", 3.0], + ["2024-10-20T17:37:00.449969", 3.0]], + "user": [["2024-10-20T17:36:57.989939", 7.9], + ["2024-10-20T17:36:59.440002", 8.5], + ["2024-10-20T17:37:00.449966", 8.5]]} Limit history to last 2 values:: # curl http://localhost:61208/api/4/cpu/history/2 - {"system": [["2024-10-19T09:51:54.787842", 0.7], - ["2024-10-19T09:51:55.795865", 0.7]], - "user": [["2024-10-19T09:51:54.787840", 0.9], - ["2024-10-19T09:51:55.795860", 0.9]]} + {"system": [["2024-10-20T17:36:59.440007", 3.0], + ["2024-10-20T17:37:00.449969", 3.0]], + "user": [["2024-10-20T17:36:59.440002", 8.5], + ["2024-10-20T17:37:00.449966", 8.5]]} History for a specific field:: # curl http://localhost:61208/api/4/cpu/system/history - {"system": [["2024-10-19T09:51:52.434505", 3.8], - ["2024-10-19T09:51:53.543009", 3.8], - ["2024-10-19T09:51:54.787842", 0.7], - ["2024-10-19T09:51:55.795865", 0.7]]} + {"system": [["2024-10-20T17:36:56.831275", 3.9], + ["2024-10-20T17:36:57.989944", 3.9], + ["2024-10-20T17:36:59.440007", 3.0], + ["2024-10-20T17:37:00.449969", 3.0]]} Limit history for a specific field to last 2 values:: # curl http://localhost:61208/api/4/cpu/system/history - {"system": [["2024-10-19T09:51:54.787842", 0.7], - ["2024-10-19T09:51:55.795865", 0.7]]} + {"system": [["2024-10-20T17:36:59.440007", 3.0], + ["2024-10-20T17:37:00.449969", 3.0]]} GET limits (used for thresholds) -------------------------------- diff --git a/docs/man/glances.1 b/docs/man/glances.1 index 95d7a76f..8bec801e 100644 --- a/docs/man/glances.1 +++ b/docs/man/glances.1 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "GLANCES" "1" "Oct 19, 2024" "4.2.0_beta04" "Glances" +.TH "GLANCES" "1" "Oct 20, 2024" "4.2.0" "Glances" .SH NAME glances \- An eye on your system .SH SYNOPSIS diff --git a/glances/__init__.py b/glances/__init__.py index 057f637f..6cacb158 100644 --- a/glances/__init__.py +++ b/glances/__init__.py @@ -19,7 +19,7 @@ import tracemalloc # Global name # Version should start and end with a numerical char # See https://packaging.python.org/specifications/core-metadata/#version -__version__ = '4.2.0_beta04' +__version__ = '4.2.0' __apiversion__ = '4' __author__ = 'Nicolas Hennion ' __license__ = 'LGPLv3' diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index ec79b303..1f5db27c 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -1,5 +1,5 @@ name: glances -version: '4.1.2+build03' # Put the current stable version+buildXX +version: '4.2.0+build01' # Put the current stable version+buildXX summary: Glances an Eye on your system. A top/htop alternative. description: | @@ -8,7 +8,7 @@ description: | Web based interface. It can adapt dynamically the displayed information depending on the user interface size. -base: core22 +base: core24 grade: stable # devel confinement: strict