From 80f330d8661386a6563a12b944f76b74e3774567 Mon Sep 17 00:00:00 2001 From: nicolargo Date: Fri, 27 Dec 2024 21:56:00 +0100 Subject: [PATCH] version 4.3.0.3 --- NEWS.rst | 9 +- docker-files/alpine.Dockerfile | 4 +- docs/api.rst | 496 +++++++++++++++++---------------- docs/man/glances.1 | 2 +- glances/__init__.py | 2 +- snap/snapcraft.yaml | 2 +- 6 files changed, 263 insertions(+), 252 deletions(-) diff --git a/NEWS.rst b/NEWS.rst index 1325496af..bf366d4f1 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -2,6 +2,14 @@ Glances ChangeLog ============================================================================== +=============== +Version 4.3.0.3 +=============== + +Continuous integration and documentation: + +* Pin Alpine image to 3.20 (3.21 is not compliant with Netifaces) Related to #3053 + =============== Version 4.3.0.2 =============== @@ -10,7 +18,6 @@ Enhancements: * Revert "Replace netifaces by netifaces-plus" #3053 because it break build on Alpine Image - =============== Version 4.3.0.1 =============== diff --git a/docker-files/alpine.Dockerfile b/docker-files/alpine.Dockerfile index 592595dfc..6d17ee827 100644 --- a/docker-files/alpine.Dockerfile +++ b/docker-files/alpine.Dockerfile @@ -10,7 +10,9 @@ # Alpine 3.18 tag is a link to the latest 3.18.x version. # Be aware that if you change the Alpine version, you may have to change the Python version. -ARG IMAGE_VERSION=3.21 +# Netifaces (and Netifaces-plus) are not compliant with GCC embeded in Alpine 3.21 +# See: https://github.com/tsukumijima/netifaces-plus/issues/9 +ARG IMAGE_VERSION=3.20 ARG PYTHON_VERSION=3.12 ############################################################################## diff --git a/docs/api.rst b/docs/api.rst index 1388529ef..62922d544 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -160,7 +160,7 @@ Get plugin stats:: "refresh": 3.0, "regex": True, "result": None, - "timer": 0.6547360420227051}, + "timer": 1.5811219215393066}, {"count": 0, "countmax": 20.0, "countmin": None, @@ -169,7 +169,7 @@ Get plugin stats:: "refresh": 3.0, "regex": True, "result": None, - "timer": 0.6546313762664795}] + "timer": 1.5810198783874512}] Fields descriptions: @@ -197,7 +197,7 @@ Get a specific item when field matches the given value:: "refresh": 3.0, "regex": True, "result": None, - "timer": 0.6547360420227051}]} + "timer": 1.5811219215393066}]} GET cloud --------- @@ -241,9 +241,9 @@ Get plugin stats:: [{"command": "/bin/sh -c /venv/bin/python3 -m glances $GLANCES_OPT", "cpu": {"total": 0.0}, "cpu_percent": 0.0, - "created": "2024-12-27T19:47:55.822710925Z", + "created": "2024-12-27T20:26:22.152530491Z", "engine": "docker", - "id": "e1b7e11cbfee7a8a11980b414729d4b7634511e58c544e5c605879c10b2c0a05", + "id": "ecb033c676e126298414075dbdaa3c19d16fe1a7ecccd7b892463bf4d366bb15", "image": ["glances:local-alpine-minimal"], "io": {}, "io_rx": None, @@ -252,12 +252,12 @@ Get plugin stats:: "memory": {}, "memory_percent": None, "memory_usage": None, - "name": "pensive_clarke", + "name": "intelligent_bell", "network": {}, "network_rx": None, "network_tx": None, "status": "running", - "uptime": "34 mins"}] + "uptime": "29 mins"}] Fields descriptions: @@ -281,32 +281,32 @@ Fields descriptions: Get a specific field:: # curl http://localhost:61208/api/4/containers/name - {"name": ["pensive_clarke"]} + {"name": ["intelligent_bell"]} Get a specific item when field matches the given value:: - # curl http://localhost:61208/api/4/containers/name/value/pensive_clarke - {"pensive_clarke": [{"command": "/bin/sh -c /venv/bin/python3 -m glances " - "$GLANCES_OPT", - "cpu": {"total": 0.0}, - "cpu_percent": 0.0, - "created": "2024-12-27T19:47:55.822710925Z", - "engine": "docker", - "id": "e1b7e11cbfee7a8a11980b414729d4b7634511e58c544e5c605879c10b2c0a05", - "image": ["glances:local-alpine-minimal"], - "io": {}, - "io_rx": None, - "io_wx": None, - "key": "name", - "memory": {}, - "memory_percent": None, - "memory_usage": None, - "name": "pensive_clarke", - "network": {}, - "network_rx": None, - "network_tx": None, - "status": "running", - "uptime": "34 mins"}]} + # curl http://localhost:61208/api/4/containers/name/value/intelligent_bell + {"intelligent_bell": [{"command": "/bin/sh -c /venv/bin/python3 -m glances " + "$GLANCES_OPT", + "cpu": {"total": 0.0}, + "cpu_percent": 0.0, + "created": "2024-12-27T20:26:22.152530491Z", + "engine": "docker", + "id": "ecb033c676e126298414075dbdaa3c19d16fe1a7ecccd7b892463bf4d366bb15", + "image": ["glances:local-alpine-minimal"], + "io": {}, + "io_rx": None, + "io_wx": None, + "key": "name", + "memory": {}, + "memory_percent": None, + "memory_usage": None, + "name": "intelligent_bell", + "network": {}, + "network_rx": None, + "network_tx": None, + "status": "running", + "uptime": "29 mins"}]} GET core -------- @@ -333,19 +333,19 @@ Get plugin stats:: # curl http://localhost:61208/api/4/cpu {"cpucore": 16, - "ctx_switches": 423543089, + "ctx_switches": 442920407, "guest": 0.2, - "idle": 90.4, - "interrupts": 303094422, - "iowait": 0.2, + "idle": 91.4, + "interrupts": 314302192, + "iowait": 0.4, "irq": 0.0, "nice": 0.0, - "soft_interrupts": 119847585, + "soft_interrupts": 125188157, "steal": 0.0, "syscalls": 0, - "system": 3.8, - "total": 7.3, - "user": 5.6} + "system": 4.7, + "total": 8.6, + "user": 3.5} Fields descriptions: @@ -378,7 +378,7 @@ Fields descriptions: Get a specific field:: # curl http://localhost:61208/api/4/cpu/total - {"total": 7.3} + {"total": 8.6} GET diskio ---------- @@ -388,10 +388,10 @@ Get plugin stats:: # curl http://localhost:61208/api/4/diskio [{"disk_name": "nvme0n1", "key": "disk_name", - "read_bytes": 9730824704, - "read_count": 428979, - "write_bytes": 355111699456, - "write_count": 4269207}, + "read_bytes": 9757108736, + "read_count": 430677, + "write_bytes": 358053864448, + "write_count": 4363876}, {"disk_name": "nvme0n1p1", "key": "disk_name", "read_bytes": 18552832, @@ -431,10 +431,10 @@ Get a specific item when field matches the given value:: # curl http://localhost:61208/api/4/diskio/disk_name/value/nvme0n1 {"nvme0n1": [{"disk_name": "nvme0n1", "key": "disk_name", - "read_bytes": 9730824704, - "read_count": 428979, - "write_bytes": 355111699456, - "write_count": 4269207}]} + "read_bytes": 9757108736, + "read_count": 430677, + "write_bytes": 358053864448, + "write_count": 4363876}]} GET folders ----------- @@ -461,13 +461,13 @@ Get plugin stats:: # curl http://localhost:61208/api/4/fs [{"device_name": "/dev/mapper/ubuntu--vg-ubuntu--lv", - "free": 846583095296, + "free": 844432867328, "fs_type": "ext4", "key": "mnt_point", "mnt_point": "/", - "percent": 11.1, + "percent": 11.4, "size": 1003736440832, - "used": 106090840064}, + "used": 108241068032}, {"device_name": "zsfpool", "free": 41811968, "fs_type": "zfs", @@ -496,13 +496,13 @@ Get a specific item when field matches the given value:: # curl http://localhost:61208/api/4/fs/mnt_point/value// {"/": [{"device_name": "/dev/mapper/ubuntu--vg-ubuntu--lv", - "free": 846583095296, + "free": 844432867328, "fs_type": "ext4", "key": "mnt_point", "mnt_point": "/", - "percent": 11.1, + "percent": 11.4, "size": 1003736440832, - "used": 106090840064}]} + "used": 108241068032}]} GET gpu ------- @@ -576,9 +576,9 @@ Get plugin stats:: # curl http://localhost:61208/api/4/load {"cpucore": 16, - "min1": 1.3193359375, - "min15": 0.9658203125, - "min5": 0.97607421875} + "min1": 0.98876953125, + "min15": 0.9111328125, + "min5": 0.83837890625} Fields descriptions: @@ -590,7 +590,7 @@ Fields descriptions: Get a specific field:: # curl http://localhost:61208/api/4/load/min1 - {"min1": 1.3193359375} + {"min1": 0.98876953125} GET mem ------- @@ -598,16 +598,16 @@ GET mem Get plugin stats:: # curl http://localhost:61208/api/4/mem - {"active": 7715913728, - "available": 6326480896, - "buffers": 296435712, - "cached": 6459817984, - "free": 6326480896, - "inactive": 5219430400, - "percent": 61.5, - "shared": 1272029184, + {"active": 8635580416, + "available": 6203834368, + "buffers": 249393152, + "cached": 6872862720, + "free": 6203834368, + "inactive": 4822306816, + "percent": 62.2, + "shared": 1167765504, "total": 16422453248, - "used": 10095972352} + "used": 10218618880} Fields descriptions: @@ -634,13 +634,13 @@ GET memswap Get plugin stats:: # curl http://localhost:61208/api/4/memswap - {"free": 2765615104, - "percent": 35.6, - "sin": 115474432, - "sout": 1663004672, + {"free": 2600464384, + "percent": 39.5, + "sin": 117788672, + "sout": 1828995072, "time_since_update": 1, "total": 4294963200, - "used": 1529348096} + "used": 1694498816} Fields descriptions: @@ -665,26 +665,26 @@ Get plugin stats:: # curl http://localhost:61208/api/4/network [{"alias": None, "bytes_all": 0, - "bytes_all_gauge": 6269495139, + "bytes_all_gauge": 7117365935, "bytes_recv": 0, - "bytes_recv_gauge": 5952748841, + "bytes_recv_gauge": 6785492572, "bytes_sent": 0, - "bytes_sent_gauge": 316746298, + "bytes_sent_gauge": 331873363, "interface_name": "wlp0s20f3", "key": "interface_name", "speed": 0, - "time_since_update": 0.6576473712921143}, + "time_since_update": 1.583664894104004}, {"alias": None, "bytes_all": 0, - "bytes_all_gauge": 33981949, + "bytes_all_gauge": 34030517, "bytes_recv": 0, - "bytes_recv_gauge": 6231967, + "bytes_recv_gauge": 6247319, "bytes_sent": 0, - "bytes_sent_gauge": 27749982, + "bytes_sent_gauge": 27783198, "interface_name": "mpqemubr0", "key": "interface_name", "speed": 10485760000, - "time_since_update": 0.6576473712921143}] + "time_since_update": 1.583664894104004}] Fields descriptions: @@ -713,15 +713,15 @@ Get a specific item when field matches the given value:: # curl http://localhost:61208/api/4/network/interface_name/value/wlp0s20f3 {"wlp0s20f3": [{"alias": None, "bytes_all": 0, - "bytes_all_gauge": 6269495139, + "bytes_all_gauge": 7117365935, "bytes_recv": 0, - "bytes_recv_gauge": 5952748841, + "bytes_recv_gauge": 6785492572, "bytes_sent": 0, - "bytes_sent_gauge": 316746298, + "bytes_sent_gauge": 331873363, "interface_name": "wlp0s20f3", "key": "interface_name", "speed": 0, - "time_since_update": 0.6576473712921143}]} + "time_since_update": 1.583664894104004}]} GET now ------- @@ -729,7 +729,7 @@ GET now Get plugin stats:: # curl http://localhost:61208/api/4/now - {"custom": "2024-12-27 21:22:06 CET", "iso": "2024-12-27T21:22:06+01:00"} + {"custom": "2024-12-27 21:55:32 CET", "iso": "2024-12-27T21:55:32+01:00"} Fields descriptions: @@ -739,7 +739,7 @@ Fields descriptions: Get a specific field:: # curl http://localhost:61208/api/4/now/iso - {"iso": "2024-12-27T21:22:06+01:00"} + {"iso": "2024-12-27T21:55:32+01:00"} GET percpu ---------- @@ -751,7 +751,7 @@ Get plugin stats:: "dpc": None, "guest": 0.0, "guest_nice": 0.0, - "idle": 38.0, + "idle": 44.0, "interrupt": None, "iowait": 0.0, "irq": 0.0, @@ -759,14 +759,14 @@ Get plugin stats:: "nice": 0.0, "softirq": 0.0, "steal": 0.0, - "system": 0.0, - "total": 62.0, - "user": 0.0}, + "system": 2.0, + "total": 56.0, + "user": 1.0}, {"cpu_number": 1, "dpc": None, "guest": 0.0, "guest_nice": 0.0, - "idle": 31.0, + "idle": 38.0, "interrupt": None, "iowait": 0.0, "irq": 0.0, @@ -775,7 +775,7 @@ Get plugin stats:: "softirq": 0.0, "steal": 0.0, "system": 8.0, - "total": 69.0, + "total": 62.0, "user": 0.0}] Fields descriptions: @@ -809,10 +809,11 @@ Get plugin stats:: [{"description": "DefaultGateway", "host": "192.168.0.254", "indice": "port_0", + "key": "indice", "port": 0, "refresh": 30, "rtt_warning": None, - "status": 0.004291, + "status": 0.006327, "timeout": 3}] Fields descriptions: @@ -828,20 +829,21 @@ Fields descriptions: Get a specific field:: - # curl http://localhost:61208/api/4/ports/host - {"host": ["192.168.0.254"]} + # curl http://localhost:61208/api/4/ports/indice + {"indice": ["port_0"]} Get a specific item when field matches the given value:: - # curl http://localhost:61208/api/4/ports/host/value/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.004291, - "timeout": 3}]} + # curl http://localhost:61208/api/4/ports/indice/value/port_0 + {"port_0": [{"description": "DefaultGateway", + "host": "192.168.0.254", + "indice": "port_0", + "key": "indice", + "port": 0, + "refresh": 30, + "rtt_warning": None, + "status": 0.006327, + "timeout": 3}]} GET processcount ---------------- @@ -849,7 +851,7 @@ GET processcount Get plugin stats:: # curl http://localhost:61208/api/4/processcount - {"pid_max": 0, "running": 2, "sleeping": 425, "thread": 2029, "total": 565} + {"pid_max": 0, "running": 1, "sleeping": 427, "thread": 2087, "total": 565} Fields descriptions: @@ -901,22 +903,22 @@ Get plugin stats:: "cpu_times": {"children_system": 0.0, "children_user": 0.0, "iowait": 0.0, - "system": 85.31, - "user": 413.21}, + "system": 87.02, + "user": 419.57}, "gids": {"effective": 0, "real": 0, "saved": 0}, "io_counters": [0, 0, 0, 0, 0], "key": "pid", "memory_info": {"data": 1395154944, "dirty": 0, "lib": 0, - "rss": 1004236800, + "rss": 927035392, "shared": 4194304, "text": 6172672, "vms": 4359106560}, - "memory_percent": 6.115023040922954, + "memory_percent": 5.644926357838154, "name": "qemu-system-x86_64", "nice": 0, - "num_threads": 5, + "num_threads": 4, "pid": 2939, "status": "S", "time_since_update": 1, @@ -927,24 +929,24 @@ Get plugin stats:: "--node-ipc", "--clientProcessId=11100"], "cpu_percent": 0.0, - "cpu_times": {"children_system": 0.29, - "children_user": 1.82, + "cpu_times": {"children_system": 0.31, + "children_user": 1.89, "iowait": 0.0, - "system": 74.83, - "user": 1210.92}, + "system": 75.53, + "user": 1217.99}, "gids": {"effective": 1000, "real": 1000, "saved": 1000}, - "io_counters": [81853440, + "io_counters": [81861632, 970752, 0, 0, 0, 48105472, - 3358720, + 3362816, 0, 0, 0, - 484382720, - 211230720, + 485559296, + 212156416, 0, 0, 0, @@ -953,18 +955,18 @@ Get plugin stats:: 0, 0, 0, - 69414912, + 69419008, 0, 0, 0, 0, - 116828160, - 315793408, + 2304000, 0, 0, 0, - 2304000, 0, + 116996096, + 323682304, 0, 0, 0, @@ -1003,17 +1005,17 @@ Get plugin stats:: 0, 0, 0, - 7017472, + 5557248, + 6262784, 0, 0, 0, + 646144, 0, - 5557248, - 6262784, 0, 0, 0, - 646144, + 7017472, 0, 0, 0, @@ -1033,13 +1035,13 @@ Get plugin stats:: 0, 0, 0, - 212992, + 217088, 0, 0, 0, 0, 5934080, - 8658944, + 8896512, 0, 0, 0, @@ -1054,14 +1056,14 @@ Get plugin stats:: 0, 0], "key": "pid", - "memory_info": {"data": 1121370112, + "memory_info": {"data": 1122275328, "dirty": 0, "lib": 0, - "rss": 736841728, + "rss": 736038912, "shared": 66584576, "text": 132239360, "vms": 1219821342720}, - "memory_percent": 4.486794493324169, + "memory_percent": 4.481905966696164, "name": "code", "nice": 0, "num_threads": 14, @@ -1098,21 +1100,21 @@ Get plugin stats:: "cpu_times": {"children_system": 0.0, "children_user": 0.0, "iowait": 0.0, - "system": 85.31, - "user": 413.21}, + "system": 87.02, + "user": 419.57}, "io_counters": [0, 0, 0, 0, 0], "memory_info": {"data": 1395154944, "dirty": 0, "lib": 0, - "rss": 1004236800, + "rss": 927035392, "shared": 4194304, "text": 6172672, "vms": 4359106560}, - "memory_percent": 6.115023040922954, + "memory_percent": 5.644926357838154, "name": "qemu-system-x86_64", "nice": 0, "nprocs": 1, - "num_threads": 5, + "num_threads": 4, "pid": "_", "status": "S", "time_since_update": 1, @@ -1122,8 +1124,8 @@ Get plugin stats:: 11100, 17962, 11819, - 10919, 293018, + 10919, 293017, 187970, 11098, @@ -1131,9 +1133,9 @@ Get plugin stats:: 308704, 11099, 11630, - 11056, 293033, 826951, + 11056, 470255, 11382, 826952, @@ -1143,22 +1145,22 @@ Get plugin stats:: 10921], "cmdline": ["code"], "cpu_percent": 0, - "cpu_times": {"children_system": 2344.94, - "children_user": 1682.11, - "system": 1798.42, - "user": 9753.940000000002}, - "io_counters": [81853440, + "cpu_times": {"children_system": 2537.03, + "children_user": 1840.72, + "system": 1853.3900000000003, + "user": 9950.630000000001}, + "io_counters": [81861632, 970752, 0, 0, 0, 48105472, - 3358720, + 3362816, 0, 0, 0, - 484382720, - 211230720, + 485559296, + 212156416, 0, 0, 0, @@ -1167,18 +1169,18 @@ Get plugin stats:: 0, 0, 0, - 69414912, + 69419008, 0, 0, 0, 0, - 116828160, - 315793408, + 2304000, 0, 0, 0, - 2304000, 0, + 116996096, + 323682304, 0, 0, 0, @@ -1217,17 +1219,17 @@ Get plugin stats:: 0, 0, 0, - 7017472, + 5557248, + 6262784, 0, 0, 0, + 646144, 0, - 5557248, - 6262784, 0, 0, 0, - 646144, + 7017472, 0, 0, 0, @@ -1247,13 +1249,13 @@ Get plugin stats:: 0, 0, 0, - 212992, + 217088, 0, 0, 0, 0, 5934080, - 8658944, + 8896512, 0, 0, 0, @@ -1267,12 +1269,12 @@ Get plugin stats:: 0, 0, 0], - "memory_info": {"data": 7589273600, - "rss": 4574437376, - "shared": 1628356608, + "memory_info": {"data": 7607742464, + "rss": 4582584320, + "shared": 1622130688, "text": 3173744640, - "vms": 24468864929792}, - "memory_percent": 27.85477484344244, + "vms": 24468858753024}, + "memory_percent": 27.90438341213173, "name": "code", "nice": 0, "nprocs": 24, @@ -1312,19 +1314,19 @@ GET quicklook Get plugin stats:: # curl http://localhost:61208/api/4/quicklook - {"cpu": 7.3, + {"cpu": 8.6, "cpu_hz": 4475000000.0, - "cpu_hz_current": 807258000.0, + "cpu_hz_current": 763765500.0, "cpu_log_core": 16, "cpu_name": "13th Gen Intel(R) Core(TM) i7-13620H", "cpu_phys_core": 10, - "load": 6.0, - "mem": 61.5, + "load": 5.7, + "mem": 62.2, "percpu": [{"cpu_number": 0, "dpc": None, "guest": 0.0, "guest_nice": 0.0, - "idle": 38.0, + "idle": 44.0, "interrupt": None, "iowait": 0.0, "irq": 0.0, @@ -1332,14 +1334,14 @@ Get plugin stats:: "nice": 0.0, "softirq": 0.0, "steal": 0.0, - "system": 0.0, - "total": 62.0, - "user": 0.0}, + "system": 2.0, + "total": 56.0, + "user": 1.0}, {"cpu_number": 1, "dpc": None, "guest": 0.0, "guest_nice": 0.0, - "idle": 31.0, + "idle": 38.0, "interrupt": None, "iowait": 0.0, "irq": 0.0, @@ -1348,13 +1350,13 @@ Get plugin stats:: "softirq": 0.0, "steal": 0.0, "system": 8.0, - "total": 69.0, + "total": 62.0, "user": 0.0}, {"cpu_number": 2, "dpc": None, "guest": 0.0, "guest_nice": 0.0, - "idle": 39.0, + "idle": 47.0, "interrupt": None, "iowait": 0.0, "irq": 0.0, @@ -1363,13 +1365,13 @@ Get plugin stats:: "softirq": 0.0, "steal": 0.0, "system": 0.0, - "total": 61.0, - "user": 0.0}, + "total": 53.0, + "user": 1.0}, {"cpu_number": 3, "dpc": None, "guest": 0.0, "guest_nice": 0.0, - "idle": 39.0, + "idle": 48.0, "interrupt": None, "iowait": 0.0, "irq": 0.0, @@ -1378,28 +1380,28 @@ Get plugin stats:: "softirq": 0.0, "steal": 0.0, "system": 0.0, - "total": 61.0, + "total": 52.0, "user": 0.0}, {"cpu_number": 4, "dpc": None, "guest": 0.0, "guest_nice": 0.0, - "idle": 38.0, + "idle": 18.0, "interrupt": None, - "iowait": 0.0, + "iowait": 2.0, "irq": 0.0, "key": "cpu_number", "nice": 0.0, "softirq": 0.0, "steal": 0.0, - "system": 1.0, - "total": 62.0, - "user": 0.0}, + "system": 16.0, + "total": 82.0, + "user": 12.0}, {"cpu_number": 5, "dpc": None, "guest": 0.0, "guest_nice": 0.0, - "idle": 33.0, + "idle": 42.0, "interrupt": None, "iowait": 0.0, "irq": 0.0, @@ -1407,14 +1409,14 @@ Get plugin stats:: "nice": 0.0, "softirq": 0.0, "steal": 0.0, - "system": 5.0, - "total": 67.0, - "user": 0.0}, + "system": 1.0, + "total": 58.0, + "user": 5.0}, {"cpu_number": 6, "dpc": None, "guest": 0.0, "guest_nice": 0.0, - "idle": 37.0, + "idle": 29.0, "interrupt": None, "iowait": 0.0, "irq": 0.0, @@ -1422,29 +1424,29 @@ Get plugin stats:: "nice": 0.0, "softirq": 0.0, "steal": 0.0, - "system": 1.0, - "total": 63.0, - "user": 1.0}, + "system": 8.0, + "total": 71.0, + "user": 11.0}, {"cpu_number": 7, "dpc": None, "guest": 0.0, "guest_nice": 0.0, - "idle": 12.0, + "idle": 48.0, "interrupt": None, - "iowait": 2.0, + "iowait": 0.0, "irq": 0.0, "key": "cpu_number", "nice": 0.0, "softirq": 0.0, "steal": 0.0, - "system": 12.0, - "total": 88.0, - "user": 13.0}, + "system": 0.0, + "total": 52.0, + "user": 1.0}, {"cpu_number": 8, "dpc": None, "guest": 0.0, "guest_nice": 0.0, - "idle": 37.0, + "idle": 47.0, "interrupt": None, "iowait": 0.0, "irq": 0.0, @@ -1452,14 +1454,14 @@ Get plugin stats:: "nice": 0.0, "softirq": 0.0, "steal": 0.0, - "system": 1.0, - "total": 63.0, - "user": 0.0}, + "system": 0.0, + "total": 53.0, + "user": 1.0}, {"cpu_number": 9, "dpc": None, "guest": 0.0, "guest_nice": 0.0, - "idle": 39.0, + "idle": 48.0, "interrupt": None, "iowait": 0.0, "irq": 0.0, @@ -1468,13 +1470,13 @@ Get plugin stats:: "softirq": 0.0, "steal": 0.0, "system": 0.0, - "total": 61.0, - "user": 0.0}, + "total": 52.0, + "user": 1.0}, {"cpu_number": 10, "dpc": None, "guest": 0.0, "guest_nice": 0.0, - "idle": 34.0, + "idle": 38.0, "interrupt": None, "iowait": 0.0, "irq": 0.0, @@ -1482,14 +1484,14 @@ Get plugin stats:: "nice": 0.0, "softirq": 0.0, "steal": 0.0, - "system": 0.0, - "total": 66.0, - "user": 4.0}, + "system": 4.0, + "total": 62.0, + "user": 7.0}, {"cpu_number": 11, "dpc": None, "guest": 0.0, "guest_nice": 0.0, - "idle": 39.0, + "idle": 48.0, "interrupt": None, "iowait": 0.0, "irq": 0.0, @@ -1498,13 +1500,13 @@ Get plugin stats:: "softirq": 0.0, "steal": 0.0, "system": 0.0, - "total": 61.0, + "total": 52.0, "user": 0.0}, {"cpu_number": 12, "dpc": None, "guest": 0.0, "guest_nice": 0.0, - "idle": 38.0, + "idle": 46.0, "interrupt": None, "iowait": 0.0, "irq": 0.0, @@ -1512,14 +1514,14 @@ Get plugin stats:: "nice": 0.0, "softirq": 0.0, "steal": 0.0, - "system": 0.0, - "total": 62.0, + "system": 1.0, + "total": 54.0, "user": 1.0}, {"cpu_number": 13, "dpc": None, "guest": 0.0, "guest_nice": 0.0, - "idle": 39.0, + "idle": 46.0, "interrupt": None, "iowait": 0.0, "irq": 0.0, @@ -1527,14 +1529,14 @@ Get plugin stats:: "nice": 0.0, "softirq": 0.0, "steal": 0.0, - "system": 0.0, - "total": 61.0, - "user": 0.0}, + "system": 1.0, + "total": 54.0, + "user": 1.0}, {"cpu_number": 14, "dpc": None, "guest": 0.0, "guest_nice": 0.0, - "idle": 39.0, + "idle": 47.0, "interrupt": None, "iowait": 0.0, "irq": 0.0, @@ -1543,13 +1545,13 @@ Get plugin stats:: "softirq": 0.0, "steal": 0.0, "system": 0.0, - "total": 61.0, - "user": 1.0}, + "total": 53.0, + "user": 0.0}, {"cpu_number": 15, "dpc": None, "guest": 0.0, "guest_nice": 0.0, - "idle": 39.0, + "idle": 47.0, "interrupt": None, "iowait": 0.0, "irq": 0.0, @@ -1558,9 +1560,9 @@ Get plugin stats:: "softirq": 0.0, "steal": 0.0, "system": 0.0, - "total": 61.0, - "user": 0.0}], - "swap": 35.6} + "total": 53.0, + "user": 1.0}], + "swap": 39.5} Fields descriptions: @@ -1598,14 +1600,14 @@ Get plugin stats:: "label": "Ambient", "type": "temperature_core", "unit": "C", - "value": 32, + "value": 34, "warning": 0}, {"critical": None, "key": "label", "label": "Ambient 3", "type": "temperature_core", "unit": "C", - "value": 27, + "value": 28, "warning": 0}] Fields descriptions: @@ -1666,7 +1668,7 @@ Get a specific item when field matches the given value:: "label": "Ambient", "type": "temperature_core", "unit": "C", - "value": 32, + "value": 34, "warning": 0}]} GET smart @@ -1710,7 +1712,7 @@ GET uptime Get plugin stats:: # curl http://localhost:61208/api/4/uptime - "6 days, 8:13:47" + "6 days, 8:47:13" GET version ----------- @@ -1718,7 +1720,7 @@ GET version Get plugin stats:: # curl http://localhost:61208/api/4/version - "4.3.0.1" + "4.3.0.3" GET vms ------- @@ -1736,7 +1738,7 @@ Get plugin stats:: "load_1min": 0, "load_5min": 0, "memory_total": 1002471424, - "memory_usage": 301572096, + "memory_usage": 301858816, "name": "upstanding-sparrow", "release": "Ubuntu 24.04.1 LTS", "status": "running"}] @@ -1775,7 +1777,7 @@ Get a specific item when field matches the given value:: "load_1min": 0, "load_5min": 0, "memory_total": 1002471424, - "memory_usage": 301572096, + "memory_usage": 301858816, "name": "upstanding-sparrow", "release": "Ubuntu 24.04.1 LTS", "status": "running"}]} @@ -1787,8 +1789,8 @@ Get plugin stats:: # curl http://localhost:61208/api/4/wifi [{"key": "ssid", - "quality_level": -68.0, - "quality_link": 42.0, + "quality_level": -69.0, + "quality_link": 41.0, "ssid": "wlp0s20f3"}] Get a specific field:: @@ -1800,8 +1802,8 @@ Get a specific item when field matches the given value:: # curl http://localhost:61208/api/4/wifi/ssid/value/wlp0s20f3 {"wlp0s20f3": [{"key": "ssid", - "quality_level": -68.0, - "quality_link": 42.0, + "quality_level": -69.0, + "quality_link": 41.0, "ssid": "wlp0s20f3"}]} GET all stats @@ -1846,34 +1848,34 @@ GET stats history History of a plugin:: # curl http://localhost:61208/api/4/cpu/history - {"system": [["2024-12-27T21:22:07.760965", 3.8], - ["2024-12-27T21:22:09.122060", 1.2], - ["2024-12-27T21:22:10.141657", 1.2]], - "user": [["2024-12-27T21:22:07.760961", 5.6], - ["2024-12-27T21:22:09.122057", 1.5], - ["2024-12-27T21:22:10.141654", 1.5]]} + {"system": [["2024-12-27T21:55:33.234554", 4.7], + ["2024-12-27T21:55:34.515353", 2.0], + ["2024-12-27T21:55:35.623140", 2.0]], + "user": [["2024-12-27T21:55:33.234551", 3.5], + ["2024-12-27T21:55:34.515349", 1.8], + ["2024-12-27T21:55:35.623138", 1.8]]} Limit history to last 2 values:: # curl http://localhost:61208/api/4/cpu/history/2 - {"system": [["2024-12-27T21:22:09.122060", 1.2], - ["2024-12-27T21:22:10.141657", 1.2]], - "user": [["2024-12-27T21:22:09.122057", 1.5], - ["2024-12-27T21:22:10.141654", 1.5]]} + {"system": [["2024-12-27T21:55:34.515353", 2.0], + ["2024-12-27T21:55:35.623140", 2.0]], + "user": [["2024-12-27T21:55:34.515349", 1.8], + ["2024-12-27T21:55:35.623138", 1.8]]} History for a specific field:: # curl http://localhost:61208/api/4/cpu/system/history - {"system": [["2024-12-27T21:22:06.599460", 3.8], - ["2024-12-27T21:22:07.760965", 3.8], - ["2024-12-27T21:22:09.122060", 1.2], - ["2024-12-27T21:22:10.141657", 1.2]]} + {"system": [["2024-12-27T21:55:31.844531", 4.7], + ["2024-12-27T21:55:33.234554", 4.7], + ["2024-12-27T21:55:34.515353", 2.0], + ["2024-12-27T21:55:35.623140", 2.0]]} Limit history for a specific field to last 2 values:: # curl http://localhost:61208/api/4/cpu/system/history - {"system": [["2024-12-27T21:22:09.122060", 1.2], - ["2024-12-27T21:22:10.141657", 1.2]]} + {"system": [["2024-12-27T21:55:34.515353", 2.0], + ["2024-12-27T21:55:35.623140", 2.0]]} GET limits (used for thresholds) -------------------------------- diff --git a/docs/man/glances.1 b/docs/man/glances.1 index f69fe1dc1..eddeef5d9 100644 --- a/docs/man/glances.1 +++ b/docs/man/glances.1 @@ -28,7 +28,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" "Dec 27, 2024" "4.3.0.1" "Glances" +.TH "GLANCES" "1" "Dec 27, 2024" "4.3.0.3" "Glances" .SH NAME glances \- An eye on your system .SH SYNOPSIS diff --git a/glances/__init__.py b/glances/__init__.py index 10b6e34f3..dcf3bb47c 100644 --- a/glances/__init__.py +++ b/glances/__init__.py @@ -19,7 +19,7 @@ # Global name # Version should start and end with a numerical char # See https://packaging.python.org/specifications/core-metadata/#version -__version__ = "4.3.0.1" +__version__ = "4.3.0.3" __apiversion__ = '4' __author__ = 'Nicolas Hennion ' __license__ = 'LGPLv3' diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index a4b6426c1..ac87e892f 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -1,5 +1,5 @@ name: glances -version: '4.3.0.1+build01' # Put the current stable version+buildXX +version: '4.3.0.3+build01' # Put the current stable version+buildXX summary: Glances an Eye on your system. A top/htop alternative. description: |