nicolargo/glances
1
1
Fork 0
mirror of https://github.com/nicolargo/glances.git synced 2024-08-17 00:10:48 +03:00
Code Issues Projects Releases Wiki Activity

version 3.4.0.5

Browse Source
This commit is contained in:
nicolargo 2024-03-23 14:47:29 +01:00
parent fb10c7f36d
commit ee826a1e67
5 changed files with 320 additions and 309 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
NEWS.rst
View File

@ -2,11 +2,17 @@
Glances changelog
==============================================================================
===============
Version 3.4.0.5
===============
Correct issur with GPU plugin in Docker images #2705
===============
Version 3.4.0.4
===============
Cuber security patch (update some deps in the WebUI and Docker image)
Cyber security patch (update some deps in the WebUI and Docker image)
===============
Version 3.4.0.3

615
docs/api.rst
View File

@ -66,14 +66,14 @@ GET alert
Get plugin stats::
# curl http://localhost:61208/api/3/alert
[[1711185029.0,
[[1711201358.0,
-1,
"WARNING",
"MEM",
77.19987581483426,
77.19987581483426,
77.19987581483426,
77.19987581483426,
72.76789991471432,
72.76789991471432,
72.76789991471432,
72.76789991471432,
1,
[],
"",
@ -93,7 +93,7 @@ Get plugin stats::
"refresh": 3.0,
"regex": True,
"result": None,
"timer": 0.9669091701507568},
"timer": 2.1903090476989746},
{"count": 0,
"countmax": 20.0,
"countmin": None,
@ -102,7 +102,7 @@ Get plugin stats::
"refresh": 3.0,
"regex": True,
"result": None,
"timer": 0.9667403697967529}]
"timer": 2.1896636486053467}]
Get a specific field::
@ -120,7 +120,7 @@ Get a specific item when field matchs the given value::
"refresh": 3.0,
"regex": True,
"result": None,
"timer": 0.9669091701507568}]}
"timer": 2.1903090476989746}]}
GET connections
---------------
@ -191,19 +191,19 @@ Get plugin stats::
"ctx_switches": 0,
"guest": 0.0,
"guest_nice": 0.0,
"idle": 68.7,
"idle": 43.8,
"interrupts": 0,
"iowait": 4.0,
"iowait": 2.3,
"irq": 0.0,
"nice": 0.0,
"soft_interrupts": 0,
"softirq": 0.3,
"softirq": 0.5,
"steal": 0.0,
"syscalls": 0,
"system": 4.3,
"system": 11.8,
"time_since_update": 1,
"total": 25.0,
"user": 22.6}
"total": 58.6,
"user": 41.5}
Fields descriptions:
@ -226,7 +226,7 @@ Fields descriptions:
Get a specific field::
# curl http://localhost:61208/api/3/cpu/total
{"total": 25.0}
{"total": 58.6}
GET diskio
----------
@ -272,13 +272,13 @@ Get plugin stats::
# curl http://localhost:61208/api/3/fs
[{"device_name": "/dev/mapper/ubuntu--gnome--vg-root",
"free": 36856778752,
"free": 35372294144,
"fs_type": "ext4",
"key": "mnt_point",
"mnt_point": "/",
"percent": 84.0,
"percent": 84.7,
"size": 243334156288,
"used": 194089922560},
"used": 195574407168},
{"device_name": "zsfpool",
"free": 31195136,
"fs_type": "zfs",
@ -297,13 +297,13 @@ Get a specific item when field matchs the given value::
# curl http://localhost:61208/api/3/fs/mnt_point//
{"/": [{"device_name": "/dev/mapper/ubuntu--gnome--vg-root",
"free": 36856778752,
"free": 35372294144,
"fs_type": "ext4",
"key": "mnt_point",
"mnt_point": "/",
"percent": 84.0,
"percent": 84.7,
"size": 243334156288,
"used": 194089922560}]}
"used": 195574407168}]}
GET ip
------
@ -329,10 +329,7 @@ GET load
Get plugin stats::
# curl http://localhost:61208/api/3/load
{"cpucore": 4,
"min1": 1.87353515625,
"min15": 1.30029296875,
"min5": 1.5517578125}
{"cpucore": 4, "min1": 3.265625, "min15": 1.38330078125, "min5": 2.578125}
Fields descriptions:
@ -344,7 +341,7 @@ Fields descriptions:
Get a specific field::
# curl http://localhost:61208/api/3/load/min1
{"min1": 1.87353515625}
{"min1": 3.265625}
GET mem
-------
@ -352,16 +349,16 @@ GET mem
Get plugin stats::
# curl http://localhost:61208/api/3/mem
{"active": 3217502208,
"available": 1783783424,
"buffers": 242143232,
"cached": 2323054592,
"free": 1783783424,
"inactive": 3508854784,
"percent": 77.2,
"shared": 658030592,
{"active": 2745454592,
"available": 2130522112,
"buffers": 103264256,
"cached": 2218123264,
"free": 2130522112,
"inactive": 3125297152,
"percent": 72.8,
"shared": 570695680,
"total": 7823568896,
"used": 6039785472}
"used": 5693046784}
Fields descriptions:
@ -388,13 +385,13 @@ GET memswap
Get plugin stats::
# curl http://localhost:61208/api/3/memswap
{"free": 3968638976,
"percent": 50.9,
"sin": 4544499712,
"sout": 9235214336,
{"free": 3544838144,
"percent": 56.1,
"sin": 5096357888,
"sout": 10397646848,
"time_since_update": 1,
"total": 8082419712,
"used": 4113780736}
"used": 4537581568}
Fields descriptions:
@ -418,17 +415,17 @@ Get plugin stats::
# curl http://localhost:61208/api/3/network
[{"alias": None,
"cumulative_cx": 5405761891,
"cumulative_rx": 5075958831,
"cumulative_tx": 329803060,
"cx": 27520,
"cumulative_cx": 5867501002,
"cumulative_rx": 5510140836,
"cumulative_tx": 357360166,
"cx": 35449,
"interface_name": "wlp2s0",
"is_up": True,
"key": "interface_name",
"rx": 19247,
"rx": 27458,
"speed": 0,
"time_since_update": 1,
"tx": 8273},
"tx": 7991},
{"alias": None,
"cumulative_cx": 0,
"cumulative_rx": 0,
@ -465,23 +462,24 @@ Get a specific field::
"lxdbr0",
"veth05608da0",
"mpqemubr0",
"veth3c5f47a"]}
"veth3c5f47a",
"veth76eaa9fe"]}
Get a specific item when field matchs the given value::
# curl http://localhost:61208/api/3/network/interface_name/wlp2s0
{"wlp2s0": [{"alias": None,
"cumulative_cx": 5405761891,
"cumulative_rx": 5075958831,
"cumulative_tx": 329803060,
"cx": 27520,
"cumulative_cx": 5867501002,
"cumulative_rx": 5510140836,
"cumulative_tx": 357360166,
"cx": 35449,
"interface_name": "wlp2s0",
"is_up": True,
"key": "interface_name",
"rx": 19247,
"rx": 27458,
"speed": 0,
"time_since_update": 1,
"tx": 8273}]}
"tx": 7991}]}
GET now
-------
@ -489,7 +487,7 @@ GET now
Get plugin stats::
# curl http://localhost:61208/api/3/now
"2024-03-23 10:10:28 CET"
"2024-03-23 14:42:38 CET"
GET percpu
----------
@ -500,29 +498,29 @@ Get plugin stats::
[{"cpu_number": 0,
"guest": 0.0,
"guest_nice": 0.0,
"idle": 84.3,
"iowait": 2.6,
"irq": 0.0,
"key": "cpu_number",
"nice": 0.0,
"softirq": 1.7,
"steal": 0.0,
"system": 1.7,
"total": 15.7,
"user": 9.6},
{"cpu_number": 1,
"guest": 0.0,
"guest_nice": 0.0,
"idle": 94.8,
"iowait": 0.9,
"idle": 35.4,
"iowait": 3.5,
"irq": 0.0,
"key": "cpu_number",
"nice": 0.0,
"softirq": 0.0,
"steal": 0.0,
"system": 0.9,
"total": 5.2,
"user": 3.4}]
"system": 12.0,
"total": 64.6,
"user": 49.1},
{"cpu_number": 1,
"guest": 0.0,
"guest_nice": 0.0,
"idle": 27.8,
"iowait": 2.5,
"irq": 0.0,
"key": "cpu_number",
"nice": 0.0,
"softirq": 0.0,
"steal": 0.0,
"system": 13.9,
"total": 72.2,
"user": 55.7}]
Get a specific field::
@ -541,7 +539,7 @@ Get plugin stats::
"port": 0,
"refresh": 30,
"rtt_warning": None,
"status": 0.005803,
"status": 0.012726,
"timeout": 3}]
Get a specific field::
@ -558,7 +556,7 @@ Get a specific item when field matchs the given value::
"port": 0,
"refresh": 30,
"rtt_warning": None,
"status": 0.005803,
"status": 0.012726,
"timeout": 3}]}
GET processcount
@ -567,12 +565,12 @@ GET processcount
Get plugin stats::
# curl http://localhost:61208/api/3/processcount
{"pid_max": 0, "running": 1, "sleeping": 335, "thread": 1678, "total": 403}
{"pid_max": 0, "running": 1, "sleeping": 343, "thread": 1678, "total": 410}
Get a specific field::
# curl http://localhost:61208/api/3/processcount/total
{"total": 403}
{"total": 410}
GET processlist
---------------
@ -607,18 +605,18 @@ Get plugin stats::
"--disable-features=CalculateNativeWinOcclusion,SpareRendererForSitePerProcess",
"--vscode-window-config=vscode:0a3f42ef-a12c-453d-8061-6c7b57ac6b4f"],
"cpu_percent": 0.0,
"cpu_times": [8788.45, 733.23, 0.0, 0.0, 0.0],
"cpu_times": [9135.96, 758.01, 0.0, 0.0, 0.0],
"gids": [1000, 1000, 1000],
"io_counters": [608010240, 3362816, 0, 0, 0],
"io_counters": [669990912, 3362816, 0, 0, 0],
"key": "pid",
"memory_info": [590098432,
1221794549760,
72073216,
"memory_info": [593412096,
1221800718336,
58327040,
126423040,
0,
1257771008,
1316687872,
0],
"memory_percent": 7.54257347055131,
"memory_percent": 7.584928360551629,
"name": "code",
"nice": 0,
"num_threads": 15,
@ -632,18 +630,18 @@ Get plugin stats::
"--node-ipc",
"--clientProcessId=35618"],
"cpu_percent": 0.0,
"cpu_times": [4611.97, 204.93, 4.37, 0.34, 0.0],
"cpu_times": [4659.97, 208.68, 4.41, 0.36, 0.0],
"gids": [1000, 1000, 1000],
"io_counters": [672653312, 1871872, 0, 0, 0],
"io_counters": [742035456, 1871872, 0, 0, 0],
"key": "pid",
"memory_info": [487878656,
"memory_info": [476098560,
1208849584128,
22482944,
21327872,
126423040,
0,
867049472,
860536832,
0],
"memory_percent": 6.236011499169393,
"memory_percent": 6.085439603445144,
"name": "code",
"nice": 0,
"num_threads": 13,
@ -660,214 +658,222 @@ Get a specific field::
7992,
8257,
35618,
645109,
8407,
5554,
654062,
665779,
385672,
662277,
654683,
14040,
35835,
385672,
740811,
741021,
645109,
35502,
644502,
666300,
741553,
8217,
666454,
666819,
742645,
742341,
742077,
35835,
6163,
644502,
35537,
35790,
5406,
35631,
35957,
667098,
6163,
36217,
293224,
32821,
35632,
667109,
6332,
2423,
35857,
8749,
35996,
3248,
55881,
265662,
55878,
4024,
517283,
640398,
35546,
35790,
742785,
293224,
35957,
742815,
35632,
2423,
36217,
420,
35955,
629519,
5849,
6332,
35857,
517283,
8749,
265662,
704963,
35996,
35546,
55881,
2621,
640457,
8604,
104932,
1645,
55878,
5849,
35955,
293597,
8189,
8604,
3248,
5306,
104932,
740111,
243963,
6341,
6122,
8189,
640503,
243963,
36155,
8156,
1497,
5306,
36155,
1645,
699931,
699921,
35958,
185654,
185653,
703131,
8156,
640457,
185679,
35956,
5998,
5809,
4301,
1,
5795,
640503,
703139,
35956,
5809,
5998,
5988,
1518,
35369,
5996,
6640,
1544,
6640,
6291,
1545,
35369,
1728,
2129,
6009,
4301,
5840,
5893,
5611,
4703,
5649,
6009,
2129,
5257,
5522,
6085,
6028,
703127,
5893,
4703,
5611,
5649,
5325,
35507,
35506,
640813,
6085,
6028,
5522,
2543,
1496,
5994,
32846,
1729,
31214,
5325,
1648,
6022,
1512,
2363,
1277,
6001,
6713,
2586,
6063,
31232,
5319,
1648,
1496,
31214,
5994,
2363,
6080,
5914,
1479,
182445,
5989,
2079,
5329,
5832,
1532,
1503,
1545,
6089,
6305,
48508,
5558,
6010,
6107,
6251,
1520,
1277,
32846,
1729,
6022,
1503,
4210,
6713,
1512,
703676,
6001,
6251,
2586,
640813,
31232,
4251,
5832,
2079,
8273,
5329,
1532,
6063,
5558,
5989,
6010,
1479,
6107,
6305,
3556,
1520,
5643,
1538,
182445,
6089,
104945,
5636,
5993,
8273,
5793,
5987,
5631,
5667,
6017,
6084,
5987,
1492,
5631,
1538,
6017,
6002,
5407,
5676,
5667,
35523,
6004,
5676,
704403,
5412,
3556,
111079,
5955,
35523,
1540,
3557,
4251,
455,
35387,
1731,
111058,
5334,
1487,
5303,
455,
35509,
5334,
111116,
1731,
1526,
5507,
1492,
5304,
1527,
5568,
293566,
1274,
5507,
1527,
35387,
3557,
1487,
742600,
5303,
1504,
1900,
1495,
5304,
1279,
5568,
1274,
1900,
2564,
1495,
34330,
6317,
36208,
666856,
2564,
1607,
4286,
34330,
1289,
1288,
4294,
1607,
4136,
1289,
3947,
2375,
3251,
2565,
706560,
1490,
4136,
3787,
653392,
293551,
1480,
1635,
667097,
4302,
293512,
3947,
4269,
4200,
293544,
2384,
5986,
293491,
5390,
4272,
2565,
4294,
4299,
3787,
733780,
1480,
293551,
1635,
742784,
293512,
700063,
4302,
4269,
2384,
293544,
5986,
4200,
293491,
4272,
5390,
7895,
1631,
2398,
@ -1031,33 +1037,32 @@ Get a specific field::
19450,
72733,
111072,
629230,
629231,
629234,
640161,
640162,
640165,
640166,
640169,
640216,
652755,
654117,
656184,
658124,
660421,
660669,
661136,
662149,
663088,
663825,
664298,
664546,
664862,
664982,
665624,
666288,
666401,
667053]}
698558,
734805,
735139,
736473,
736990,
738363,
739822,
739957,
739958,
739970,
739971,
739973,
739974,
739977,
740001,
740006,
740024,
740029,
740564,
741946,
741947,
742313,
742697]}
Get a specific item when field matchs the given value::
@ -1089,18 +1094,18 @@ Get a specific item when field matchs the given value::
"--disable-features=CalculateNativeWinOcclusion,SpareRendererForSitePerProcess",
"--vscode-window-config=vscode:0a3f42ef-a12c-453d-8061-6c7b57ac6b4f"],
"cpu_percent": 0.0,
"cpu_times": [8788.45, 733.23, 0.0, 0.0, 0.0],
"cpu_times": [9135.96, 758.01, 0.0, 0.0, 0.0],
"gids": [1000, 1000, 1000],
"io_counters": [608010240, 3362816, 0, 0, 0],
"io_counters": [669990912, 3362816, 0, 0, 0],
"key": "pid",
"memory_info": [590098432,
1221794549760,
72073216,
"memory_info": [593412096,
1221800718336,
58327040,
126423040,
0,
1257771008,
1316687872,
0],
"memory_percent": 7.54257347055131,
"memory_percent": 7.584928360551629,
"name": "code",
"nice": 0,
"num_threads": 15,
@ -1123,69 +1128,69 @@ GET quicklook
Get plugin stats::
# curl http://localhost:61208/api/3/quicklook
{"cpu": 25.0,
{"cpu": 58.6,
"cpu_hz": 2025000000.0,
"cpu_hz_current": 1818595250.0,
"cpu_hz_current": 1249543250.0,
"cpu_name": "Intel(R) Core(TM) i7-4500U CPU @ 1.80GHz",
"mem": 77.2,
"mem": 72.8,
"percpu": [{"cpu_number": 0,
"guest": 0.0,
"guest_nice": 0.0,
"idle": 84.3,
"iowait": 2.6,
"idle": 35.4,
"iowait": 3.5,
"irq": 0.0,
"key": "cpu_number",
"nice": 0.0,
"softirq": 1.7,
"softirq": 0.0,
"steal": 0.0,
"system": 1.7,
"total": 15.7,
"user": 9.6},
"system": 12.0,
"total": 64.6,
"user": 49.1},
{"cpu_number": 1,
"guest": 0.0,
"guest_nice": 0.0,
"idle": 94.8,
"iowait": 0.9,
"idle": 27.8,
"iowait": 2.5,
"irq": 0.0,
"key": "cpu_number",
"nice": 0.0,
"softirq": 0.0,
"steal": 0.0,
"system": 0.9,
"total": 5.2,
"user": 3.4},
"system": 13.9,
"total": 72.2,
"user": 55.7},
{"cpu_number": 2,
"guest": 0.0,
"guest_nice": 0.0,
"idle": 47.5,
"iowait": 5.8,
"idle": 46.0,
"iowait": 2.9,
"irq": 0.0,
"key": "cpu_number",
"nice": 0.0,
"softirq": 0.0,
"softirq": 2.5,
"steal": 0.0,
"system": 4.2,
"total": 52.5,
"user": 42.5},
"system": 10.8,
"total": 54.0,
"user": 37.8},
{"cpu_number": 3,
"guest": 0.0,
"guest_nice": 0.0,
"idle": 54.7,
"iowait": 9.4,
"idle": 45.7,
"iowait": 1.9,
"irq": 0.0,
"key": "cpu_number",
"nice": 0.0,
"softirq": 0.0,
"steal": 0.0,
"system": 6.0,
"total": 45.3,
"user": 29.9}],
"swap": 50.9}
"system": 12.7,
"total": 54.3,
"user": 39.7}],
"swap": 56.1}
Get a specific field::
# curl http://localhost:61208/api/3/quicklook/cpu
{"cpu": 25.0}
{"cpu": 58.6}
GET sensors
-----------
@ -1256,7 +1261,7 @@ GET uptime
Get plugin stats::
# curl http://localhost:61208/api/3/uptime
"19 days, 1:09:46"
"19 days, 5:41:56"
GET all stats
-------------
@ -1272,33 +1277,33 @@ GET stats history
History of a plugin::
# curl http://localhost:61208/api/3/cpu/history
{"system": [["2024-03-23T10:10:29.601235", 4.3],
["2024-03-23T10:10:30.667810", 4.3],
["2024-03-23T10:10:31.828837", 2.9]],
"user": [["2024-03-23T10:10:29.601227", 22.6],
["2024-03-23T10:10:30.667804", 22.6],
["2024-03-23T10:10:31.828831", 5.3]]}
{"system": [["2024-03-23T14:42:38.994139", 11.8],
["2024-03-23T14:42:40.195899", 11.8],
["2024-03-23T14:42:41.707493", 10.1]],
"user": [["2024-03-23T14:42:38.994120", 41.5],
["2024-03-23T14:42:40.195884", 41.5],
["2024-03-23T14:42:41.707478", 24.4]]}
Limit history to last 2 values::
# curl http://localhost:61208/api/3/cpu/history/2
{"system": [["2024-03-23T10:10:30.667810", 4.3],
["2024-03-23T10:10:31.828837", 2.9]],
"user": [["2024-03-23T10:10:30.667804", 22.6],
["2024-03-23T10:10:31.828831", 5.3]]}
{"system": [["2024-03-23T14:42:40.195899", 11.8],
["2024-03-23T14:42:41.707493", 10.1]],
"user": [["2024-03-23T14:42:40.195884", 41.5],
["2024-03-23T14:42:41.707478", 24.4]]}
History for a specific field::
# curl http://localhost:61208/api/3/cpu/system/history
{"system": [["2024-03-23T10:10:29.601235", 4.3],
["2024-03-23T10:10:30.667810", 4.3],
["2024-03-23T10:10:31.828837", 2.9]]}
{"system": [["2024-03-23T14:42:38.994139", 11.8],
["2024-03-23T14:42:40.195899", 11.8],
["2024-03-23T14:42:41.707493", 10.1]]}
Limit history for a specific field to last 2 values::
# curl http://localhost:61208/api/3/cpu/system/history
{"system": [["2024-03-23T10:10:30.667810", 4.3],
["2024-03-23T10:10:31.828837", 2.9]]}
{"system": [["2024-03-23T14:42:40.195899", 11.8],
["2024-03-23T14:42:41.707493", 10.1]]}
GET limits (used for thresholds)
--------------------------------

2
docs/man/glances.1
View File

@ -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" "Mar 23, 2024" "3.4.0.4" "Glances"
.TH "GLANCES" "1" "Mar 23, 2024" "3.4.0.5" "Glances"
.SH NAME
glances \- An eye on your system
.SH SYNOPSIS

2
glances/__init__.py
View File

@ -19,7 +19,7 @@ import sys
# Global name
# Version should start and end with a numerical char
# See https://packaging.python.org/specifications/core-metadata/#version
__version__ = '3.4.0.4'
__version__ = '3.4.0.5'
__author__ = 'Nicolas Hennion <nicolas@nicolargo.com>'
__license__ = 'LGPLv3'

2
optional-requirements.txt
View File

@ -24,7 +24,7 @@ prometheus_client
pygal
pymdstat
pymongo; python_version >= "3.7"
nvidia-ml-py; python_version >= "3.5"
py3nvml; python_version >= "3.5"
pysnmp
pySMART.smartx
python-dateutil