From d9056e6027082b43e4437bbdead34e7871ffd59f Mon Sep 17 00:00:00 2001 From: nicolargo Date: Sun, 12 May 2024 10:45:03 +0200 Subject: [PATCH 1/2] Glances version 4.0.0 --- docs/_static/glances-cgraph.svg | 2292 ++++++++++++------------ docs/_static/glances-pyinstrument.html | 2 +- docs/api.rst | 199 +- docs/man/glances.1 | 2 +- glances/__init__.py | 2 +- setup.py | 7 +- snap/snapcraft.yaml | 7 +- 7 files changed, 1286 insertions(+), 1225 deletions(-) diff --git a/docs/_static/glances-cgraph.svg b/docs/_static/glances-cgraph.svg index 9f3d2445..2dbf95b0 100644 --- a/docs/_static/glances-cgraph.svg +++ b/docs/_static/glances-cgraph.svg @@ -4,1384 +4,1452 @@ - - + + %3 - + 13 - -~:0:<built-in method _io.open> -0.77% -(0.38%) -46069× + +~:0:<method 'acquire' of '_thread.lock' objects> +7.90% +(0.11%) +6768× + + +42 + + +__init__:1460:process_iter +7.14% +(0.03%) +6971× + + + + + +13->42 + + +0.15% +362× + - -15 - - -threading:973:start -2.11% -(0.01%) -907× - - - - -20 - - -__init__:523:as_dict -2.61% -(0.12%) -6667× +15 + + +threading:973:start +3.09% +(0.01%) +907× - - -15->20 - - -0.35% -2× - - + -1002 +989 - -standalone:139:__serve_once -64.20% -(0.00%) -31× + +standalone:138:__serve_once +62.18% +(0.00%) +31× - + -15->1002 - - -33.43% -2× +15->989 + + +43.99% +3× - - -376 - - -stats:269:update -37.52% -(0.01%) -31× + + +366 + + +stats:268:update +33.63% +(0.01%) +31× - - -1002->376 - - -0.61% -7× + + +989->366 + + +0.61% +5× - + -17 - - -threading:323:wait -1.56% -(0.09%) -906× +16 + + +_pslinux:1711:wrapper +3.96% +(0.19%) +124176× - - -26 - - -glances_curses:363:__catch_key -100.00% -(0.01%) -572× - - - - - -17->26 - - -9.89% -11× - - - -2004 - - -glances_curses:358:get_key -99.99% -(0.01%) -572× - - - - - -26->2004 - - -0.45% -5× - - + 18 - - -__init__:1460:process_iter -5.02% -(0.02%) -6678× + + +glances_curses:361:__catch_key +100.00% +(0.01%) +562× - - -18->18 - - -0.18% -624× + + +2002 + + +glances_curses:356:get_key +99.99% +(0.01%) +562× + + + + + +18->2002 + + +0.35% +4× + + + +463 + + +client:345:_stream_helper +51.19% +(0.00%) +129× + + + + + +2002->463 + + +0.79% +1× + + + +3587 + + +~:0:<method 'getch' of '_curses.window' objects> +47.10% +(78.05%) +561× + + + + + +2002->3587 + + +0.35% +4× 19 - - -__init__:325:_init -0.90% -(0.02%) -6670× + + +model:1165:wrapper +6.36% +(0.01%) +684× - + + +19->15 + + +0.13% +44× + + +21 + + +connectionpool:598:urlopen +3.23% +(0.00%) +125× + + + + + +22 + + +__init__:518:msg_curse +0.84% +(0.02%) +30× + + + + + +331 + + +__init__:423:get_process_curses_data +0.86% +(0.27%) +13042× + + + + + +22->331 + + +0.19% +3016× + + + +22->463 + + +0.77% +1× + + + 23 - - -_pslinux:1766:_parse_stat_file -0.55% -(0.05%) -13332× + + +json_stream:10:stream_as_text +50.47% +(0.00%) +65× - -24 - - -_pslinux:1711:wrapper -2.86% -(0.13%) -118973× - - - - - -637 - - -client:345:_stream_helper -52.15% -(0.00%) -127× - - - - - -2004->637 - - -0.81% -1× - - - -4175 - - -~:0:<method 'getch' of '_curses.window' objects> -47.17% -(83.31%) -571× - - - - - -2004->4175 - - -0.45% -5× - - - -27 - - -model:1178:wrapper -4.79% -(0.01%) -684× - - - - - -118 - - -threading:1115:join -4.71% -(0.00%) -900× - - - - - -27->118 - - -0.26% -5× - - -28 - - -response:790:_fp_read -51.00% -(0.00%) -128× +24 + + +api:62:get +2.62% +(0.00%) +2× - - -28->26 - - -1.52% -16× - - + -29 - - -adapters:434:send -3.33% -(0.00%) -117× +25 + + +model:1183:wrapper +6.39% +(0.02%) +650× - + + +25->42 + + +0.47% +165× + + -32 - - -__init__:519:msg_curse -0.58% -(0.01%) -30× +78 + + +threading:1115:join +6.08% +(0.00%) +900× - - -339 - - -__init__:424:get_process_curses_data -0.60% -(0.18%) -12492× - - - - + -32->339 - - -0.25% -5337× +25->78 + + +0.35% +26× - - -32->637 - - -0.80% -1× + + +31 + + +_pslinux:2362:gids +0.92% +(0.03%) +6956× + - - -35 - - -containers:33:image -0.64% -(0.00%) -56× + + + +34 + + +__init__:322:__init__ +1.16% +(0.01%) +6962× - + 36 - - -client:234:_get -0.78% -(0.00%) -114× + + +threading:637:wait +2.85% +(0.02%) +906× - - -37 - - -json_stream:10:stream_as_text -51.32% -(0.00%) -64× - - - - - -38 - - -api:62:get -2.70% -(0.00%) -2× - - - - - -40 - - -model:1196:wrapper -4.87% -(0.02%) -646× - - - - - -41 - - -sessions:502:request -3.39% -(0.00%) -117× - - - - - -51 - - -_common:838:bcat -2.54% -(0.03%) -19263× - - - - - -41->51 - - -0.22% -152× - - - -90 - - -_common:821:cat -1.45% -(0.06%) -20657× - - - - - -51->90 - - -0.17% -181× + + +36->42 + + +0.14% +62× - + 44 - - -stats:263:__update_plugin -4.93% -(0.01%) -868× + + +glances_curses:1166:update +34.06% +(0.01%) +31× - + + +36->44 + + +1.69% +1× + + + +105 + + +~:0:<method 'read' of '_io.BufferedReader' objects> +1.99% +(2.96%) +26973× + + + + -44->51 - - -0.17% -2× +36->105 + + +0.19% +1× - - -115 - - -~:0:<method 'read' of '_io.BufferedReader' objects> -1.41% -(2.11%) -25818× + + +44->18 + + +0.35% +4× + + + +2402 + + +glances_curses:1152:flush +0.97% +(0.02%) +30× - - -90->115 - - -0.17% -85× + + +44->2402 + + +0.20% +6× - + + +41 + + +threading:323:wait +2.45% +(0.12%) +906× + + + + + +41->18 + + +6.07% +6× + + + +64 + + +_common:838:bcat +3.50% +(0.04%) +20110× + + + + + +41->64 + + +0.17% +20× + + + +77 + + +_common:821:cat +2.04% +(0.07%) +21504× + + + + + +64->77 + + +0.23% +181× + + + +43 + + +__init__:644:name +0.82% +(0.02%) +6955× + + + + + +2020 + + +glances_curses:616:display +0.95% +(0.00%) +30× + + + + + +2402->2020 + + +0.19% +6× + + + +46 + + +_pslinux:1766:_parse_stat_file +0.86% +(0.08%) +13917× + + + + + +47 + + +_pslinux:1847:cmdline +0.64% +(0.03%) +4180× + + + + -55 - - -__init__:721:status -0.52% -(0.01%) -6662× +49 + + +client:463:read +50.06% +(0.00%) +131× + + +49->18 + + +0.70% +8× + + + +51 + + +response:790:_fp_read +50.06% +(0.00%) +130× + + + + + +52 + + +response:899:read +50.21% +(0.00%) +129× + + + + + +52->18 + + +0.70% +8× + - + 56 - - -__init__:600:is_running -0.91% -(0.02%) -6241× + + +glances_batpercent:61:update +1.17% +(0.00%) +8× - -57 - - -_common:487:wrapper -1.80% -(0.07%) -68303× - - - - - -62 - - -~:0:<method 'readline' of '_io.BufferedReader' objects> -5.35% -(0.03%) -8191× - - - - -66 - - -client:463:read -51.00% -(0.00%) -129× +57 + + +sessions:593:get +0.79% +(0.00%) +122× - - -66->26 - - -0.72% -8× - - + -68 - - -glances_curses:1155:update -29.91% -(0.01%) -31× +58 + + +stats:262:__update_plugin +7.15% +(0.01%) +868× - - -68->26 - - -0.45% -5× + + +58->42 + + +0.16% +418× - + -2402 - - -glances_curses:1141:flush -1.50% -(0.01%) -30× +59 + + +client:537:_read_next_chunk_size +37.88% +(0.02%) +66× - - -68->2402 - - -1.11% -12× + + +59->18 + + +1.11% +13× - - -2022 - - -glances_curses:618:display -0.66% -(0.00%) -30× + + +60 + + +client:1320:endheaders +2.73% +(0.00%) +126× - - -2402->2022 - - -0.27% -12× + + +63 + + +_common:787:open_binary +1.56% +(0.08%) +41863× + + + + + +77->105 + + +0.22% +85× + + + +69 + + +_pslinux:1943:create_time +1.07% +(0.02%) +6962× + + - + 72 - - -sessions:673:send -3.37% -(0.01%) -117× + + +__init__:746:create_time +1.10% +(0.01%) +6962× - - -72->51 - - -0.27% -33× + + +73 + + +socket:693:readinto +3.13% +(0.04%) +186× + + - + 74 - - -client:537:_read_next_chunk_size -38.02% -(0.02%) -65× + + +__init__:600:is_running +0.77% +(0.02%) +6516× - - -74->26 - - -1.03% -12× + + +74->42 + + +0.13% +409× - + 75 - - -client:567:_get_chunk_left -40.73% -(0.00%) -128× - - - - - -76 - - -client:1320:endheaders -2.82% -(0.00%) -118× - - - - - -78 - - -_common:787:open_binary -1.10% -(0.07%) -40132× + + +_common:487:wrapper +2.88% +(0.11%) +71302× - + 82 - - -__init__:322:__init__ -1.25% -(0.01%) -6670× + + +~:0:<built-in method _io.open> +1.02% +(0.55%) +47975× - + 86 - - -__init__:746:create_time -0.66% -(0.01%) -6670× + + +images:317:get +0.66% +(0.00%) +60× - - -91 - - -threading:637:wait -1.91% -(0.02%) -906× + + +88 + + +client:591:_read_chunked +50.05% +(0.01%) +129× - - -91->68 - - -8.97% -1× + + +88->989 + + +10.03% +26× + + + +89 + + +client:1082:_send_output +2.72% +(0.01%) +126× + + + + + +92 + + +response:847:_raw_read +50.07% +(0.01%) +130× + + - + 93 - - -threading:1153:_wait_for_tstate_lock -4.70% -(0.00%) -901× + + +connectionpool:380:_make_request +3.20% +(0.00%) +125× - - -96 - - -decorators:9:wrapped -0.72% -(0.00%) -85× + + +97 + + +client:567:_get_chunk_left +41.95% +(0.00%) +130× - -98 - - -client:591:_read_chunked -51.00% -(0.00%) -127× - - - - - -98->1002 - - -11.65% -27× - - - -99 - - -client:1082:_send_output -2.81% -(0.00%) -118× - - - - - -103 - - -response:847:_raw_read -51.01% -(0.01%) -128× - - - - - -104 - - -response:899:read -51.15% -(0.00%) -127× - - - - -105 - - -connectionpool:380:_make_request -3.28% -(0.00%) -117× +98 + + +__init__:717:cmdline +1.01% +(0.00%) +4180× - + -107 - - -sessions:593:get -0.74% -(0.00%) -114× +106 + + +__init__:325:_init +1.14% +(0.04%) +6962× - + -114 +118 - -~:0:<method '__exit__' of '_io._IOBase' objects> -0.50% -(0.11%) -39984× + +~:0:<method 'recv_into' of '_socket.socket' objects> +3.12% +(4.87%) +185× - + -116 +122 - -~:0:<method 'acquire' of '_thread.lock' objects> -5.81% -(0.13%) -6751× + +~:0:<method 'readline' of '_io.BufferedReader' objects> +3.20% +(0.06%) +8584× - + -128 - - -_pslinux:2362:gids -0.59% -(0.02%) -6663× +123 + + +~:0:<method 'read' of '_io.TextIOWrapper' objects> +0.64% +(0.41%) +5634× - + -132 +124 - -~:0:<method 'recv_into' of '_socket.socket' objects> -5.32% -(3.68%) -177× + +~:0:<built-in method time.sleep> +2.61% +(4.72%) +66× + + + + + +133 + + +client:1027:send +2.72% +(0.04%) +126× + + + + + +136 + + +sessions:673:send +3.31% +(0.01%) +125× + + + + + +143 + + +__init__:424:get +2.88% +(0.00%) +16× + + + + + +144 + + +decorators:38:inner +0.94% +(0.00%) +122× + + + + + +145 + + +client:234:_get +0.85% +(0.00%) +122× - -146 - - -client:1027:send -2.81% -(0.03%) -118× - - - - - -158 - - -images:317:get -0.60% -(0.00%) -56× - - - - - -159 - - -decorators:38:inner -0.79% -(0.00%) -114× - - - - - -160 - - -image:234:inspect_image -0.54% -(0.00%) -56× - - - - - -166 - - -socket:693:readinto -5.33% -(0.05%) -178× - - - - -178 - - -__init__:717:cmdline -0.54% -(0.00%) -4026× +146 + + +decorators:9:wrapped +0.84% +(0.00%) +91× - + -289 +151 - -_pslinux:1492:sensors_fans -1.81% -(0.00%) -17× + +_pslinux:1954:memory_info +0.59% +(0.07%) +6955× - + -306 - - -processes:398:update -1.66% -(0.02%) -16× +152 + + +_pslinux:1800:_read_status_file +0.80% +(0.02%) +6959× - + -315 - - -connection:324:request -2.88% -(0.00%) -117× +163 + + +__init__:1093:memory_info +0.64% +(0.01%) +6955× - + -316 - - -connectionpool:598:urlopen -3.30% -(0.00%) -117× +165 + + +threading:1153:_wait_for_tstate_lock +6.08% +(0.00%) +901× + + +267 + + +__init__:523:as_dict +4.23% +(0.21%) +6958× + + + + + +278 + + +_pslinux:1492:sensors_fans +1.93% +(0.00%) +17× + + + + + +295 + + +processes:399:update +3.13% +(0.03%) +16× + + + + + +304 + + +connection:324:request +2.77% +(0.00%) +125× + + + + + +305 + + +__init__:215:update +0.53% +(0.00%) +30× + + + + + +307 + + +adapters:434:send +3.27% +(0.00%) +125× + + + + + +326 + + +__init__:385:build_sensors_list +2.47% +(0.01%) +32× + + + + + +326->64 + + +0.33% +1× + - + 332 - - -__init__:394:build_sensors_list -1.79% -(0.00%) -32× + + +__init__:165:update +2.48% +(0.00%) +8× - - -332->90 - - -0.20% -2× - - - -334 - - -battery:106:update -0.86% -(0.00%) -9× + + +333 + + +battery:106:update +1.22% +(0.00%) +9× - - -338 - - -glances_batpercent:97:update -0.92% -(0.00%) -8× + + +347 + + +__init__:124:__get_fan_speed +2.41% +(0.00%) +8× - - -341 - - -__init__:167:update -3.09% -(0.00%) -8× + + +348 + + +__init__:140:__get_bat_percent +1.18% +(0.00%) +8× - - -356 - - -__init__:118:__get_temperature -2.11% -(0.00%) -8× + + +349 + + +__init__:369:__update__ +2.47% +(0.00%) +16× - - -357 - - -glances_batpercent:61:update -0.96% -(0.00%) -8× + + +350 + + +containers:33:image +0.67% +(0.00%) +60× + + + + + +351 + + +__init__:78:update +3.13% +(0.00%) +16× + + + + + +352 + + +image:234:inspect_image +0.64% +(0.00%) +60× - -358 - - -__init__:433:get -1.79% -(0.00%) -16× - - - - - -359 - - -__init__:378:__update__ -1.79% -(0.00%) -16× - - - - - -361 - - -__init__:81:update -1.76% -(0.00%) -16× - - - - - -388 - - -__init__:2327:sensors_fans -1.81% -(0.00%) -17× - - - - - -389 - - -__init__:1483:add -1.67% -(0.00%) -422× - - - - - -393 - - -__init__:776:gids -0.73% -(0.01%) -6663× - - - - - -749 - - -connection:27:create_connection -2.69% -(0.00%) -2× - - - - - -938 - - -__init__:644:name -0.56% -(0.01%) -6662× - - - - -1011 - - -__init__:154:run -2.70% -(0.00%) -2× +358 + + +sessions:502:request +3.33% +(0.00%) +125× - - -1020 - - -__init__:142:__get_bat_percent -0.97% -(0.00%) -8× - + + +366->18 + + +19.26% +20× - - + -1402 - - -__init__:126:__get_fan_speed -2.07% -(0.00%) -8× +378 + + +__init__:2327:sensors_fans +2.50% +(0.00%) +17× - + -1463 - - -model:925:get_stats_display -0.61% -(0.00%) -960× +379 + + +__init__:1483:add +2.64% +(0.00%) +441× - - -1463->32 - - -0.24% -12× - - + -1544 - - -api:14:request -2.70% -(0.00%) -2× +382 + + +__init__:776:gids +1.03% +(0.01%) +6956× - + -1656 - - -json_stream:51:split_buffer -52.22% -(0.00%) -64× +409 + + +__init__:116:__get_temperature +2.26% +(0.00%) +8× - + -1687 - - -glances_curses:583:__get_stat_display -0.61% -(0.00%) -30× +745 + + +connection:27:create_connection +2.62% +(0.00%) +2× - - -1687->1463 - - -0.26% -384× - - + -1781 - - -~:0:<function socket.close at 0x78148be714e0> -2.69% -(0.00%) -12× +998 + + +__init__:154:run +2.62% +(0.00%) +2× - + -1782 - - -socket:496:_real_close -2.70% -(0.00%) -12× +1000 + + +__init__:160:update +1.07% +(0.00%) +30× - + -1915 - - -socket:500:close -2.70% -(0.00%) -13× +1450 + + +model:916:get_stats_display +0.89% +(0.00%) +960× - - -2021 - - -~:0:<built-in method time.sleep> -2.24% -(3.99%) -65× - - - - + -2022->1687 - - -0.26% -12× +1450->22 + + +0.17% +6× - + + +1534 + + +api:14:request +2.62% +(0.00%) +2× + + + + + +1640 + + +glances_batpercent:97:update +1.17% +(0.00%) +8× + + + + + +1647 + + +json_stream:51:split_buffer +50.52% +(0.00%) +65× + + + + -2482 - - -connection:192:_new_conn -2.69% -(0.00%) -2× +1678 + + +glances_curses:581:__get_stat_display +0.89% +(0.00%) +30× - + + +1678->1450 + + +0.18% +198× + + -2492 - - -connection:237:connect -2.69% -(0.00%) -2× +1772 + + +~:0:<method 'connect' of '_socket.socket' objects> +2.62% +(0.13%) +17× - - -3750 - - -glances_curses:1137:refresh -0.85% -(0.00%) -30× + + +2020->1678 + + +0.18% +6× + + + +2485 + + +connection:192:_new_conn +2.62% +(0.00%) +2× + + + + + +2493 + + +connection:237:connect +2.62% +(0.00%) +2× diff --git a/docs/_static/glances-pyinstrument.html b/docs/_static/glances-pyinstrument.html index d9d9517f..0b47ad29 100644 --- a/docs/_static/glances-pyinstrument.html +++ b/docs/_static/glances-pyinstrument.html @@ -13,7 +13,7 @@ diff --git a/docs/api.rst b/docs/api.rst index e7285669..96e58afb 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -141,7 +141,7 @@ Get plugin stats:: "refresh": 3.0, "regex": True, "result": None, - "timer": 0.3663492202758789}, + "timer": 0.3743629455566406}, {"count": 0, "countmax": 20.0, "countmin": None, @@ -150,7 +150,7 @@ Get plugin stats:: "refresh": 3.0, "regex": True, "result": None, - "timer": 0.36623501777648926}] + "timer": 0.37424492835998535}] Fields descriptions: @@ -178,7 +178,7 @@ Get a specific item when field matches the given value:: "refresh": 3.0, "regex": True, "result": None, - "timer": 0.3663492202758789}]} + "timer": 0.3743629455566406}]} GET cloud --------- @@ -311,18 +311,18 @@ Get plugin stats:: # curl http://localhost:61208/api/4/cpu {"cpucore": 16, - "ctx_switches": 417599944, + "ctx_switches": 426500065, "guest": 0.0, - "idle": 4.0, - "interrupts": 374317125, + "idle": 2.0, + "interrupts": 383116320, "iowait": 0.0, "irq": 0.0, "nice": 0.0, - "soft_interrupts": 133208497, + "soft_interrupts": 136368548, "steal": 0.0, "syscalls": 0, - "system": 0.0, - "total": 25.0, + "system": 1.0, + "total": 0.0, "user": 0.0} Fields descriptions: @@ -356,7 +356,7 @@ Fields descriptions: Get a specific field:: # curl http://localhost:61208/api/4/cpu/total - {"total": 25.0} + {"total": 0.0} GET diskio ---------- @@ -366,10 +366,10 @@ Get plugin stats:: # curl http://localhost:61208/api/4/diskio [{"disk_name": "nvme0n1", "key": "disk_name", - "read_bytes": 7890098688, - "read_count": 344619, - "write_bytes": 24110978048, - "write_count": 1078819}, + "read_bytes": 7908215296, + "read_count": 345603, + "write_bytes": 24704496640, + "write_count": 1125490}, {"disk_name": "nvme0n1p1", "key": "disk_name", "read_bytes": 7484416, @@ -409,10 +409,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": 7890098688, - "read_count": 344619, - "write_bytes": 24110978048, - "write_count": 1078819}]} + "read_bytes": 7908215296, + "read_count": 345603, + "write_bytes": 24704496640, + "write_count": 1125490}]} GET folders ----------- @@ -439,13 +439,13 @@ Get plugin stats:: # curl http://localhost:61208/api/4/fs [{"device_name": "/dev/mapper/ubuntu--vg-ubuntu--lv", - "free": 905225412608, + "free": 905216729088, "fs_type": "ext4", "key": "mnt_point", "mnt_point": "/", "percent": 5.0, "size": 1003736440832, - "used": 47448522752}] + "used": 47457206272}] Fields descriptions: @@ -466,13 +466,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": 905225412608, + "free": 905216729088, "fs_type": "ext4", "key": "mnt_point", "mnt_point": "/", "percent": 5.0, "size": 1003736440832, - "used": 47448522752}]} + "used": 47457206272}]} GET gpu ------- @@ -545,10 +545,7 @@ GET load Get plugin stats:: # curl http://localhost:61208/api/4/load - {"cpucore": 16, - "min1": 1.19580078125, - "min15": 0.728515625, - "min5": 0.9990234375} + {"cpucore": 16, "min1": 1.33740234375, "min15": 0.984375, "min5": 1.2060546875} Fields descriptions: @@ -560,7 +557,7 @@ Fields descriptions: Get a specific field:: # curl http://localhost:61208/api/4/load/min1 - {"min1": 1.19580078125} + {"min1": 1.33740234375} GET mem ------- @@ -568,16 +565,16 @@ GET mem Get plugin stats:: # curl http://localhost:61208/api/4/mem - {"active": 8123240448, - "available": 7505043456, - "buffers": 322965504, - "cached": 7686283264, - "free": 7505043456, - "inactive": 5349273600, - "percent": 54.3, - "shared": 1051676672, + {"active": 7930138624, + "available": 7938781184, + "buffers": 336519168, + "cached": 7680049152, + "free": 7938781184, + "inactive": 5387632640, + "percent": 51.7, + "shared": 1048281088, "total": 16422473728, - "used": 8917430272} + "used": 8483692544} Fields descriptions: @@ -604,13 +601,13 @@ GET memswap Get plugin stats:: # curl http://localhost:61208/api/4/memswap - {"free": 4288409600, + {"free": 4288147456, "percent": 0.2, "sin": 4096, - "sout": 4055040, + "sout": 4153344, "time_since_update": 1, "total": 4294963200, - "used": 6553600} + "used": 6815744} Fields descriptions: @@ -635,15 +632,15 @@ Get plugin stats:: # curl http://localhost:61208/api/4/network [{"alias": None, "bytes_all": 0, - "bytes_all_gauge": 5895221761, + "bytes_all_gauge": 5920633766, "bytes_recv": 0, - "bytes_recv_gauge": 5571082392, + "bytes_recv_gauge": 5591813676, "bytes_sent": 0, - "bytes_sent_gauge": 324139369, + "bytes_sent_gauge": 328820090, "interface_name": "wlp0s20f3", "key": "interface_name", "speed": 0, - "time_since_update": 0.37969160079956055}] + "time_since_update": 0.38811731338500977}] Fields descriptions: @@ -672,15 +669,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": 5895221761, + "bytes_all_gauge": 5920633766, "bytes_recv": 0, - "bytes_recv_gauge": 5571082392, + "bytes_recv_gauge": 5591813676, "bytes_sent": 0, - "bytes_sent_gauge": 324139369, + "bytes_sent_gauge": 328820090, "interface_name": "wlp0s20f3", "key": "interface_name", "speed": 0, - "time_since_update": 0.37969160079956055}]} + "time_since_update": 0.38811731338500977}]} GET now ------- @@ -688,7 +685,7 @@ GET now Get plugin stats:: # curl http://localhost:61208/api/4/now - {"custom": "2024-05-12 09:32:48 CEST", "iso": "2024-05-12T09:32:48+02:00"} + {"custom": "2024-05-12 10:03:54 CEST", "iso": "2024-05-12T10:03:54+02:00"} Fields descriptions: @@ -698,7 +695,7 @@ Fields descriptions: Get a specific field:: # curl http://localhost:61208/api/4/now/iso - {"iso": "2024-05-12T09:32:48+02:00"} + {"iso": "2024-05-12T10:03:54+02:00"} GET percpu ---------- @@ -718,11 +715,11 @@ Get plugin stats:: "steal": 0.0, "system": 0.0, "total": 100.0, - "user": 1.0}, + "user": 0.0}, {"cpu_number": 1, "guest": 0.0, "guest_nice": 0.0, - "idle": 1.0, + "idle": 0.0, "iowait": 0.0, "irq": 0.0, "key": "cpu_number", @@ -730,7 +727,7 @@ Get plugin stats:: "softirq": 0.0, "steal": 0.0, "system": 0.0, - "total": 99.0, + "total": 100.0, "user": 0.0}] Fields descriptions: @@ -765,7 +762,7 @@ Get plugin stats:: "port": 0, "refresh": 30, "rtt_warning": None, - "status": 0.00664, + "status": 0.007825, "timeout": 3}] Fields descriptions: @@ -793,7 +790,7 @@ Get a specific item when field matches the given value:: "port": 0, "refresh": 30, "rtt_warning": None, - "status": 0.00664, + "status": 0.007825, "timeout": 3}]} GET processcount @@ -802,7 +799,7 @@ GET processcount Get plugin stats:: # curl http://localhost:61208/api/4/processcount - {"pid_max": 0, "running": 1, "sleeping": 290, "thread": 1643, "total": 432} + {"pid_max": 0, "running": 1, "sleeping": 290, "thread": 1672, "total": 433} Fields descriptions: @@ -815,7 +812,7 @@ Fields descriptions: Get a specific field:: # curl http://localhost:61208/api/4/processcount/total - {"total": 432} + {"total": 433} GET processlist --------------- @@ -855,14 +852,14 @@ GET quicklook Get plugin stats:: # curl http://localhost:61208/api/4/quicklook - {"cpu": 25.0, + {"cpu": 0.0, "cpu_hz": 4475000000.0, - "cpu_hz_current": 1170889250.0, + "cpu_hz_current": 1287681187.5, "cpu_log_core": 16, "cpu_name": "13th Gen Intel(R) Core(TM) i7-13620H", "cpu_phys_core": 10, - "load": 4.6, - "mem": 54.3, + "load": 6.2, + "mem": 51.7, "percpu": [{"cpu_number": 0, "guest": 0.0, "guest_nice": 0.0, @@ -875,21 +872,8 @@ Get plugin stats:: "steal": 0.0, "system": 0.0, "total": 100.0, - "user": 1.0}, - {"cpu_number": 1, - "guest": 0.0, - "guest_nice": 0.0, - "idle": 1.0, - "iowait": 0.0, - "irq": 0.0, - "key": "cpu_number", - "nice": 0.0, - "softirq": 0.0, - "steal": 0.0, - "system": 0.0, - "total": 99.0, "user": 0.0}, - {"cpu_number": 2, + {"cpu_number": 1, "guest": 0.0, "guest_nice": 0.0, "idle": 0.0, @@ -902,6 +886,19 @@ Get plugin stats:: "system": 0.0, "total": 100.0, "user": 0.0}, + {"cpu_number": 2, + "guest": 0.0, + "guest_nice": 0.0, + "idle": 1.0, + "iowait": 0.0, + "irq": 0.0, + "key": "cpu_number", + "nice": 0.0, + "softirq": 0.0, + "steal": 0.0, + "system": 0.0, + "total": 99.0, + "user": 0.0}, {"cpu_number": 3, "guest": 0.0, "guest_nice": 0.0, @@ -970,7 +967,7 @@ Get plugin stats:: {"cpu_number": 8, "guest": 0.0, "guest_nice": 0.0, - "idle": 1.0, + "idle": 0.0, "iowait": 0.0, "irq": 0.0, "key": "cpu_number", @@ -978,7 +975,7 @@ Get plugin stats:: "softirq": 0.0, "steal": 0.0, "system": 0.0, - "total": 99.0, + "total": 100.0, "user": 0.0}, {"cpu_number": 9, "guest": 0.0, @@ -1109,14 +1106,14 @@ Get plugin stats:: "label": "Ambient", "type": "temperature_core", "unit": "C", - "value": 32, + "value": 35, "warning": 0}, {"critical": None, "key": "label", "label": "Ambient 3", "type": "temperature_core", "unit": "C", - "value": 26, + "value": 29, "warning": 0}] Fields descriptions: @@ -1177,7 +1174,7 @@ Get a specific item when field matches the given value:: "label": "Ambient", "type": "temperature_core", "unit": "C", - "value": 32, + "value": 35, "warning": 0}]} GET smart @@ -1221,7 +1218,7 @@ GET uptime Get plugin stats:: # curl http://localhost:61208/api/4/uptime - "6 days, 0:09:01" + "6 days, 0:40:06" GET version ----------- @@ -1229,7 +1226,7 @@ GET version Get plugin stats:: # curl http://localhost:61208/api/4/version - "4.0.0_rc03" + "4.0.0" GET wifi -------- @@ -1238,8 +1235,8 @@ Get plugin stats:: # curl http://localhost:61208/api/4/wifi [{"key": "ssid", - "quality_level": -63.0, - "quality_link": 47.0, + "quality_level": -60.0, + "quality_link": 50.0, "ssid": "wlp0s20f3"}] Get a specific field:: @@ -1251,8 +1248,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": -63.0, - "quality_link": 47.0, + "quality_level": -60.0, + "quality_link": 50.0, "ssid": "wlp0s20f3"}]} GET all stats @@ -1297,34 +1294,34 @@ GET stats history History of a plugin:: # curl http://localhost:61208/api/4/cpu/history - {"system": [["2024-05-12T09:32:49.897081", 0.0], - ["2024-05-12T09:32:50.949869", 0.0], - ["2024-05-12T09:32:52.026236", 0.0]], - "user": [["2024-05-12T09:32:49.897070", 0.0], - ["2024-05-12T09:32:50.949864", 0.0], - ["2024-05-12T09:32:52.026226", 0.0]]} + {"system": [["2024-05-12T10:03:56.177540", 1.0], + ["2024-05-12T10:03:57.232143", 0.0], + ["2024-05-12T10:03:58.309333", 0.0]], + "user": [["2024-05-12T10:03:56.177529", 0.0], + ["2024-05-12T10:03:57.232137", 1.0], + ["2024-05-12T10:03:58.309316", 1.0]]} Limit history to last 2 values:: # curl http://localhost:61208/api/4/cpu/history/2 - {"system": [["2024-05-12T09:32:50.949869", 0.0], - ["2024-05-12T09:32:52.026236", 0.0]], - "user": [["2024-05-12T09:32:50.949864", 0.0], - ["2024-05-12T09:32:52.026226", 0.0]]} + {"system": [["2024-05-12T10:03:57.232143", 0.0], + ["2024-05-12T10:03:58.309333", 0.0]], + "user": [["2024-05-12T10:03:57.232137", 1.0], + ["2024-05-12T10:03:58.309316", 1.0]]} History for a specific field:: # curl http://localhost:61208/api/4/cpu/system/history - {"system": [["2024-05-12T09:32:48.680666", 0.0], - ["2024-05-12T09:32:49.897081", 0.0], - ["2024-05-12T09:32:50.949869", 0.0], - ["2024-05-12T09:32:52.026236", 0.0]]} + {"system": [["2024-05-12T10:03:54.950945", 1.0], + ["2024-05-12T10:03:56.177540", 1.0], + ["2024-05-12T10:03:57.232143", 0.0], + ["2024-05-12T10:03:58.309333", 0.0]]} Limit history for a specific field to last 2 values:: # curl http://localhost:61208/api/4/cpu/system/history - {"system": [["2024-05-12T09:32:50.949869", 0.0], - ["2024-05-12T09:32:52.026236", 0.0]]} + {"system": [["2024-05-12T10:03:57.232143", 0.0], + ["2024-05-12T10:03:58.309333", 0.0]]} GET limits (used for thresholds) -------------------------------- diff --git a/docs/man/glances.1 b/docs/man/glances.1 index f689a7d6..71c4ae97 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" "May 12, 2024" "4.0.0_rc03" "Glances" +.TH "GLANCES" "1" "May 12, 2024" "4.0.0" "Glances" .SH NAME glances \- An eye on your system .SH SYNOPSIS diff --git a/glances/__init__.py b/glances/__init__.py index d58b0252..e2faa59c 100644 --- a/glances/__init__.py +++ b/glances/__init__.py @@ -20,7 +20,7 @@ import sys # Global name # Version should start and end with a numerical char # See https://packaging.python.org/specifications/core-metadata/#version -__version__ = '4.0.0_rc04' +__version__ = '4.0.0' __apiversion__ = '4' __author__ = 'Nicolas Hennion ' __license__ = 'LGPLv3' diff --git a/setup.py b/setup.py index f1ca8377..ee5b05d8 100755 --- a/setup.py +++ b/setup.py @@ -8,11 +8,6 @@ from io import open from setuptools import setup, Command -# Predication warning -# Glances version 4 will only be compatible with Python 3.7 and above -if sys.version_info < (3, 7): - print('WARNING: Glances version 4 will only be compatible with Python 3.7 and above.') - if sys.version_info < (3, 8): print('Glances requires at least Python 3.8 to run.') sys.exit(1) @@ -59,7 +54,7 @@ def get_install_requires(): def get_install_extras_require(): extras_require = { 'action': ['chevron'], - 'browser': ['zeroconf>=0.19.1'], + 'browser': ['zeroconf==0.131.0'], 'cloud': ['requests'], 'containers': ['docker>=6.1.1', 'python-dateutil', 'six', 'podman', 'packaging'], 'export': ['bernhard', 'cassandra-driver', 'elasticsearch', 'graphitesender', diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 930102fa..7e395bfb 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -1,5 +1,5 @@ name: glances -version: '4.0.0+rc02' ## '4.0.0' +version: '4.0.0' summary: Glances an Eye on your system. A top/htop alternative. description: | @@ -9,7 +9,7 @@ description: | depending on the user interface size. base: core22 -grade: devel ## stable +grade: stable confinement: strict apps: @@ -49,6 +49,7 @@ parts: glances: plugin: python source: https://github.com/nicolargo/glances.git - source-branch: develop ## master + source-branch: master python-requirements: - requirements.txt + - webui-requirements.txt From 4a4ca765056e07947279d4bfd6c6ac6b742d0266 Mon Sep 17 00:00:00 2001 From: nicolargo Date: Sun, 12 May 2024 11:05:13 +0200 Subject: [PATCH 2/2] Do not build WebUI if tags --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c01fbac5..f2e99c18 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: uses: ./.github/workflows/test.yml needs: [quality] webui: - if: github.event_name != 'pull_request' + if: github.event_name != 'pull_request' && !contains(github.ref, 'refs/tags/') uses: ./.github/workflows/webui.yml needs: [quality, test] cyber: