diff options
author | nicolargo <nicolas@nicolargo.com> | 2022-07-24 10:37:42 +0200 |
---|---|---|
committer | nicolargo <nicolas@nicolargo.com> | 2022-07-24 10:37:42 +0200 |
commit | d5efb63591b301112a705cc5df17a2e8e01d7ef6 (patch) | |
tree | 98177f36ac7a563c6884561b7fb8b96d69c9b928 | |
parent | 2fb2403405faf271223e99e79ff58f16ecccd4e6 (diff) |
Config to disable all plugins by default (or enable an exclusive list) #2089
-rw-r--r-- | docs/api.rst | 752 | ||||
-rw-r--r-- | docs/man/glances.1 | 2 | ||||
-rw-r--r-- | glances/main.py | 24 | ||||
-rw-r--r-- | glances/plugins/glances_system.py | 4 | ||||
-rw-r--r-- | glances/plugins/glances_uptime.py | 11 | ||||
-rw-r--r-- | glances/stats.py | 13 |
6 files changed, 419 insertions, 387 deletions
diff --git a/docs/api.rst b/docs/api.rst index 5b12401f..5f2a32c7 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -74,7 +74,7 @@ Get plugin stats:: "refresh": 3.0, "regex": True, "result": None, - "timer": 0.9667563438415527}, + "timer": 0.8538804054260254}, {"count": 0, "countmax": 20.0, "countmin": None, @@ -83,7 +83,7 @@ Get plugin stats:: "refresh": 3.0, "regex": True, "result": None, - "timer": 0.9666531085968018}] + "timer": 0.8537874221801758}] Get a specific field:: @@ -101,7 +101,7 @@ Get a specific item when field matchs the given value:: "refresh": 3.0, "regex": True, "result": None, - "timer": 0.9667563438415527}]} + "timer": 0.8538804054260254}]} GET core -------- @@ -131,19 +131,19 @@ Get plugin stats:: "ctx_switches": 0, "guest": 0.0, "guest_nice": 0.0, - "idle": 72.6, + "idle": 73.3, "interrupts": 0, - "iowait": 0.4, + "iowait": 0.0, "irq": 0.0, - "nice": 0.2, + "nice": 0.0, "soft_interrupts": 0, - "softirq": 0.2, + "softirq": 0.0, "steal": 0.0, "syscalls": 0, - "system": 2.7, + "system": 3.0, "time_since_update": 1, "total": 27.2, - "user": 23.8} + "user": 23.7} Fields descriptions: @@ -211,13 +211,13 @@ Get plugin stats:: # curl http://localhost:61208/api/3/fs [{"device_name": "/dev/mapper/ubuntu--gnome--vg-root", - "free": 111369003008, + "free": 110062321664, "fs_type": "ext4", "key": "mnt_point", "mnt_point": "/", - "percent": 51.8, + "percent": 52.4, "size": 243396149248, - "used": 119639691264}] + "used": 120946372608}] Get a specific field:: @@ -228,13 +228,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": 111369003008, + "free": 110062321664, "fs_type": "ext4", "key": "mnt_point", "mnt_point": "/", - "percent": 51.8, + "percent": 52.4, "size": 243396149248, - "used": 119639691264}]} + "used": 120946372608}]} GET ip ------ @@ -242,7 +242,7 @@ GET ip Get plugin stats:: # curl http://localhost:61208/api/3/ip - {"address": "192.168.0.17", + {"address": "192.168.0.48", "gateway": "192.168.0.254", "mask": "255.255.255.0", "mask_cidr": 24, @@ -251,7 +251,7 @@ Get plugin stats:: Get a specific field:: # curl http://localhost:61208/api/3/ip/address - {"address": "192.168.0.17"} + {"address": "192.168.0.48"} GET load -------- @@ -259,10 +259,7 @@ GET load Get plugin stats:: # curl http://localhost:61208/api/3/load - {"cpucore": 4, - "min1": 0.4853515625, - "min15": 1.4072265625, - "min5": 1.15673828125} + {"cpucore": 4, "min1": 1.40771484375, "min15": 1.4169921875, "min5": 1.484375} Fields descriptions: @@ -274,7 +271,7 @@ Fields descriptions: Get a specific field:: # curl http://localhost:61208/api/3/load/min1 - {"min1": 0.4853515625} + {"min1": 1.40771484375} GET mem ------- @@ -282,16 +279,16 @@ GET mem Get plugin stats:: # curl http://localhost:61208/api/3/mem - {"active": 2396389376, - "available": 3108925440, - "buffers": 704446464, - "cached": 2832637952, - "free": 3108925440, - "inactive": 3804848128, - "percent": 60.3, - "shared": 588562432, - "total": 7837966336, - "used": 4729040896} + {"active": 2461896704, + "available": 3079487488, + "buffers": 486854656, + "cached": 3247910912, + "free": 3079487488, + "inactive": 4266680320, + "percent": 60.7, + "shared": 539095040, + "total": 7837974528, + "used": 4758487040} Fields descriptions: @@ -310,7 +307,7 @@ Fields descriptions: Get a specific field:: # curl http://localhost:61208/api/3/mem/total - {"total": 7837966336} + {"total": 7837974528} GET memswap ----------- @@ -318,13 +315,13 @@ GET memswap Get plugin stats:: # curl http://localhost:61208/api/3/memswap - {"free": 7701032960, - "percent": 4.7, - "sin": 37408768, - "sout": 422850560, + {"free": 7600726016, + "percent": 6.0, + "sin": 48836608, + "sout": 519880704, "time_since_update": 1, "total": 8082419712, - "used": 381386752} + "used": 481693696} Fields descriptions: @@ -348,29 +345,29 @@ Get plugin stats:: # curl http://localhost:61208/api/3/network [{"alias": None, - "cumulative_cx": 96794932, - "cumulative_rx": 48397466, - "cumulative_tx": 48397466, - "cx": 5500, + "cumulative_cx": 47984606, + "cumulative_rx": 23992303, + "cumulative_tx": 23992303, + "cx": 2492, "interface_name": "lo", "is_up": True, "key": "interface_name", - "rx": 2750, + "rx": 1246, "speed": 0, "time_since_update": 1, - "tx": 2750}, + "tx": 1246}, {"alias": None, - "cumulative_cx": 0, - "cumulative_rx": 0, - "cumulative_tx": 0, - "cx": 0, - "interface_name": "br-119e6ee04e05", - "is_up": False, + "cumulative_cx": 1734453000, + "cumulative_rx": 1610954683, + "cumulative_tx": 123498317, + "cx": 31305, + "interface_name": "wlp2s0", + "is_up": True, "key": "interface_name", - "rx": 0, - "speed": 68718428160, + "rx": 25086, + "speed": 0, "time_since_update": 1, - "tx": 0}] + "tx": 6219}] Fields descriptions: @@ -388,28 +385,28 @@ Get a specific field:: # curl http://localhost:61208/api/3/network/interface_name {"interface_name": ["lo", + "wlp2s0", "br-119e6ee04e05", + "docker0", "br-87386b77b676", "br_grafana", - "docker0", - "wlp2s0", "mpqemubr0"]} Get a specific item when field matchs the given value:: # curl http://localhost:61208/api/3/network/interface_name/lo {"lo": [{"alias": None, - "cumulative_cx": 96794932, - "cumulative_rx": 48397466, - "cumulative_tx": 48397466, - "cx": 5500, + "cumulative_cx": 47984606, + "cumulative_rx": 23992303, + "cumulative_tx": 23992303, + "cx": 2492, "interface_name": "lo", "is_up": True, "key": "interface_name", - "rx": 2750, + "rx": 1246, "speed": 0, "time_since_update": 1, - "tx": 2750}]} + "tx": 1246}]} GET now ------- @@ -417,7 +414,7 @@ GET now Get plugin stats:: # curl http://localhost:61208/api/3/now - "2022-07-10 18:42:07 CEST" + "2022-07-24 10:33:51 CEST" GET percpu ---------- @@ -428,29 +425,29 @@ Get plugin stats:: [{"cpu_number": 0, "guest": 0.0, "guest_nice": 0.0, - "idle": 92.7, + "idle": 90.0, "iowait": 0.0, "irq": 0.0, "key": "cpu_number", "nice": 0.0, - "softirq": 0.9, + "softirq": 1.0, "steal": 0.0, - "system": 3.6, - "total": 7.3, - "user": 2.7}, + "system": 0.0, + "total": 10.0, + "user": 4.0}, {"cpu_number": 1, "guest": 0.0, "guest_nice": 0.0, - "idle": 96.2, + "idle": 90.0, "iowait": 0.0, "irq": 0.0, "key": "cpu_number", "nice": 0.0, - "softirq": 0.0, + "softirq": 1.0, "steal": 0.0, - "system": 1.0, - "total": 3.8, - "user": 2.9}] + "system": 3.0, + "total": 10.0, + "user": 3.0}] Get a specific field:: @@ -469,7 +466,7 @@ Get plugin stats:: "port": 0, "refresh": 30, "rtt_warning": None, - "status": 0.005325, + "status": 0.003645, "timeout": 3}] Get a specific field:: @@ -486,7 +483,7 @@ Get a specific item when field matchs the given value:: "port": 0, "refresh": 30, "rtt_warning": None, - "status": 0.005325, + "status": 0.003645, "timeout": 3}]} GET processcount @@ -495,12 +492,12 @@ GET processcount Get plugin stats:: # curl http://localhost:61208/api/3/processcount - {"pid_max": 0, "running": 1, "sleeping": 231, "thread": 1186, "total": 296} + {"pid_max": 0, "running": 1, "sleeping": 233, "thread": 1256, "total": 299} Get a specific field:: # curl http://localhost:61208/api/3/processcount/total - {"total": 296} + {"total": 299} GET processlist --------------- @@ -508,51 +505,50 @@ GET processlist Get plugin stats:: # curl http://localhost:61208/api/3/processlist - [{"cmdline": ["/snap/firefox/1443/usr/lib/firefox/firefox", - "https://github.com/aanarchyy/bully"], + [{"cmdline": ["/snap/firefox/1443/usr/lib/firefox/firefox"], "cpu_percent": 0.0, - "cpu_times": pcputimes(user=1259.26, system=438.49, children_user=965.9, children_system=189.51, iowait=0.0), + "cpu_times": pcputimes(user=2687.47, system=1037.45, children_user=2125.3, children_system=344.64, iowait=0.0), "gids": pgids(real=1000, effective=1000, saved=1000), - "io_counters": [760196096, 2069577728, 0, 0, 0], + "io_counters": [982852608, 2811539456, 0, 0, 0], "key": "pid", - "memory_info": pmem(rss=493039616, vms=13052383232, shared=162074624, text=741376, lib=0, data=1083805696, dirty=0), - "memory_percent": 6.290402316930798, + "memory_info": pmem(rss=521953280, vms=13237006336, shared=174477312, text=741376, lib=0, data=1154760704, dirty=0), + "memory_percent": 6.659287780732119, "name": "firefox", - "nice": 1, - "num_threads": 148, - "pid": 4749, + "nice": 0, + "num_threads": 164, + "pid": 4236, "status": "S", "time_since_update": 1, "username": "nicolargo"}, {"cmdline": ["/snap/firefox/1443/usr/lib/firefox/firefox", "-contentproc", "-childID", - "5", + "3", "-isForBrowser", "-prefsLen", - "13082", + "13098", "-prefMapSize", - "255675", + "255747", "-jsInitLen", "277128", "-parentBuildID", "20220609070438", "-appDir", "/snap/firefox/1443/usr/lib/firefox/browser", - "4749", + "4236", "true", "tab"], "cpu_percent": 0.0, - "cpu_times": pcputimes(user=237.34, system=47.77, children_user=0.0, children_system=0.0, iowait=0.0), + "cpu_times": pcputimes(user=421.23, system=83.44, children_user=0.0, children_system=0.0, iowait=0.0), "gids": pgids(real=1000, effective=1000, saved=1000), - "io_counters": [11452416, 0, 0, 0, 0], + "io_counters": [11130880, 0, 0, 0, 0], "key": "pid", - "memory_info": pmem(rss=451424256, vms=3242536960, shared=97570816, text=741376, lib=0, data=640311296, dirty=0), - "memory_percent": 5.759456428469152, + "memory_info": pmem(rss=459653120, vms=3240546304, shared=89395200, text=741376, lib=0, data=649822208, dirty=0), + "memory_percent": 5.864437532400207, "name": "WebExtensions", "nice": 0, "num_threads": 20, - "pid": 6457, + "pid": 5262, "status": "S", "time_since_update": 1, "username": "nicolargo"}] @@ -560,174 +556,175 @@ Get plugin stats:: Get a specific field:: # curl http://localhost:61208/api/3/processlist/pid - {"pid": [4749, - 6457, - 51856, - 51801, - 52015, - 3272, - 6017, - 50895, - 98547, - 51732, - 51838, - 6091, - 78596, - 51766, - 63579, - 9953, - 4169, - 54905, - 101118, - 100877, - 101408, - 51857, - 52062, - 2000, - 101576, - 1938, - 3161, - 2207, - 9417, - 51784, - 33193, - 75548, - 3582, - 4176, - 3676, - 3369, - 5070, - 1423, - 1357, + {"pid": [4236, + 5262, + 9730, + 9861, + 4450, + 9695, + 3561, + 42242, + 52578, + 75296, + 50530, + 73809, + 76244, + 4417, + 9729, + 9628, + 5492, + 4088, + 76136, + 76002, + 76285, + 9663, + 1980, + 2040, 76402, - 51736, - 3082, - 3345, - 51737, - 3938, - 3380, - 3458, + 9796, 3457, - 3534, - 3451, - 2128, - 1223, - 1208, - 3338, - 5151, - 1745, - 2161, - 3474, - 4206, - 3456, - 3245, - 3302, - 99103, - 1249, - 1, - 1226, - 2681, - 3636, - 1393, - 1941, - 99080, - 3196, - 3452, - 3471, - 99138, - 33179, - 3064, - 3072, - 1350, - 3252, - 4741, - 3355, - 48285, - 3512, - 1250, - 2684, - 1247, - 1399, - 3465, - 48265, - 2159, - 3547, - 3461, - 1715, - 35988, - 3093, - 3469, - 3383, - 3649, - 3315, - 2160, - 1190, + 2243, + 9761, + 3870, + 9955, + 41978, + 3680, + 73036, + 4095, + 5779, + 1284, + 41980, + 3962, + 1450, + 4391, + 3651, + 3370, + 1433, + 9682, + 3768, + 3844, + 3690, + 3759, + 3766, + 4465, + 347, + 5870, + 58878, + 4126, + 50975, 1246, + 1264, + 3782, + 58882, + 3765, + 3607, + 1784, + 3643, + 9632, + 3538, + 3033, + 1, + 1293, + 58865, + 51015, + 9633, + 1093, + 1449, + 3761, + 3456, + 3938, + 3767, + 3880, + 1271, + 3359, + 1295, + 1400, + 3774, + 51035, + 3616, + 3586, + 3234, + 3769, + 58880, + 3661, + 36696, + 1290, + 1454, + 3779, + 1754, + 36676, + 3846, + 3028, + 3706, + 3592, + 1289, 1228, - 3542, - 3100, - 3454, - 3273, - 3621, - 3284, - 3540, - 3533, - 81001, - 1215, - 1240, - 1207, - 51990, - 3467, - 3450, - 3298, - 3428, - 9975, - 3462, - 1236, - 3352, - 3464, - 3320, - 3290, - 35940, - 51598, - 3183, - 3105, - 3098, - 1203, - 1232, - 3232, - 3334, - 3079, - 3080, - 1217, - 1199, - 3281, - 51739, - 98902, - 1045, - 1206, - 1558, - 101564, - 1060, - 51753, - 76590, + 3386, + 3382, + 58881, + 3950, + 3559, + 3923, + 3763, + 1272, + 3775, + 3753, + 393, + 3837, + 3853, 1253, - 1961, - 1059, - 1954, - 3668, - 3073, - 4290, - 1191, - 3146, - 81020, - 101575, - 3449, - 1966, - 1257, - 1995, - 1989, - 1201, + 1101, + 3843, + 54916, + 3603, + 1245, + 1286, + 3770, + 3658, + 3623, + 3597, + 3771, + 3379, + 3758, + 3451, + 3391, + 1282, + 9827, + 1281, + 1241, + 3526, + 5562, + 3367, + 9854, + 3640, + 3368, + 3568, + 1237, + 1259, + 42042, + 3360, + 1086, + 1244, + 1596, + 76386, + 1139, + 1300, + 73241, + 9648, + 1135, + 1996, + 3959, + 1240, + 4203, + 3433, + 1229, + 2006, + 76401, + 3757, + 1307, + 2049, + 2038, + 2036, 2, 3, 4, @@ -775,110 +772,111 @@ Get a specific field:: 99, 100, 102, + 104, 105, - 106, - 108, - 109, + 107, + 110, 111, 116, 117, 118, 128, - 132, - 138, + 131, + 137, + 160, 187, - 188, - 189, 190, - 191, - 192, - 194, - 195, + 196, + 197, 198, - 204, + 199, + 200, + 201, + 202, + 203, + 210, 211, - 213, - 214, - 219, - 220, - 237, - 285, - 286, - 361, + 216, + 217, + 234, + 287, + 288, 362, - 376, - 475, - 529, - 557, - 574, - 576, - 578, - 773, - 774, - 775, - 776, - 783, - 784, - 785, - 786, - 787, + 363, + 385, + 463, + 499, + 565, + 567, + 568, + 569, 788, 789, 790, - 2007, - 2104, - 2105, - 2106, - 2107, - 2108, - 2109, - 2110, - 2111, - 3168, - 39803, - 39804, - 84733, - 94636, - 97095, - 98268, - 98537, - 98538, - 98698, - 98741, - 98778, - 98780, - 98783, - 98789, - 98791, - 98794, - 98837, - 98841, - 101451, - 101528, - 101589]} + 791, + 792, + 793, + 794, + 795, + 796, + 797, + 798, + 799, + 2051, + 2057, + 2071, + 2150, + 2151, + 2152, + 2153, + 2154, + 2155, + 2156, + 2157, + 3617, + 9635, + 40332, + 43168, + 50836, + 68803, + 69770, + 69963, + 72076, + 72077, + 72167, + 72180, + 74547, + 74770, + 74850, + 75055, + 75272, + 75639, + 75640, + 75991, + 76173, + 76385]} Get a specific item when field matchs the given value:: - # curl http://localhost:61208/api/3/processlist/pid/4749 - {"4749": [{"cmdline": ["/snap/firefox/1443/usr/lib/firefox/firefox", - "https://github.com/aanarchyy/bully"], + # curl http://localhost:61208/api/3/processlist/pid/4236 + {"4236": [{"cmdline": ["/snap/firefox/1443/usr/lib/firefox/firefox"], "cpu_percent": 0.0, - "cpu_times": [1259.26, 438.49, 965.9, 189.51, 0.0], + "cpu_times": [2687.47, 1037.45, 2125.3, 344.64, 0.0], "gids": [1000, 1000, 1000], - "io_counters": [760196096, 2069577728, 0, 0, 0], + "io_counters": [982852608, 2811539456, 0, 0, 0], "key": "pid", - "memory_info": [493039616, - 13052383232, - 162074624, + "memory_info": [521953280, + 13237006336, + 174477312, 741376, 0, - 1083805696, + 1154760704, 0], - "memory_percent": 6.290402316930798, + "memory_percent": 6.659287780732119, "name": "firefox", - "nice": 1, - "num_threads": 148, - "pid": 4749, + "nice": 0, + "num_threads": 164, + "pid": 4236, "status": "S", "time_since_update": 1, "username": "nicolargo"}]} @@ -899,62 +897,62 @@ Get plugin stats:: # curl http://localhost:61208/api/3/quicklook {"cpu": 27.2, "cpu_hz": 3000000000.0, - "cpu_hz_current": 1317896250.0, + "cpu_hz_current": 1605066500.0, "cpu_name": "Intel(R) Core(TM) i7-4500U CPU @ 1.80GHz", - "mem": 60.3, + "mem": 60.7, "percpu": [{"cpu_number": 0, "guest": 0.0, "guest_nice": 0.0, - "idle": 92.7, + "idle": 90.0, "iowait": 0.0, "irq": 0.0, "key": "cpu_number", "nice": 0.0, - "softirq": 0.9, + "softirq": 1.0, "steal": 0.0, - "system": 3.6, - "total": 7.3, - "user": 2.7}, + "system": 0.0, + "total": 10.0, + "user": 4.0}, {"cpu_number": 1, "guest": 0.0, "guest_nice": 0.0, - "idle": 96.2, + "idle": 90.0, "iowait": 0.0, "irq": 0.0, "key": "cpu_number", "nice": 0.0, - "softirq": 0.0, + "softirq": 1.0, "steal": 0.0, - "system": 1.0, - "total": 3.8, - "user": 2.9}, + "system": 3.0, + "total": 10.0, + "user": 3.0}, {"cpu_number": 2, "guest": 0.0, "guest_nice": 0.0, - "idle": 56.9, - "iowait": 0.9, + "idle": 31.0, + "iowait": 0.0, "irq": 0.0, "key": "cpu_number", - "nice": 0.9, + "nice": 0.0, "softirq": 0.0, "steal": 0.0, - "system": 0.9, - "total": 43.1, - "user": 40.4}, + "system": 1.0, + "total": 69.0, + "user": 63.0}, {"cpu_number": 3, "guest": 0.0, "guest_nice": 0.0, - "idle": 42.6, + "idle": 65.0, "iowait": 0.0, "irq": 0.0, "key": "cpu_number", "nice": 0.0, - "softirq": 0.9, + "softirq": 0.0, "steal": 0.0, - "system": 4.6, - "total": 57.4, - "user": 51.9}], - "swap": 4.7} + "system": 3.0, + "total": 35.0, + "user": 26.0}], + "swap": 6.0} Get a specific field:: @@ -1030,7 +1028,7 @@ GET uptime Get plugin stats:: # curl http://localhost:61208/api/3/uptime - {"seconds": 335517} + {"seconds": 692162} GET all stats ------------- @@ -1046,33 +1044,33 @@ GET stats history History of a plugin:: # curl http://localhost:61208/api/3/cpu/history - {"system": [["2022-07-10T18:42:08.164803", 2.7], - ["2022-07-10T18:42:09.193928", 2.7], - ["2022-07-10T18:42:10.268003", 0.8]], - "user": [["2022-07-10T18:42:08.164797", 23.8], - ["2022-07-10T18:42:09.193924", 23.8], - ["2022-07-10T18:42:10.267999", 1.8]]} + {"system": [["2022-07-24T10:33:52.103080", 3.0], + ["2022-07-24T10:33:53.131720", 3.0], + ["2022-07-24T10:33:54.206957", 0.6]], + "user": [["2022-07-24T10:33:52.103074", 23.7], + ["2022-07-24T10:33:53.131716", 23.7], + ["2022-07-24T10:33:54.206953", 1.8]]} Limit history to last 2 values:: # curl http://localhost:61208/api/3/cpu/history/2 - {"system": [["2022-07-10T18:42:09.193928", 2.7], - ["2022-07-10T18:42:10.268003", 0.8]], - "user": [["2022-07-10T18:42:09.193924", 23.8], - ["2022-07-10T18:42:10.267999", 1.8]]} + {"system": [["2022-07-24T10:33:53.131720", 3.0], + ["2022-07-24T10:33:54.206957" |