diff --git a/NEWS.rst b/NEWS.rst index bfefb59466b2c989e917bbb2bf5fdda02d0bf769..5deace8449f67f726661088aef1b830b51d9d2e6 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -6,9 +6,19 @@ Version 3.2.3 =============== -Under development, see roadmap here: +Bugs corrected: + + * Docker container monitoring only show half command? #1912 + * Processor name getting cut off #1917 + * batinfo not in docker image (and in requirements files...) ? #1915 + * Glances don't send hostname (tag) to influxdb2 #1913 + * Public IP address doesn't display anymore #1910 + * Debian Docker images broken with version 3.2.2 #1905 + +Enhancement requests: - https://github.com/nicolargo/glances/milestone/52 + * Make the process sort list configurable through the command line #1903 + * [WebUI] truncates network name #1699 =============== Version 3.2.2 diff --git a/docker-compose/glances.conf b/docker-compose/glances.conf index ad414fd4410031defecae5d46d7cb68ca406394e..c04f8e960411f41170a0bd36f901868ec20ff796 100644 --- a/docker-compose/glances.conf +++ b/docker-compose/glances.conf @@ -171,6 +171,9 @@ tx_critical=90 #wlan0_tx_critical=1000000 #wlan0_tx_log=True +[ip] +disable=False + [connections] # Display additional information about TCP connections # This plugin is disabled by default diff --git a/docs/_static/glances-flame.svg b/docs/_static/glances-flame.svg index 6c0c91da15550e4222e1a59a0ab673bea19b316b..e4d8d2c54f03ed16f0af688f762f25789b034c9f 100644 --- a/docs/_static/glances-flame.svg +++ b/docs/_static/glances-flame.svg @@ -1,4 +1,4 @@ - \ No newline at end of file diff --git a/docs/api.rst b/docs/api.rst index d22550f6e3591642efc03a8c1a8e9a19908de6e9..44f1877739e7cc85f83ee15fceed9ccc4fcee73b 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -49,25 +49,6 @@ Get the plugins list:: 'uptime', 'wifi'] -GET alert ---------- - -Get plugin stats:: - - # curl http://localhost:61208/api/3/alert - [[1627806074.0, - -1, - 'WARNING', - 'MEM', - 76.76445186625092, - 76.76445186625092, - 76.76445186625092, - 76.76445186625092, - 1, - [], - '', - 'memory_percent']] - GET amps -------- @@ -82,7 +63,7 @@ Get plugin stats:: 'refresh': 3.0, 'regex': True, 'result': None, - 'timer': 0.3367033004760742}, + 'timer': 0.19156432151794434}, {'count': 0, 'countmax': 20.0, 'countmin': None, @@ -91,7 +72,7 @@ Get plugin stats:: 'refresh': 3.0, 'regex': True, 'result': None, - 'timer': 0.3365163803100586}] + 'timer': 0.19138813018798828}] Get a specific field:: @@ -109,7 +90,7 @@ Get a specific item when field matchs the given value:: 'refresh': 3.0, 'regex': True, 'result': None, - 'timer': 0.3367033004760742}]} + 'timer': 0.19156432151794434}]} GET core -------- @@ -139,19 +120,19 @@ Get plugin stats:: 'ctx_switches': 0, 'guest': 0.0, 'guest_nice': 0.0, - 'idle': 73.0, + 'idle': 65.9, 'interrupts': 0, - 'iowait': 0.1, + 'iowait': 0.6, 'irq': 0.0, 'nice': 0.0, 'soft_interrupts': 0, - 'softirq': 4.3, + 'softirq': 3.3, 'steal': 0.0, 'syscalls': 0, - 'system': 3.4, + 'system': 3.5, 'time_since_update': 1, - 'total': 29.9, - 'user': 19.1} + 'total': 34.2, + 'user': 26.8} Fields descriptions: @@ -172,7 +153,7 @@ Fields descriptions: Get a specific field:: # curl http://localhost:61208/api/3/cpu/total - {'total': 29.9} + {'total': 34.2} GET diskio ---------- @@ -211,6 +192,39 @@ Get a specific item when field matchs the given value:: 'write_bytes': 0, 'write_count': 0}]} +GET docker +---------- + +Get plugin stats:: + + # curl http://localhost:61208/api/3/docker + [{'Command': ['/run.sh'], + 'Id': '5f8abfeafe0a176954ca2a2062afcd07eb74988ddfbf6323fccd8e5f882b4e4b', + 'Image': ['grafana/grafana:latest'], + 'Names': ['grafana'], + 'Status': 'running', + 'cpu_percent': 0.0, + 'io_r': None, + 'io_w': None, + 'key': 'name', + 'memory_usage': None, + 'name': 'grafana', + 'network_rx': None, + 'network_tx': None}, + {'Command': ['/entrypoint.sh', 'telegraf'], + 'Id': '84db65dbbbfead7851695dbff97f7751b5b3b93f7a50c24d66d4caab45b5f159', + 'Image': ['telegraf:latest'], + 'Names': ['telegraf'], + 'Status': 'running', + 'cpu_percent': 0.0, + 'io_r': None, + 'io_w': None, + 'key': 'name', + 'memory_usage': None, + 'name': 'telegraf', + 'network_rx': None, + 'network_tx': None}] + GET fs ------ @@ -218,13 +232,13 @@ Get plugin stats:: # curl http://localhost:61208/api/3/fs [{'device_name': '/dev/mapper/ubuntu--gnome--vg-root', - 'free': 36321226752, + 'free': 36151685120, 'fs_type': 'ext4', 'key': 'mnt_point', 'mnt_point': '/', - 'percent': 84.3, + 'percent': 84.4, 'size': 243396149248, - 'used': 194687467520}] + 'used': 194857009152}] Get a specific field:: @@ -235,13 +249,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': 36321226752, + 'free': 36151685120, 'fs_type': 'ext4', 'key': 'mnt_point', 'mnt_point': '/', - 'percent': 84.3, + 'percent': 84.4, 'size': 243396149248, - 'used': 194687467520}]} + 'used': 194857009152}]} GET ip ------ @@ -266,7 +280,7 @@ GET load Get plugin stats:: # curl http://localhost:61208/api/3/load - {'cpucore': 4, 'min1': 1.29, 'min15': 1.11, 'min5': 1.24} + {'cpucore': 4, 'min1': 1.56, 'min15': 0.79, 'min5': 1.33} Fields descriptions: @@ -278,7 +292,7 @@ Fields descriptions: Get a specific field:: # curl http://localhost:61208/api/3/load/min1 - {'min1': 1.29} + {'min1': 1.56} GET mem ------- @@ -286,16 +300,16 @@ GET mem Get plugin stats:: # curl http://localhost:61208/api/3/mem - {'active': 5129474048, - 'available': 1823772672, - 'buffers': 270041088, - 'cached': 2501357568, - 'free': 1823772672, - 'inactive': 1639522304, - 'percent': 76.8, - 'shared': 843190272, - 'total': 7849062400, - 'used': 6025289728} + {'active': 4615663616, + 'available': 2695766016, + 'buffers': 443973632, + 'cached': 2841604096, + 'free': 2695766016, + 'inactive': 2135314432, + 'percent': 65.7, + 'shared': 709017600, + 'total': 7849021440, + 'used': 5153255424} Fields descriptions: @@ -314,7 +328,7 @@ Fields descriptions: Get a specific field:: # curl http://localhost:61208/api/3/mem/total - {'total': 7849062400} + {'total': 7849021440} GET memswap ----------- @@ -322,13 +336,13 @@ GET memswap Get plugin stats:: # curl http://localhost:61208/api/3/memswap - {'free': 6210048000, - 'percent': 23.2, - 'sin': 8932937728, - 'sout': 13442965504, + {'free': 7994896384, + 'percent': 1.1, + 'sin': 3284992, + 'sout': 88502272, 'time_since_update': 1, 'total': 8082419712, - 'used': 1872371712} + 'used': 87523328} Fields descriptions: @@ -352,6 +366,18 @@ Get plugin stats:: # curl http://localhost:61208/api/3/network [{'alias': None, + 'cumulative_cx': 10370393, + 'cumulative_rx': 1511916, + 'cumulative_tx': 8858477, + 'cx': 0, + 'interface_name': 'veth20bf375', + 'is_up': True, + 'key': 'interface_name', + 'rx': 0, + 'speed': 10485760000, + 'time_since_update': 1, + 'tx': 0}, + {'alias': None, 'cumulative_cx': 0, 'cumulative_rx': 0, 'cumulative_tx': 0, @@ -362,19 +388,7 @@ Get plugin stats:: 'rx': 0, 'speed': 0, 'time_since_update': 1, - 'tx': 0}, - {'alias': None, - 'cumulative_cx': 3817917382, - 'cumulative_rx': 1908958691, - 'cumulative_tx': 1908958691, - 'cx': 200, - 'interface_name': 'lo', - 'is_up': True, - 'key': 'interface_name', - 'rx': 100, - 'speed': 0, - 'time_since_update': 1, - 'tx': 100}] + 'tx': 0}] Fields descriptions: @@ -391,31 +405,34 @@ Fields descriptions: Get a specific field:: # curl http://localhost:61208/api/3/network/interface_name - {'interface_name': ['mpqemubr0-dummy', - 'lo', + {'interface_name': ['veth20bf375', + 'mpqemubr0-dummy', 'mpqemubr0', - 'tap-838a195875f', + 'veth35385e9', + 'br-119e6ee04e05', + 'lo', 'docker0', + 'br-87386b77b676', + 'tap-838a195875f', 'wlp2s0', - 'br-119e6ee04e05', - 'vboxnet0', - 'br-87386b77b676']} + 'veth8f84d90', + 'veth041bfdd']} Get a specific item when field matchs the given value:: - # curl http://localhost:61208/api/3/network/interface_name/mpqemubr0-dummy - {'mpqemubr0-dummy': [{'alias': None, - 'cumulative_cx': 0, - 'cumulative_rx': 0, - 'cumulative_tx': 0, - 'cx': 0, - 'interface_name': 'mpqemubr0-dummy', - 'is_up': False, - 'key': 'interface_name', - 'rx': 0, - 'speed': 0, - 'time_since_update': 1, - 'tx': 0}]} + # curl http://localhost:61208/api/3/network/interface_name/veth20bf375 + {'veth20bf375': [{'alias': None, + 'cumulative_cx': 10370393, + 'cumulative_rx': 1511916, + 'cumulative_tx': 8858477, + 'cx': 0, + 'interface_name': 'veth20bf375', + 'is_up': True, + 'key': 'interface_name', + 'rx': 0, + 'speed': 10485760000, + 'time_since_update': 1, + 'tx': 0}]} GET now ------- @@ -423,7 +440,7 @@ GET now Get plugin stats:: # curl http://localhost:61208/api/3/now - '2021-08-01 10:21:14 CEST' + '2021-08-14 16:57:33 CEST' GET percpu ---------- @@ -434,29 +451,29 @@ Get plugin stats:: [{'cpu_number': 0, 'guest': 0.0, 'guest_nice': 0.0, - 'idle': 82.8, - 'iowait': 0.0, + 'idle': 37.3, + 'iowait': 0.7, 'irq': 0.0, 'key': 'cpu_number', 'nice': 0.0, - 'softirq': 9.0, + 'softirq': 0.0, 'steal': 0.0, - 'system': 3.7, - 'total': 17.2, - 'user': 4.5}, + 'system': 2.6, + 'total': 62.7, + 'user': 59.5}, {'cpu_number': 1, 'guest': 0.0, 'guest_nice': 0.0, - 'idle': 84.6, - 'iowait': 0.0, + 'idle': 54.6, + 'iowait': 2.0, 'irq': 0.0, 'key': 'cpu_number', 'nice': 0.0, - 'softirq': 10.3, + 'softirq': 0.0, 'steal': 0.0, - 'system': 2.9, - 'total': 15.4, - 'user': 2.2}] + 'system': 2.6, + 'total': 45.4, + 'user': 40.8}] Get a specific field:: @@ -475,7 +492,7 @@ Get plugin stats:: 'port': 0, 'refresh': 30, 'rtt_warning': None, - 'status': 0.01193, + 'status': 0.011298, 'timeout': 3}] Get a specific field:: @@ -492,7 +509,7 @@ Get a specific item when field matchs the given value:: 'port': 0, 'refresh': 30, 'rtt_warning': None, - 'status': 0.01193, + 'status': 0.011298, 'timeout': 3}]} GET processcount @@ -501,12 +518,12 @@ GET processcount Get plugin stats:: # curl http://localhost:61208/api/3/processcount - {'pid_max': 0, 'running': 1, 'sleeping': 287, 'thread': 1444, 'total': 352} + {'pid_max': 0, 'running': 1, 'sleeping': 274, 'thread': 1407, 'total': 337} Get a specific field:: # curl http://localhost:61208/api/3/processcount/total - {'total': 352} + {'total': 337} GET processlist --------------- @@ -514,36 +531,50 @@ GET processlist Get plugin stats:: # curl http://localhost:61208/api/3/processlist - [{'cmdline': ['/home/nicolargo/dev/glances/venv/bin/python3.8', - '/home/nicolargo/.vscode/extensions/ms-python.python-2021.5.926500501/pythonFiles/run-jedi-language-server.py'], + [{'cmdline': ['/usr/lib/firefox/firefox', '-new-window'], 'cpu_percent': 0.0, - 'cpu_times': pcputimes(user=7134.33, system=375.42, children_user=0.0, children_system=0.0, iowait=16.66), + 'cpu_times': pcputimes(user=1895.06, system=548.01, children_user=1331.84, children_system=203.91, iowait=1.48), 'gids': pgids(real=1000, effective=1000, saved=1000), - 'io_counters': [766472192, 117370880, 0, 0, 0], + 'io_counters': [555024384, 1994608640, 0, 0, 0], 'key': 'pid', - 'memory_info': pmem(rss=703184896, vms=946077696, shared=4890624, text=2846720, lib=0, data=725467136, dirty=0), - 'memory_percent': 8.958839415010894, - 'name': 'python3.8', + 'memory_info': pmem(rss=559951872, vms=4650143744, shared=200867840, text=622592, lib=0, data=973697024, dirty=0), + 'memory_percent': 7.134034175857723, + 'name': 'firefox', 'nice': 0, - 'num_threads': 4, - 'pid': 2702806, - 'ppid': 2702621, + 'num_threads': 120, + 'pid': 4142, + 'ppid': 3391, 'status': 'S', 'time_since_update': 1, 'username': 'nicolargo'}, - {'cmdline': ['/usr/lib/firefox/firefox', '-new-window'], + {'cmdline': ['/usr/lib/firefox/firefox', + '-contentproc', + '-childID', + '2', + '-isForBrowser', + '-prefsLen', + '96', + '-prefMapSize', + '250397', + '-parentBuildID', + '20210527174632', + '-appdir', + '/usr/lib/firefox/browser', + '4142', + 'true', + 'tab'], 'cpu_percent': 0.0, - 'cpu_times': pcputimes(user=5259.34, system=1794.0, children_user=5340.38, children_system=916.29, iowait=3.07), + 'cpu_times': pcputimes(user=317.95, system=66.8, children_user=0.0, children_system=0.0, iowait=0.09), 'gids': pgids(real=1000, effective=1000, saved=1000), - 'io_counters': [2367696896, 6016606208, 0, 0, 0], + 'io_counters': [16916480, 0, 0, 0, 0], 'key': 'pid', - 'memory_info': pmem(rss=485928960, vms=4738162688, shared=144166912, text=622592, lib=0, data=1136144384, dirty=0), - 'memory_percent': 6.190917274399551, - 'name': 'firefox', + 'memory_info': pmem(rss=454049792, vms=3319758848, shared=145993728, text=622592, lib=0, data=582402048, dirty=0), + 'memory_percent': 5.784794900496538, + 'name': 'Web Content', 'nice': 0, - 'num_threads': 125, - 'pid': 2993020, - 'ppid': 8496, + 'num_threads': 30, + 'pid': 4258, + 'ppid': 4142, 'status': 'S', 'time_since_update': 1, 'username': 'nicolargo'}] @@ -551,200 +582,194 @@ Get plugin stats:: Get a specific field:: # curl http://localhost:61208/api/3/processlist/pid - {'pid': [2702806, - 2993020, - 2702582, - 2993144, - 2993283, - 9122, - 2993375, - 3146884, - 42230, - 3186280, - 3176234, - 2702621, - 3186586, - 3075417, - 3131841, - 2702553, - 2702525, - 744165, - 3187433, - 2993158, - 2702653, - 3244, - 4497, - 2702636, - 3168367, - 2791638, - 2702815, - 3187653, - 2741015, - 8639, - 8654, - 3169962, - 2791637, - 2702565, - 2791665, - 8540, - 3167609, - 3419, - 2625397, - 3178606, - 2702789, - 9696, - 2598927, - 2994159, - 3154355, - 28036, - 8538, - 1, - 2739211, - 9412, - 1101, - 2791760, - 9880, - 9791, - 3166295, - 9918, - 2702662, - 3166294, - 9915, - 9520, - 10076, - 1140, - 9421, - 9539, - 9975, - 8496, - 2625601, - 42244, - 7479, - 218114, - 1264, - 3141573, - 3201, - 3138286, - 3153688, - 1675998, - 3131599, - 2614935, - 8553, - 9911, - 9608, - 3074778, - 2702529, - 3074791, - 9427, - 3074785, - 9962, - 2702528, - 9936, - 2625324, - 1099, - 8546, - 8594, - 2625388, - 3103956, - 9910, - 1636, - 9073, - 9432, - 2625339, - 3131609, - 9820, - 3131612, - 2078532, - 10009, - 1316, - 9957, - 1137, - 1141, - 223473, - 2625334, - 9934, - 9762, - 3075380, - 9596, - 2625605, - 1085, - 9903, - 8633, - 10001, - 44159, - 2622728, - 9929, - 10045, + {'pid': [4142, + 4258, + 4378, + 9692, + 4690, + 3638, + 18293, + 9388, + 11502, + 31464, + 9426, + 38222, + 27823, + 9330, + 9441, + 4280, 9453, - 43602, - 223504, - 9925, - 8575, - 1093, - 8623, - 10017, - 9953, - 1115, - 9877, - 2625489, - 8822, - 8650, - 169607, - 9420, - 2548721, - 2525291, - 1905447, - 8672, - 8614, - 627089, - 713820, - 9010, - 9941, - 8995, - 298444, - 1122, - 1110, - 9016, - 3187641, - 43938, - 9969, - 8664, - 1096, + 9359, + 18645, + 7272, + 30528, + 53256, + 2217, + 9474, + 9542, + 9378, + 2297, + 3485, + 2468, + 3460, + 9334, + 9333, + 11646, + 5343, + 3159, + 1162, + 3211, + 3905, + 54247, + 11685, + 3735, + 9233, + 9711, + 9231, + 1319, + 3402, + 1316, + 4726, + 3704, + 3673, + 3799, + 3795, + 3789, + 3845, + 3764, + 3768, + 351, + 2439, + 3793, + 3697, + 1140, + 3676, + 3829, + 1150, + 3400, + 2251, + 1308, + 3791, + 3623, + 2236, + 1022, + 1, + 1175, + 3948, + 51755, + 23730, + 3510, + 2449, + 1154, + 1350, + 3214, + 3802, + 3819, + 3668, + 3391, + 23729, + 3371, + 1551, + 1306, + 1174, + 3824, + 3439, + 3721, + 30672, + 1176, + 1359, + 30686, + 53315, + 36769, + 3447, + 7777, + 1172, + 3862, + 3792, + 11661, + 3790, + 3092, + 3414, + 3843, + 3949, + 1118, + 3470, + 2446, + 3689, + 3679, + 383, + 3426, + 3672, + 3826, + 3821, + 11621, + 11480, + 3476, + 1145, + 1138, + 3788, + 38268, + 3456, + 3718, + 1169, + 3601, + 1023, + 53321, + 3812, + 3483, + 3807, + 3853, + 3432, + 53324, + 2447, + 1159, + 36746, + 7281, + 3405, + 3452, + 1157, + 1132, + 3693, + 1146, + 1131, + 1021, + 3616, + 1177, + 3606, + 3395, + 9536, + 9294, + 1430, + 2059, + 1135, + 54233, + 11452, + 11440, + 1209, + 53327, + 3063, + 11427, + 11465, + 11595, + 3077, + 4551, + 1119, + 54246, + 36394, + 2097, + 2271, + 3580, + 2275, + 2269, + 1215, + 3115, + 997, + 373, 1134, - 8586, - 2879345, - 2625337, - 1168, - 1001, - 3131615, - 2879435, - 4504, - 3170267, - 1097, - 1125, - 9066, - 2625021, - 2625338, - 3217, - 1462, - 8953, - 2620923, - 1086, - 9512, - 3187652, - 3953, - 3168425, - 3229, - 3225, - 1310, - 978, - 1171, - 370, - 13314, - 8498, 2, 3, 4, + 6, 9, 10, 11, @@ -755,14 +780,17 @@ Get a specific field:: 16, 17, 18, + 20, 21, 22, 23, 24, + 26, 27, 28, 29, 30, + 32, 33, 34, 35, @@ -782,14 +810,14 @@ Get a specific field:: 97, 98, 99, - 102, 103, - 105, + 104, + 106, 107, 108, - 112, - 121, - 139, + 113, + 122, + 138, 181, 191, 192, @@ -799,137 +827,124 @@ Get a specific field:: 196, 197, 198, - 200, - 201, + 204, + 205, 206, - 207, - 238, - 288, - 289, - 309, - 360, - 364, - 390, - 439, - 450, - 451, - 452, - 453, - 513, - 514, - 531, - 842, - 843, - 844, - 845, - 846, - 847, - 848, - 849, - 850, - 851, - 852, - 853, - 1323, - 1527, - 1529, - 1531, - 1533, - 1534, - 1537, - 1538, - 1540, - 8648, - 11754, - 14346, - 45609, - 45610, - 45621, - 45622, - 45623, - 45624, - 45625, - 45626, - 217392, - 574771, - 1893153, - 2058173, - 2318240, - 2624916, - 2624918, - 2702007, - 2717801, - 2780261, - 2816759, - 2816957, - 2817447, - 2817525, - 2817644, - 2848355, - 2848483, - 2848744, - 2891750, - 2892014, - 2926441, - 2938027, - 2939167, - 2981539, - 3043867, - 3076088, - 3076171, - 3076588, - 3143304, - 3154246, - 3166323, - 3167277, - 3167547, - 3168934, - 3169582, - 3175884, - 3178406, - 3178495, - 3178517, - 3178523, - 3184214, - 3184248, - 3184379, - 3186307, - 3186426, - 3186731, - 3186815, - 3187282, - 3187290, - 3187355, - 3187356, - 3187357, - 3187475]} + 209, + 210, + 240, + 282, + 283, + 291, + 292, + 294, + 363, + 368, + 392, + 401, + 404, + 405, + 406, + 407, + 430, + 434, + 441, + 442, + 493, + 499, + 535, + 651, + 779, + 780, + 781, + 782, + 783, + 784, + 785, + 786, + 787, + 788, + 789, + 790, + 900, + 906, + 908, + 909, + 910, + 911, + 912, + 913, + 915, + 916, + 930, + 936, + 939, + 941, + 945, + 947, + 951, + 954, + 957, + 1360, + 1495, + 1496, + 1497, + 1498, + 1499, + 1500, + 1502, + 1504, + 2329, + 2357, + 3463, + 45464, + 49536, + 51408, + 51413, + 51424, + 51624, + 51645, + 51651, + 51699, + 51700, + 51705, + 52508, + 52509, + 52671, + 52784, + 53358, + 53530, + 53531, + 53532, + 53671, + 53718, + 53730]} Get a specific item when field matchs the given value:: - # curl http://localhost:61208/api/3/processlist/pid/2702806 - {'2702806': [{'cmdline': ['/home/nicolargo/dev/glances/venv/bin/python3.8', - '/home/nicolargo/.vscode/extensions/ms-python.python-2021.5.926500501/pythonFiles/run-jedi-language-server.py'], - 'cpu_percent': 0.0, - 'cpu_times': [7134.33, 375.42, 0.0, 0.0, 16.66], - 'gids': [1000, 1000, 1000], - 'io_counters': [766472192, 117370880, 0, 0, 0], - 'key': 'pid', - 'memory_info': [703184896, - 946077696, - 4890624, - 2846720, - 0, - 725467136, - 0], - 'memory_percent': 8.958839415010894, - 'name': 'python3.8', - 'nice': 0, - 'num_threads': 4, - 'pid': 2702806, - 'ppid': 2702621, - 'status': 'S', - 'time_since_update': 1, - 'username': 'nicolargo'}]} + # curl http://localhost:61208/api/3/processlist/pid/4142 + {'4142': [{'cmdline': ['/usr/lib/firefox/firefox', '-new-window'], + 'cpu_percent': 0.0, + 'cpu_times': [1895.06, 548.01, 1331.84, 203.91, 1.48], + 'gids': [1000, 1000, 1000], + 'io_counters': [555024384, 1994608640, 0, 0, 0], + 'key': 'pid', + 'memory_info': [559951872, + 4650143744, + 200867840, + 622592, + 0, + 973697024, + 0], + 'memory_percent': 7.134034175857723, + 'name': 'firefox', + 'nice': 0, + 'num_threads': 120, + 'pid': 4142, + 'ppid': 3391, + 'status': 'S', + 'time_since_update': 1, + 'username': 'nicolargo'}]} GET psutilversion ----------------- @@ -945,69 +960,69 @@ GET quicklook Get plugin stats:: # curl http://localhost:61208/api/3/quicklook - {'cpu': 29.9, + {'cpu': 34.2, 'cpu_hz': 2025000000.0, - 'cpu_hz_current': 1535935749.9999998, - 'cpu_name': 'Intel(R) Core(TM) i7-4500U CPU @ 1.80GH', - 'mem': 76.8, + 'cpu_hz_current': 1676300749.9999998, + 'cpu_name': 'Intel(R) Core(TM) i7-4500U CPU @ 1.80GHz', + 'mem': 65.7, 'percpu': [{'cpu_number': 0, 'guest': 0.0, 'guest_nice': 0.0, - 'idle': 82.8, - 'iowait': 0.0, + 'idle': 37.3, + 'iowait': 0.7, 'irq': 0.0, 'key': 'cpu_number', 'nice': 0.0, - 'softirq': 9.0, + 'softirq': 0.0, 'steal': 0.0, - 'system': 3.7, - 'total': 17.2, - 'user': 4.5}, + 'system': 2.6, + 'total': 62.7, + 'user': 59.5}, {'cpu_number': 1, 'guest': 0.0, 'guest_nice': 0.0, - 'idle': 84.6, - 'iowait': 0.0, + 'idle': 54.6, + 'iowait': 2.0, 'irq': 0.0, 'key': 'cpu_number', 'nice': 0.0, - 'softirq': 10.3, + 'softirq': 0.0, 'steal': 0.0, - 'system': 2.9, - 'total': 15.4, - 'user': 2.2}, + 'system': 2.6, + 'total': 45.4, + 'user': 40.8}, {'cpu_number': 2, 'guest': 0.0, 'guest_nice': 0.0, - 'idle': 91.7, - 'iowait': 0.0, + 'idle': 81.9, + 'iowait': 0.6, 'irq': 0.0, 'key': 'cpu_number', 'nice': 0.0, - 'softirq': 0.0, + 'softirq': 9.0, 'steal': 0.0, - 'system': 0.8, - 'total': 8.3, - 'user': 7.4}, + 'system': 0.6, + 'total': 18.1, + 'user': 7.8}, {'cpu_number': 3, 'guest': 0.0, 'guest_nice': 0.0, - 'idle': 18.7, + 'idle': 84.5, 'iowait': 0.0, 'irq': 0.0, 'key': 'cpu_number', 'nice': 0.0, - 'softirq': 0.0, + 'softirq': 5.0, 'steal': 0.0, - 'system': 4.1, - 'total': 81.3, - 'user': 77.2}], - 'swap': 23.2} + 'system': 5.0, + 'total': 15.5, + 'user': 5.6}], + 'swap': 1.1} Get a specific field:: # curl http://localhost:61208/api/3/quicklook/cpu - {'cpu': 29.9} + {'cpu': 34.2} GET sensors ----------- @@ -1064,7 +1079,7 @@ Get plugin stats:: 'hr_name': 'Ubuntu 20.04 64bit', 'linux_distro': 'Ubuntu 20.04', 'os_name': 'Linux', - 'os_version': '5.4.0-66-generic', + 'os_version': '5.4.0-74-generic', 'platform': '64bit'} Get a specific field:: @@ -1078,7 +1093,7 @@ GET uptime Get plugin stats:: # curl http://localhost:61208/api/3/uptime - {'seconds': 9158957} + {'seconds': 604292} GET all stats ------------- @@ -1094,33 +1109,33 @@ GET stats history History of a plugin:: # curl http://localhost:61208/api/3/cpu/history - {'system': [['2021-08-01T10:21:14.473006', 3.4], - ['2021-08-01T10:21:15.540337', 3.4], - ['2021-08-01T10:21:16.687398', 2.6]], - 'user': [['2021-08-01T10:21:14.472986', 19.1], - ['2021-08-01T10:21:15.540331', 19.1], - ['2021-08-01T10:21:16.687391', 3.9]]} + {'system': [['2021-08-14T16:57:33.339311', 3.5], + ['2021-08-14T16:57:34.452028', 3.5], + ['2021-08-14T16:57:35.592317', 3.5]], + 'user': [['2021-08-14T16:57:33.339295', 26.8], + ['2021-08-14T16:57:34.452022', 26.8], + ['2021-08-14T16:57:35.592311', 6.9]]} Limit history to last 2 values:: # curl http://localhost:61208/api/3/cpu/history/2 - {'system': [['2021-08-01T10:21:15.540337', 3.4], - ['2021-08-01T10:21:16.687398', 2.6]], - 'user': [['2021-08-01T10:21:15.540331', 19.1], - ['2021-08-01T10:21:16.687391', 3.9]]} + {'system': [['2021-08-14T16:57:34.452028', 3.5], + ['2021-08-14T16:57:35.592317', 3.5]], + 'user': [['2021-08-14T16:57:34.452022', 26.8], + ['2021-08-14T16:57:35.592311', 6.9]]} History for a specific field:: # curl http://localhost:61208/api/3/cpu/system/history - {'system': [['2021-08-01T10:21:14.473006', 3.4], - ['2021-08-01T10:21:15.540337', 3.4], - ['2021-08-01T10:21:16.687398', 2.6]]} + {'system': [['2021-08-14T16:57:33.339311', 3.5], + ['2021-08-14T16:57:34.452028', 3.5], + ['2021-08-14T16:57:35.592317', 3.5]]} Limit history for a specific field to last 2 values:: # curl http://localhost:61208/api/3/cpu/system/history - {'system': [['2021-08-01T10:21:15.540337', 3.4], - ['2021-08-01T10:21:16.687398', 2.6]]} + {'system': [['2021-08-14T16:57:34.452028', 3.5], + ['2021-08-14T16:57:35.592317', 3.5]]} GET limits (used for thresholds) -------------------------------- diff --git a/docs/man/glances.1 b/docs/man/glances.1 index 8e2711db3cd6a1d7145fb6a5c19504d217637dc2..c782d1a0430ecefb61dab101e802c06ec6fb8ff6 100644 --- a/docs/man/glances.1 +++ b/docs/man/glances.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "GLANCES" "1" "Aug 01, 2021" "3.2.3_beta1" "Glances" +.TH "GLANCES" "1" "Aug 14, 2021" "3.2.3" "Glances" .SH NAME glances \- An eye on your system . diff --git a/glances/__init__.py b/glances/__init__.py index db20bb31e35f93b06f2f4a5aa59662472af826db..0661ed1788b102a06d0e6ca9fd42be29293aa5a8 100644 --- a/glances/__init__.py +++ b/glances/__init__.py @@ -29,7 +29,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.2.3_beta1' +__version__ = '3.2.3' __author__ = 'Nicolas Hennion ' __license__ = 'LGPLv3'