From 2d9bf175d0e17de3e09debf1b59a23ed9615e99b Mon Sep 17 00:00:00 2001 From: nicolargo Date: Thu, 26 May 2022 09:35:42 +0200 Subject: [PATCH 01/10] Another dep issue solved in the Alpine Docker + issue in the outdated method --- glances/outdated.py | 2 +- optional-requirements.txt | 1 + setup.py | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/glances/outdated.py b/glances/outdated.py index b5816b39..f7f36e51 100644 --- a/glances/outdated.py +++ b/glances/outdated.py @@ -61,7 +61,7 @@ class Outdated(object): # Read the configuration file self.load_config(config) if not PACKAGING_IMPORT: - self.args.disable_check_update = False + self.args.disable_check_update = True logger.debug("Check Glances version up-to-date: {}".format(not self.args.disable_check_update)) # And update ! diff --git a/optional-requirements.txt b/optional-requirements.txt index 2e480cdd..944f55c7 100644 --- a/optional-requirements.txt +++ b/optional-requirements.txt @@ -28,6 +28,7 @@ python-dateutil pyzmq requests scandir; python_version < "3.5" +six sparklines statsd wifi diff --git a/setup.py b/setup.py index 05beac93..925b2206 100755 --- a/setup.py +++ b/setup.py @@ -54,7 +54,7 @@ def get_install_extras_require(): 'action': ['chevron'], 'browser': ['zeroconf==0.19.1' if PY2 else 'zeroconf>=0.19.1'], 'cloud': ['requests'], - 'docker': ['docker>=2.0.0', 'python-dateutil'], + 'docker': ['docker>=2.0.0', 'python-dateutil', 'six'], 'export': ['bernhard', 'cassandra-driver', 'couchdb', 'elasticsearch', 'graphitesender', 'influxdb>=1.0.0', 'kafka-python', 'pika', 'paho-mqtt', 'potsdb', 'prometheus_client', 'pyzmq', From d0fde6904c7e1668929862435f9124d97d74ea5b Mon Sep 17 00:00:00 2001 From: nicolargo Date: Thu, 26 May 2022 10:27:21 +0200 Subject: [PATCH 02/10] Version 3.2.6.4 --- README.rst | 2 +- docker-files/alpine.Dockerfile | 12 +- docker-files/debian.Dockerfile | 12 +- docs/api.rst | 594 +++++++++++++++--------------- docs/man/glances.1 | 2 +- glances/__init__.py | 2 +- glances/plugins/glances_docker.py | 4 +- 7 files changed, 331 insertions(+), 297 deletions(-) diff --git a/README.rst b/README.rst index ca552967..4df31fcb 100644 --- a/README.rst +++ b/README.rst @@ -211,7 +211,7 @@ Available versions on the Docker Hub repository: - *nicolargo/glances:latest-full* for a full Debian Glances image version with all dependencies - *nicolargo/glances:alpine-latest-full* for a full Alpine Glances image version with all dependencies -You can also specify a version by replacing latest by 3.2.6.3 (for example). +You can also specify a version by replacing latest by 3.2.6.4 (for example). Run last version of Glances container in *console mode*: diff --git a/docker-files/alpine.Dockerfile b/docker-files/alpine.Dockerfile index 01052fd0..048c7fb4 100644 --- a/docker-files/alpine.Dockerfile +++ b/docker-files/alpine.Dockerfile @@ -54,6 +54,8 @@ RUN CASS_DRIVER_NO_CYTHON=1 pip3 install --no-cache-dir --user -r optional-requi FROM build as dev ARG PYTHON_VERSION +COPY --from=remoteInstall /root/.local/bin /usr/local/bin/ +COPY --from=remoteInstall /root/.local/lib/python${PYTHON_VERSION}/site-packages /usr/lib/python${PYTHON_VERSION}/site-packages/ COPY --from=additional-packages /root/.local/lib/python${PYTHON_VERSION}/site-packages /usr/lib/python${PYTHON_VERSION}/site-packages/ COPY . /glances COPY ./docker-compose/glances.conf /etc/glances.conf @@ -85,8 +87,8 @@ COPY --from=remoteInstall /root/.local/bin /usr/local/bin/ COPY --from=remoteInstall /root/.local/lib/python${PYTHON_VERSION}/site-packages /usr/lib/python${PYTHON_VERSION}/site-packages/ COPY ./docker-compose/glances.conf /etc/glances.conf -# EXPOSE PORT (XMLRPC / WebUI) -EXPOSE 61209 61208 +# EXPOSE PORT (XMLRPC) +EXPOSE 61209 # Define default command. CMD python3 -m glances -C /etc/glances.conf $GLANCES_OPT @@ -100,3 +102,9 @@ ARG PYTHON_VERSION COPY --from=additional-packages /root/.local/lib/python${PYTHON_VERSION}/site-packages /usr/lib/python${PYTHON_VERSION}/site-packages/ COPY ./docker-compose/glances.conf /etc/glances.conf + +# EXPOSE PORT (XMLRPC / WebUI) +EXPOSE 61209 61208 + +# Define default command. +CMD python3 -m glances -C /etc/glances.conf $GLANCES_OPT diff --git a/docker-files/debian.Dockerfile b/docker-files/debian.Dockerfile index ef8f963e..35163854 100644 --- a/docker-files/debian.Dockerfile +++ b/docker-files/debian.Dockerfile @@ -51,6 +51,8 @@ RUN CASS_DRIVER_NO_CYTHON=1 pip3 install --no-cache-dir --user -r optional-requi FROM build as dev ARG PYTHON_VERSION +COPY --from=remoteInstall /root/.local/bin /usr/local/bin/ +COPY --from=remoteInstall /root/.local/lib/python${PYTHON_VERSION}/site-packages /usr/local/lib/python${PYTHON_VERSION}/site-packages/ COPY --from=additional-packages /root/.local/lib/python${PYTHON_VERSION}/site-packages /usr/local/lib/python${PYTHON_VERSION}/site-packages/ COPY . /glances COPY ./docker-compose/glances.conf /etc/glances.conf @@ -84,8 +86,8 @@ COPY --from=remoteInstall /root/.local/bin /usr/local/bin/ COPY --from=remoteInstall /root/.local/lib/python${PYTHON_VERSION}/site-packages /usr/local/lib/python${PYTHON_VERSION}/site-packages/ COPY ./docker-compose/glances.conf /etc/glances.conf -# EXPOSE PORT (XMLRPC / WebUI) -EXPOSE 61209 61208 +# EXPOSE PORT (XMLRPC) +EXPOSE 61209 # Define default command. CMD python3 -m glances -C /etc/glances.conf $GLANCES_OPT @@ -99,3 +101,9 @@ ARG PYTHON_VERSION COPY --from=additional-packages /root/.local/lib/python${PYTHON_VERSION}/site-packages /usr/local/lib/python${PYTHON_VERSION}/site-packages/ COPY ./docker-compose/glances.conf /etc/glances.conf + +# EXPOSE PORT (XMLRPC / WebUI) +EXPOSE 61209 61208 + +# Define default command. +CMD python3 -m glances -C /etc/glances.conf $GLANCES_OPT diff --git a/docs/api.rst b/docs/api.rst index 35aa8a7b..b722590c 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -66,14 +66,14 @@ GET alert Get plugin stats:: # curl http://localhost:61208/api/3/alert - [[1653511582.0, + [[1653553575.0, -1, "WARNING", "MEM", - 81.37629268155027, - 81.37629268155027, - 81.37629268155027, - 81.37629268155027, + 75.52604803296053, + 75.52604803296053, + 75.52604803296053, + 75.52604803296053, 1, [], "", @@ -93,7 +93,7 @@ Get plugin stats:: "refresh": 3.0, "regex": True, "result": None, - "timer": 1.2215237617492676}, + "timer": 0.8741495609283447}, {"count": 0, "countmax": 20.0, "countmin": None, @@ -102,7 +102,7 @@ Get plugin stats:: "refresh": 3.0, "regex": True, "result": None, - "timer": 1.2214140892028809}] + "timer": 0.8740122318267822}] 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": 1.2215237617492676}]} + "timer": 0.8741495609283447}]} GET core -------- @@ -150,19 +150,19 @@ Get plugin stats:: "ctx_switches": 0, "guest": 0.0, "guest_nice": 0.0, - "idle": 68.6, + "idle": 74.7, "interrupts": 0, - "iowait": 0.1, + "iowait": 0.2, "irq": 0.0, "nice": 0.0, "soft_interrupts": 0, - "softirq": 0.0, + "softirq": 0.2, "steal": 0.0, "syscalls": 0, - "system": 4.3, + "system": 4.2, "time_since_update": 1, - "total": 35.6, - "user": 27.0} + "total": 24.9, + "user": 20.7} Fields descriptions: @@ -184,7 +184,7 @@ Fields descriptions: Get a specific field:: # curl http://localhost:61208/api/3/cpu/total - {"total": 35.6} + {"total": 24.9} GET diskio ---------- @@ -239,7 +239,7 @@ Get plugin stats:: "io_r": None, "io_w": None, "key": "name", - "memory_usage": 35647488, + "memory_usage": 32485376, "name": "telegraf", "network_rx": None, "network_tx": None}, @@ -265,13 +265,13 @@ Get plugin stats:: # curl http://localhost:61208/api/3/fs [{"device_name": "/dev/mapper/ubuntu--gnome--vg-root", - "free": 99862933504, + "free": 99599114240, "fs_type": "ext4", "key": "mnt_point", "mnt_point": "/", - "percent": 56.8, + "percent": 56.9, "size": 243396149248, - "used": 131145760768}] + "used": 131409580032}] Get a specific field:: @@ -282,13 +282,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": 99862933504, + "free": 99599114240, "fs_type": "ext4", "key": "mnt_point", "mnt_point": "/", - "percent": 56.8, + "percent": 56.9, "size": 243396149248, - "used": 131145760768}]} + "used": 131409580032}]} GET ip ------ @@ -313,7 +313,10 @@ GET load Get plugin stats:: # curl http://localhost:61208/api/3/load - {"cpucore": 4, "min1": 1.7607421875, "min15": 0.787109375, "min5": 1.0986328125} + {"cpucore": 4, + "min1": 1.400390625, + "min15": 0.6708984375, + "min5": 0.88232421875} Fields descriptions: @@ -325,7 +328,7 @@ Fields descriptions: Get a specific field:: # curl http://localhost:61208/api/3/load/min1 - {"min1": 1.7607421875} + {"min1": 1.400390625} GET mem ------- @@ -333,16 +336,16 @@ GET mem Get plugin stats:: # curl http://localhost:61208/api/3/mem - {"active": 2994515968, - "available": 1459716096, - "buffers": 120791040, - "cached": 2113867776, - "free": 1459716096, - "inactive": 3645423616, - "percent": 81.4, - "shared": 646406144, + {"active": 2892922880, + "available": 1918255104, + "buffers": 290897920, + "cached": 2221674496, + "free": 1918255104, + "inactive": 3598147584, + "percent": 75.5, + "shared": 577904640, "total": 7837945856, - "used": 6378229760} + "used": 5919690752} Fields descriptions: @@ -369,13 +372,13 @@ GET memswap Get plugin stats:: # curl http://localhost:61208/api/3/memswap - {"free": 6304215040, - "percent": 22.0, - "sin": 1377947648, - "sout": 3402825728, + {"free": 5879463936, + "percent": 27.3, + "sin": 1691422720, + "sout": 4207906816, "time_since_update": 1, "total": 8082419712, - "used": 1778204672} + "used": 2202955776} Fields descriptions: @@ -399,29 +402,29 @@ Get plugin stats:: # curl http://localhost:61208/api/3/network [{"alias": None, - "cumulative_cx": 473925792, - "cumulative_rx": 236962896, - "cumulative_tx": 236962896, - "cx": 4156, + "cumulative_cx": 487998794, + "cumulative_rx": 243999397, + "cumulative_tx": 243999397, + "cx": 2250, "interface_name": "lo", "is_up": True, "key": "interface_name", - "rx": 2078, + "rx": 1125, "speed": 0, "time_since_update": 1, - "tx": 2078}, + "tx": 1125}, {"alias": None, - "cumulative_cx": 5365392428, - "cumulative_rx": 5016373584, - "cumulative_tx": 349018844, - "cx": 34101, + "cumulative_cx": 6223765175, + "cumulative_rx": 5835637800, + "cumulative_tx": 388127375, + "cx": 17693, "interface_name": "wlp2s0", "is_up": True, "key": "interface_name", - "rx": 23539, + "rx": 13430, "speed": 0, "time_since_update": 1, - "tx": 10562}] + "tx": 4263}] Fields descriptions: @@ -453,17 +456,17 @@ 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": 473925792, - "cumulative_rx": 236962896, - "cumulative_tx": 236962896, - "cx": 4156, + "cumulative_cx": 487998794, + "cumulative_rx": 243999397, + "cumulative_tx": 243999397, + "cx": 2250, "interface_name": "lo", "is_up": True, "key": "interface_name", - "rx": 2078, + "rx": 1125, "speed": 0, "time_since_update": 1, - "tx": 2078}]} + "tx": 1125}]} GET now ------- @@ -471,7 +474,7 @@ GET now Get plugin stats:: # curl http://localhost:61208/api/3/now - "2022-05-25 22:46:22 CEST" + "2022-05-26 10:26:15 CEST" GET percpu ---------- @@ -482,29 +485,29 @@ Get plugin stats:: [{"cpu_number": 0, "guest": 0.0, "guest_nice": 0.0, - "idle": 56.9, + "idle": 92.0, "iowait": 0.0, "irq": 0.0, "key": "cpu_number", "nice": 0.0, "softirq": 0.0, "steal": 0.0, - "system": 4.6, - "total": 43.1, - "user": 38.5}, + "system": 0.0, + "total": 8.0, + "user": 6.0}, {"cpu_number": 1, "guest": 0.0, "guest_nice": 0.0, - "idle": 73.8, + "idle": 14.7, "iowait": 0.0, "irq": 0.0, "key": "cpu_number", "nice": 0.0, "softirq": 0.0, "steal": 0.0, - "system": 4.6, - "total": 26.2, - "user": 21.5}] + "system": 7.8, + "total": 85.3, + "user": 77.5}] Get a specific field:: @@ -523,7 +526,7 @@ Get plugin stats:: "port": 0, "refresh": 30, "rtt_warning": None, - "status": 0.011961, + "status": 0.00469, "timeout": 3}] Get a specific field:: @@ -540,7 +543,7 @@ Get a specific item when field matchs the given value:: "port": 0, "refresh": 30, "rtt_warning": None, - "status": 0.011961, + "status": 0.00469, "timeout": 3}]} GET processcount @@ -549,12 +552,12 @@ GET processcount Get plugin stats:: # curl http://localhost:61208/api/3/processcount - {"pid_max": 0, "running": 1, "sleeping": 269, "thread": 1530, "total": 335} + {"pid_max": 0, "running": 1, "sleeping": 269, "thread": 1549, "total": 340} Get a specific field:: # curl http://localhost:61208/api/3/processcount/total - {"total": 335} + {"total": 340} GET processlist --------------- @@ -564,50 +567,60 @@ Get plugin stats:: # curl http://localhost:61208/api/3/processlist [{"cmdline": ["/snap/firefox/1300/usr/lib/firefox/firefox"], "cpu_percent": 0.0, - "cpu_times": pcputimes(user=7265.13, system=2644.4, children_user=4225.08, children_system=934.33, iowait=0.0), + "cpu_times": pcputimes(user=7842.55, system=2860.18, children_user=4894.59, children_system=1104.51, iowait=0.0), "gids": pgids(real=1000, effective=1000, saved=1000), - "io_counters": [2597592064, 8660602880, 0, 0, 0], + "io_counters": [3029197824, 9226412032, 0, 0, 0], "key": "pid", - "memory_info": pmem(rss=521797632, vms=14051770368, shared=142577664, text=643072, lib=0, data=1934319616, dirty=0), - "memory_percent": 6.657326314656288, + "memory_info": pmem(rss=505921536, vms=14043705344, shared=137408512, text=643072, lib=0, data=1933852672, dirty=0), + "memory_percent": 6.454772019287601, "name": "firefox", "nice": 0, - "num_threads": 165, + "num_threads": 164, "pid": 10259, "ppid": 2922, "status": "S", "time_since_update": 1, "username": "nicolargo"}, - {"cmdline": ["/snap/firefox/1300/usr/lib/firefox/firefox", - "-contentproc", - "-childID", - "1", - "-isForBrowser", - "-prefsLen", - "628", - "-prefMapSize", - "267733", - "-jsInitLen", - "277212", - "-parentBuildID", - "20220502141216", - "-appDir", - "/snap/firefox/1300/usr/lib/firefox/browser", - "10259", - "true", - "tab"], + {"cmdline": ["/usr/share/code/code", + "--type=renderer", + "--enable-crashpad", + "--crashpad-handler-pid=271104", + "--enable-crash-reporter=721e05a9-6035-4dcb-bd58-68097aa48dd0,no_channel", + "--user-data-dir=/home/nicolargo/.config/Code", + "--standard-schemes=vscode-webview,vscode-file", + "--secure-schemes=vscode-webview,vscode-file", + "--bypasscsp-schemes", + "--cors-schemes=vscode-webview,vscode-file", + "--fetch-schemes=vscode-webview,vscode-file", + "--service-worker-schemes=vscode-webview", + "--streaming-schemes", + "--app-path=/usr/share/code/resources/app", + "--no-sandbox", + "--no-zygote", + "--enable-blink-features=HighlightAPI", + "--disable-color-correct-rendering", + "--lang=en-US", + "--num-raster-threads=2", + "--enable-main-frame-before-activation", + "--renderer-client-id=4", + "--launch-time-ticks=105869565472", + "--shared-files=v8_context_snapshot_data:100", + "--field-trial-handle=0,5488460745429738826,5483870965940292230,131072", + "--disable-features=PlzServiceWorker,SpareRendererForSitePerProcess", + "--vscode-window-config=vscode:92899e8d-13b6-4223-84f0-02ad1f3622b4", + "--enable-crashpad"], "cpu_percent": 0.0, - "cpu_times": pcputimes(user=1572.98, system=303.12, children_user=0.0, children_system=0.0, iowait=0.0), + "cpu_times": pcputimes(user=945.17, system=67.18, children_user=0.0, children_system=0.0, iowait=0.0), "gids": pgids(real=1000, effective=1000, saved=1000), - "io_counters": [157250560, 0, 0, 0, 0], + "io_counters": [86761472, 2899968, 0, 0, 0], "key": "pid", - "memory_info": pmem(rss=498479104, vms=3363688448, shared=77520896, text=643072, lib=0, data=767954944, dirty=0), - "memory_percent": 6.359818161009762, - "name": "WebExtensions", + "memory_info": pmem(rss=415363072, vms=41188425728, shared=71127040, text=106147840, lib=0, data=650543104, dirty=0), + "memory_percent": 5.299386849961929, + "name": "code", "nice": 0, - "num_threads": 20, - "pid": 10790, - "ppid": 10259, + "num_threads": 16, + "pid": 271153, + "ppid": 271083, "status": "S", "time_since_update": 1, "username": "nicolargo"}] @@ -616,187 +629,188 @@ Get a specific field:: # curl http://localhost:61208/api/3/processlist/pid {"pid": [10259, - 10790, 271153, - 271200, - 10854, - 20979, + 10790, 10850, + 10854, 2922, - 21227, - 271409, + 326164, + 271200, + 20979, 21025, - 240874, - 62372, - 308697, + 271409, + 21227, + 321955, 10857, + 320227, + 321980, 271083, - 271184, 10814, - 308943, - 309130, + 271184, + 330843, + 12436, + 331008, + 331170, + 331005, + 315958, + 331503, + 52875, + 2820, + 337, + 2033, + 3251, 306581, 271118, - 12436, - 309195, - 306584, - 309267, - 271247, - 271208, - 3251, - 309448, - 337, - 2820, - 271397, - 52875, 243846, - 2033, + 306584, + 271208, 234429, - 271140, - 3279, 138954, 11390, - 265539, - 138989, + 3279, + 271397, 138834, - 271089, - 266251, - 2505, + 271140, + 138989, 3019, - 271088, + 3161, 1302, 186877, 2109, - 3161, - 186878, - 10597, 2790, - 304566, + 10597, + 186878, + 271089, + 320718, + 265539, + 271088, 3706, 8716, - 20965, 3347, - 3066, - 1133, + 266251, 2999, - 232395, + 3066, + 320734, + 1133, + 2505, 3056, - 21229, + 20965, 3065, + 21229, 3206, - 8715, + 2990, 1601, 1, - 2990, - 2964, + 8715, 3259, + 2964, 3227, - 3085, - 232398, - 2867, 1150, - 3064, + 3085, + 320739, 2073, - 3381, - 218290, + 3064, 1313, + 218290, + 2867, 2900, - 2081, - 1990, - 20932, 144959, - 1147, - 1176, - 3077, - 2769, + 3381, + 1990, 3062, + 3077, + 2081, + 1176, + 2769, 2781, + 1147, 3058, - 989, - 3178, - 20917, - 20916, 3004, + 3178, 2933, - 271268, - 2831, - 3068, - 8959, - 1271, - 8941, + 989, + 20932, 10906, + 2831, + 20917, + 8941, + 20916, + 8959, 3034, - 241702, - 1173, - 2794, - 12458, - 1310, - 1132, - 2800, - 1115, - 2971, + 1271, 2798, - 1596, - 3268, - 1151, - 2960, - 3084, - 3136, + 3068, + 1310, + 2794, + 2800, + 1173, + 1132, 3260, - 3129, - 3059, - 2923, - 2944, - 3232, - 3079, + 271091, + 2960, + 271268, + 1115, + 1596, + 2971, + 3136, + 3268, 1139, - 1171, - 138811, + 1151, + 12458, + 3129, + 3084, + 3059, + 241702, + 3232, + 2944, 3075, + 2923, + 3079, 1167, 3074, 2977, - 3046, - 138968, 2888, 2949, 3226, + 1171, + 3054, + 2828, + 3046, 1161, 24865, - 138923, - 3054, - 271091, 2079, - 2828, - 990, - 2788, 1127, + 990, + 138811, + 2788, 2868, 234438, - 1156, 2805, - 2789, - 2080, + 138923, 2988, - 381, + 138968, + 2080, + 1156, + 2789, 1123, + 381, + 2508, 1142, 2931, - 2508, 1429, - 1178, - 988, 1130, - 21209, + 1178, + 331493, + 988, 8757, - 266415, - 309432, + 21209, 997, + 266415, 1183, - 271104, 996, - 1996, 3274, + 1996, + 271104, 1126, 3528, 138796, @@ -804,17 +818,16 @@ Get a specific field:: 138788, 138767, 138752, - 306441, 138731, + 331502, 138901, - 309447, 1914, 138774, 138745, - 2782, 138724, 3053, 2012, + 2782, 2020, 1997, 1186, @@ -931,46 +944,51 @@ Get a specific field:: 2822, 20919, 20947, - 282038, - 303032, - 303046, - 304473, - 304481, - 304546, - 305737, - 305836, - 305906, - 305964, - 306989, - 307047, - 307166, - 307650, - 308467, - 308919, - 308920, - 308925, - 309347]} + 317792, + 320493, + 320505, + 325971, + 326155, + 326883, + 328047, + 329324, + 329399, + 329720, + 329836, + 329910, + 330562, + 330564, + 330788, + 330834, + 330917, + 331135, + 331136, + 331426, + 331427, + 331446, + 331447, + 331448]} Get a specific item when field matchs the given value:: # curl http://localhost:61208/api/3/processlist/pid/10259 {"10259": [{"cmdline": ["/snap/firefox/1300/usr/lib/firefox/firefox"], "cpu_percent": 0.0, - "cpu_times": [7265.13, 2644.4, 4225.08, 934.33, 0.0], + "cpu_times": [7842.55, 2860.18, 4894.59, 1104.51, 0.0], "gids": [1000, 1000, 1000], - "io_counters": [2597592064, 8660602880, 0, 0, 0], + "io_counters": [3029197824, 9226412032, 0, 0, 0], "key": "pid", - "memory_info": [521797632, - 14051770368, - 142577664, + "memory_info": [505921536, + 14043705344, + 137408512, 643072, 0, - 1934319616, + 1933852672, 0], - "memory_percent": 6.657326314656288, + "memory_percent": 6.454772019287601, "name": "firefox", "nice": 0, - "num_threads": 165, + "num_threads": 164, "pid": 10259, "ppid": 2922, "status": "S", @@ -983,7 +1001,7 @@ GET psutilversion Get plugin stats:: # curl http://localhost:61208/api/3/psutilversion - (5, 9, 0) + (5, 9, 1) GET quicklook ------------- @@ -991,69 +1009,69 @@ GET quicklook Get plugin stats:: # curl http://localhost:61208/api/3/quicklook - {"cpu": 35.6, + {"cpu": 24.9, "cpu_hz": 3000000000.0, - "cpu_hz_current": 2860000.0, + "cpu_hz_current": 1812234250.0, "cpu_name": "Intel(R) Core(TM) i7-4500U CPU @ 1.80GHz", - "mem": 81.4, + "mem": 75.5, "percpu": [{"cpu_number": 0, "guest": 0.0, "guest_nice": 0.0, - "idle": 56.9, + "idle": 92.0, "iowait": 0.0, "irq": 0.0, "key": "cpu_number", "nice": 0.0, "softirq": 0.0, "steal": 0.0, - "system": 4.6, - "total": 43.1, - "user": 38.5}, + "system": 0.0, + "total": 8.0, + "user": 6.0}, {"cpu_number": 1, "guest": 0.0, "guest_nice": 0.0, - "idle": 73.8, + "idle": 14.7, "iowait": 0.0, "irq": 0.0, "key": "cpu_number", "nice": 0.0, "softirq": 0.0, "steal": 0.0, - "system": 4.6, - "total": 26.2, - "user": 21.5}, + "system": 7.8, + "total": 85.3, + "user": 77.5}, {"cpu_number": 2, "guest": 0.0, "guest_nice": 0.0, - "idle": 56.1, - "iowait": 0.8, - "irq": 0.0, - "key": "cpu_number", - "nice": 0.0, - "softirq": 0.0, - "steal": 0.0, - "system": 4.5, - "total": 43.9, - "user": 38.6}, - {"cpu_number": 3, - "guest": 0.0, - "guest_nice": 0.0, - "idle": 69.9, + "idle": 96.0, "iowait": 0.0, "irq": 0.0, "key": "cpu_number", "nice": 0.0, "softirq": 0.0, "steal": 0.0, - "system": 3.0, - "total": 30.1, - "user": 27.1}], - "swap": 22.0} + "system": 2.0, + "total": 4.0, + "user": 1.0}, + {"cpu_number": 3, + "guest": 0.0, + "guest_nice": 0.0, + "idle": 96.0, + "iowait": 0.0, + "irq": 0.0, + "key": "cpu_number", + "nice": 0.0, + "softirq": 0.0, + "steal": 0.0, + "system": 2.0, + "total": 4.0, + "user": 2.0}], + "swap": 27.3} Get a specific field:: # curl http://localhost:61208/api/3/quicklook/cpu - {"cpu": 35.6} + {"cpu": 24.9} GET sensors ----------- @@ -1124,7 +1142,7 @@ GET uptime Get plugin stats:: # curl http://localhost:61208/api/3/uptime - {"seconds": 1495537} + {"seconds": 1537530} GET all stats ------------- @@ -1140,33 +1158,33 @@ GET stats history History of a plugin:: # curl http://localhost:61208/api/3/cpu/history - {"system": [["2022-05-25T22:46:23.083039", 4.3], - ["2022-05-25T22:46:24.140665", 4.3], - ["2022-05-25T22:46:25.239049", 5.5]], - "user": [["2022-05-25T22:46:23.083029", 27.0], - ["2022-05-25T22:46:24.140661", 27.0], - ["2022-05-25T22:46:25.239044", 10.7]]} + {"system": [["2022-05-26T10:26:16.012702", 4.2], + ["2022-05-26T10:26:17.068522", 4.2], + ["2022-05-26T10:26:18.156940", 1.6]], + "user": [["2022-05-26T10:26:16.012696", 20.7], + ["2022-05-26T10:26:17.068516", 20.7], + ["2022-05-26T10:26:18.156935", 4.1]]} Limit history to last 2 values:: # curl http://localhost:61208/api/3/cpu/history/2 - {"system": [["2022-05-25T22:46:24.140665", 4.3], - ["2022-05-25T22:46:25.239049", 5.5]], - "user": [["2022-05-25T22:46:24.140661", 27.0], - ["2022-05-25T22:46:25.239044", 10.7]]} + {"system": [["2022-05-26T10:26:17.068522", 4.2], + ["2022-05-26T10:26:18.156940", 1.6]], + "user": [["2022-05-26T10:26:17.068516", 20.7], + ["2022-05-26T10:26:18.156935", 4.1]]} History for a specific field:: # curl http://localhost:61208/api/3/cpu/system/history - {"system": [["2022-05-25T22:46:23.083039", 4.3], - ["2022-05-25T22:46:24.140665", 4.3], - ["2022-05-25T22:46:25.239049", 5.5]]} + {"system": [["2022-05-26T10:26:16.012702", 4.2], + ["2022-05-26T10:26:17.068522", 4.2], + ["2022-05-26T10:26:18.156940", 1.6]]} Limit history for a specific field to last 2 values:: # curl http://localhost:61208/api/3/cpu/system/history - {"system": [["2022-05-25T22:46:24.140665", 4.3], - ["2022-05-25T22:46:25.239049", 5.5]]} + {"system": [["2022-05-26T10:26:17.068522", 4.2], + ["2022-05-26T10:26:18.156940", 1.6]]} GET limits (used for thresholds) -------------------------------- diff --git a/docs/man/glances.1 b/docs/man/glances.1 index 2813c98e..24bc641b 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 25, 2022" "3.2.6.3" "Glances" +.TH "GLANCES" "1" "May 26, 2022" "3.2.6.4" "Glances" .SH NAME glances \- An eye on your system .SH SYNOPSIS diff --git a/glances/__init__.py b/glances/__init__.py index b7438bf7..665329ae 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.6.3' +__version__ = '3.2.6.4' __author__ = 'Nicolas Hennion ' __license__ = 'LGPLv3' diff --git a/glances/plugins/glances_docker.py b/glances/plugins/glances_docker.py index 520c63d1..7e2d54df 100644 --- a/glances/plugins/glances_docker.py +++ b/glances/plugins/glances_docker.py @@ -23,7 +23,6 @@ import os import threading import time from copy import deepcopy -from dateutil import parser from glances.compat import iterkeys, itervalues, nativestr, pretty_date from glances.logger import logger @@ -35,10 +34,11 @@ from glances.timer import getTimeSinceLastUpdate # https://github.com/docker/docker-py try: import docker + from dateutil import parser except Exception as e: import_error_tag = True # Display debug message if import KeyError - logger.warning("Error loading Docker Python Lib. Docker plugin is disabled ({})".format(e)) + logger.warning("Error loading Docker deps Lib. Docker plugin is disabled ({})".format(e)) else: import_error_tag = False From ff4e8d8d1a89fcf738f3d66d293886371aa8f802 Mon Sep 17 00:00:00 2001 From: nicolargo Date: Wed, 27 Jul 2022 10:03:35 +0200 Subject: [PATCH 03/10] Change the README header --- README.rst | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/README.rst b/README.rst index 12418a9a..8ece8724 100644 --- a/README.rst +++ b/README.rst @@ -21,18 +21,21 @@ Glances - An eye on your system :target: https://github.com/nicolargo/glances/actions :alt: Linux tests (GitHub Actions) -.. image:: https://img.shields.io/appveyor/ci/nicolargo/glances/master.svg?maxAge=3600&label=Windows - :target: https://ci.appveyor.com/project/nicolargo/glances - :alt: Windows tests (Appveyor) +.. image:: https://img.shields.io/github/contributors/nicolargo/glances + :target: https://github.com/nicolargo/glances/issues?q=is%3Aissue+is%3Aopen+label%3A%22needs+contributor%22 + :alt: Contibutors .. image:: https://scrutinizer-ci.com/g/nicolargo/glances/badges/quality-score.png?b=develop :target: https://scrutinizer-ci.com/g/nicolargo/glances/?branch=develop + :alt: Code quality -.. image:: https://img.shields.io/static/v1?label=Sponsor&message=%E2%9D%A4&logo=GitHub&link=https://github.com/sponsors/nicolargo +.. image:: https://img.shields.io/github/sponsors/nicolargo :target: https://github.com/sponsors/nicolargo + :alt: Sponsors .. image:: https://img.shields.io/twitter/url/https/twitter.com/cloudposse.svg?style=social&label=Follow%20%40nicolargo :target: https://twitter.com/nicolargo + :alt: @nicolargo Summary ======= From 419c4475dc6af3d94229817407a401fedaa70cf1 Mon Sep 17 00:00:00 2001 From: nicolargo Date: Wed, 27 Jul 2022 10:25:04 +0200 Subject: [PATCH 04/10] Container uptime wrong (timezone bug?) #2059 --- glances/compat.py | 8 ++++---- glances/plugins/glances_docker.py | 5 +++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/glances/compat.py b/glances/compat.py index 1dc1eacd..73b52256 100644 --- a/glances/compat.py +++ b/glances/compat.py @@ -327,17 +327,17 @@ def pretty_date(time=False): if second_diff < 10: return "just now" if second_diff < 60: - return str(second_diff) + " seconds" + return str(second_diff) + " secs" if second_diff < 120: - return "a minute" + return "a min" if second_diff < 3600: - return str(second_diff // 60) + " minutes" + return str(second_diff // 60) + " mins" if second_diff < 7200: return "an hour" if second_diff < 86400: return str(second_diff // 3600) + " hours" if day_diff == 1: - return "Yesterday" + return "yesterday" if day_diff < 7: return str(day_diff) + " days" if day_diff < 31: diff --git a/glances/plugins/glances_docker.py b/glances/plugins/glances_docker.py index d392b117..99ada6bf 100644 --- a/glances/plugins/glances_docker.py +++ b/glances/plugins/glances_docker.py @@ -24,7 +24,7 @@ from glances.timer import getTimeSinceLastUpdate # https://github.com/docker/docker-py try: import docker - from dateutil import parser + from dateutil import parser, tz except Exception as e: import_error_tag = True # Display debug message if import KeyError @@ -279,7 +279,8 @@ class Plugin(GlancesPlugin): container_stats['network_tx'] = container_stats['network'].get('tx', None) # Uptime container_stats['Uptime'] = pretty_date( - parser.parse(container.attrs['State']['StartedAt']).replace(tzinfo=None) + # parser.parse(container.attrs['State']['StartedAt']).replace(tzinfo=None) + parser.parse(container.attrs['State']['StartedAt']).astimezone(tz.tzlocal()).replace(tzinfo=None) ) else: container_stats['cpu'] = {} From 144e26f6c3d7b7fd594f07e25f274142d92cad07 Mon Sep 17 00:00:00 2001 From: nicolargo Date: Wed, 27 Jul 2022 11:21:05 +0200 Subject: [PATCH 05/10] Correct issue with CPU label --- glances/plugins/glances_cpu.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/glances/plugins/glances_cpu.py b/glances/plugins/glances_cpu.py index e2fc11c2..0c16cdc1 100644 --- a/glances/plugins/glances_cpu.py +++ b/glances/plugins/glances_cpu.py @@ -95,10 +95,16 @@ another while ensuring that the tasks do not conflict.', 'unit': 'number', 'rate': True, 'min_symbol': 'K', - 'short_name': 'sw_int', + 'short_name': 'sys_call', + }, + 'cpucore': { + 'description': 'Total number of CPU core.', + 'unit': 'number' + }, + 'time_since_update': { + 'description': 'Number of seconds since last update.', + 'unit': 'seconds' }, - 'cpucore': {'description': 'Total number of CPU core.', 'unit': 'number'}, - 'time_since_update': {'description': 'Number of seconds since last update.', 'unit': 'seconds'}, } # SNMP OID From 4f3aabb72b7d9a63c2b6424c6cd8a46ff1cbb493 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 27 Jul 2022 17:20:59 +0000 Subject: [PATCH 06/10] Bump terser from 5.9.0 to 5.14.2 in /glances/outputs/static Bumps [terser](https://github.com/terser/terser) from 5.9.0 to 5.14.2. - [Release notes](https://github.com/terser/terser/releases) - [Changelog](https://github.com/terser/terser/blob/master/CHANGELOG.md) - [Commits](https://github.com/terser/terser/compare/v5.9.0...v5.14.2) --- updated-dependencies: - dependency-name: terser dependency-type: indirect ... Signed-off-by: dependabot[bot] --- glances/outputs/static/package-lock.json | 93 +++++++++++++++--------- 1 file changed, 57 insertions(+), 36 deletions(-) diff --git a/glances/outputs/static/package-lock.json b/glances/outputs/static/package-lock.json index 6cc92444..76c82bde 100644 --- a/glances/outputs/static/package-lock.json +++ b/glances/outputs/static/package-lock.json @@ -86,6 +86,55 @@ "integrity": "sha512-6nFkfkmSeV/rqSaS4oWHgmpnYw194f6hmWF5is6b0J1naJZoiD0NTc9AiUwPHvWsowkjuHErCZT1wa0jg+BLIA==", "dev": true }, + "@jridgewell/gen-mapping": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", + "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", + "dev": true, + "requires": { + "@jridgewell/set-array": "^1.0.1", + "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/trace-mapping": "^0.3.9" + } + }, + "@jridgewell/resolve-uri": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz", + "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==", + "dev": true + }, + "@jridgewell/set-array": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz", + "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==", + "dev": true + }, + "@jridgewell/source-map": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz", + "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==", + "dev": true, + "requires": { + "@jridgewell/gen-mapping": "^0.3.0", + "@jridgewell/trace-mapping": "^0.3.9" + } + }, + "@jridgewell/sourcemap-codec": { + "version": "1.4.14", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz", + "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==", + "dev": true + }, + "@jridgewell/trace-mapping": { + "version": "0.3.14", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz", + "integrity": "sha512-bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ==", + "dev": true, + "requires": { + "@jridgewell/resolve-uri": "^3.0.3", + "@jridgewell/sourcemap-codec": "^1.4.10" + } + }, "@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -570,8 +619,7 @@ "buffer-from": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", - "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==", - "dev": true + "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==" }, "camel-case": { "version": "4.1.2", @@ -3121,8 +3169,7 @@ "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" }, "source-map-js": { "version": "0.6.2", @@ -3278,13 +3325,14 @@ } }, "terser": { - "version": "5.9.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.9.0.tgz", - "integrity": "sha512-h5hxa23sCdpzcye/7b8YqbE5OwKca/ni0RQz1uRX3tGh8haaGHqcuSqbGRybuAKNdntZ0mDgFNXPJ48xQ2RXKQ==", + "version": "5.14.2", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.14.2.tgz", + "integrity": "sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA==", "dev": true, "requires": { + "@jridgewell/source-map": "^0.3.2", + "acorn": "^8.5.0", "commander": "^2.20.0", - "source-map": "~0.7.2", "source-map-support": "~0.5.20" }, "dependencies": { @@ -3293,12 +3341,6 @@ "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", "dev": true - }, - "source-map": { - "version": "0.7.3", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", - "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==", - "dev": true } } }, @@ -3318,8 +3360,7 @@ "commander": { "version": "2.20.3", "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", - "dev": true + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" }, "schema-utils": { "version": "3.1.1", @@ -3345,30 +3386,10 @@ "version": "0.5.20", "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.20.tgz", "integrity": "sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw==", - "dev": true, "requires": { "buffer-from": "^1.0.0", "source-map": "^0.6.0" } - }, - "terser": { - "version": "5.9.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.9.0.tgz", - "integrity": "sha512-h5hxa23sCdpzcye/7b8YqbE5OwKca/ni0RQz1uRX3tGh8haaGHqcuSqbGRybuAKNdntZ0mDgFNXPJ48xQ2RXKQ==", - "dev": true, - "requires": { - "commander": "^2.20.0", - "source-map": "~0.7.2", - "source-map-support": "~0.5.20" - }, - "dependencies": { - "source-map": { - "version": "0.7.3", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", - "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==", - "dev": true - } - } } } }, From 3af6cc01fb2e909523e40da9ebba52a259a49dff Mon Sep 17 00:00:00 2001 From: nicolargo Date: Wed, 27 Jul 2022 19:28:12 +0200 Subject: [PATCH 07/10] Update docs --- docs/api.rst | 714 ++++++++++++++++++++++----------------------- docs/man/glances.1 | 2 +- 2 files changed, 348 insertions(+), 368 deletions(-) diff --git a/docs/api.rst b/docs/api.rst index 5f2a32c7..f21376cc 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.8538804054260254}, + "timer": 0.7136623859405518}, {"count": 0, "countmax": 20.0, "countmin": None, @@ -83,7 +83,7 @@ Get plugin stats:: "refresh": 3.0, "regex": True, "result": None, - "timer": 0.8537874221801758}] + "timer": 0.7135648727416992}] 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.8538804054260254}]} + "timer": 0.7136623859405518}]} GET core -------- @@ -131,19 +131,19 @@ Get plugin stats:: "ctx_switches": 0, "guest": 0.0, "guest_nice": 0.0, - "idle": 73.3, + "idle": 71.5, "interrupts": 0, - "iowait": 0.0, + "iowait": 0.3, "irq": 0.0, "nice": 0.0, "soft_interrupts": 0, "softirq": 0.0, "steal": 0.0, "syscalls": 0, - "system": 3.0, + "system": 3.5, "time_since_update": 1, - "total": 27.2, - "user": 23.7} + "total": 28.9, + "user": 24.7} Fields descriptions: @@ -165,7 +165,7 @@ Fields descriptions: Get a specific field:: # curl http://localhost:61208/api/3/cpu/total - {"total": 27.2} + {"total": 28.9} GET diskio ---------- @@ -211,13 +211,13 @@ Get plugin stats:: # curl http://localhost:61208/api/3/fs [{"device_name": "/dev/mapper/ubuntu--gnome--vg-root", - "free": 110062321664, + "free": 94683729920, "fs_type": "ext4", "key": "mnt_point", "mnt_point": "/", - "percent": 52.4, - "size": 243396149248, - "used": 120946372608}] + "percent": 59.0, + "size": 243334156288, + "used": 136262971392}] 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": 110062321664, + "free": 94683729920, "fs_type": "ext4", "key": "mnt_point", "mnt_point": "/", - "percent": 52.4, - "size": 243396149248, - "used": 120946372608}]} + "percent": 59.0, + "size": 243334156288, + "used": 136262971392}]} GET ip ------ @@ -242,16 +242,16 @@ GET ip Get plugin stats:: # curl http://localhost:61208/api/3/ip - {"address": "192.168.0.48", + {"address": "192.168.0.32", "gateway": "192.168.0.254", "mask": "255.255.255.0", "mask_cidr": 24, - "public_address": "82.66.169.82"} + "public_address": "91.166.228.228"} Get a specific field:: # curl http://localhost:61208/api/3/ip/address - {"address": "192.168.0.48"} + {"address": "192.168.0.32"} GET load -------- @@ -259,7 +259,7 @@ GET load Get plugin stats:: # curl http://localhost:61208/api/3/load - {"cpucore": 4, "min1": 1.40771484375, "min15": 1.4169921875, "min5": 1.484375} + {"cpucore": 4, "min1": 0.68408203125, "min15": 0.6572265625, "min5": 1.01953125} Fields descriptions: @@ -271,7 +271,7 @@ Fields descriptions: Get a specific field:: # curl http://localhost:61208/api/3/load/min1 - {"min1": 1.40771484375} + {"min1": 0.68408203125} GET mem ------- @@ -279,16 +279,16 @@ GET mem Get plugin stats:: # curl http://localhost:61208/api/3/mem - {"active": 2461896704, - "available": 3079487488, - "buffers": 486854656, - "cached": 3247910912, - "free": 3079487488, - "inactive": 4266680320, - "percent": 60.7, - "shared": 539095040, - "total": 7837974528, - "used": 4758487040} + {"active": 1234366464, + "available": 4835037184, + "buffers": 281141248, + "cached": 3177574400, + "free": 4835037184, + "inactive": 3743072256, + "percent": 38.3, + "shared": 335007744, + "total": 7837962240, + "used": 3002925056} Fields descriptions: @@ -307,7 +307,7 @@ Fields descriptions: Get a specific field:: # curl http://localhost:61208/api/3/mem/total - {"total": 7837974528} + {"total": 7837962240} GET memswap ----------- @@ -315,13 +315,13 @@ GET memswap Get plugin stats:: # curl http://localhost:61208/api/3/memswap - {"free": 7600726016, - "percent": 6.0, - "sin": 48836608, - "sout": 519880704, + {"free": 8082419712, + "percent": 0.0, + "sin": 0, + "sout": 0, "time_since_update": 1, "total": 8082419712, - "used": 481693696} + "used": 0} Fields descriptions: @@ -345,9 +345,9 @@ Get plugin stats:: # curl http://localhost:61208/api/3/network [{"alias": None, - "cumulative_cx": 47984606, - "cumulative_rx": 23992303, - "cumulative_tx": 23992303, + "cumulative_cx": 1935164, + "cumulative_rx": 967582, + "cumulative_tx": 967582, "cx": 2492, "interface_name": "lo", "is_up": True, @@ -357,17 +357,17 @@ Get plugin stats:: "time_since_update": 1, "tx": 1246}, {"alias": None, - "cumulative_cx": 1734453000, - "cumulative_rx": 1610954683, - "cumulative_tx": 123498317, - "cx": 31305, + "cumulative_cx": 18024325, + "cumulative_rx": 15987954, + "cumulative_tx": 2036371, + "cx": 12836, "interface_name": "wlp2s0", "is_up": True, "key": "interface_name", - "rx": 25086, + "rx": 9587, "speed": 0, "time_since_update": 1, - "tx": 6219}] + "tx": 3249}] Fields descriptions: @@ -387,18 +387,18 @@ Get a specific field:: {"interface_name": ["lo", "wlp2s0", "br-119e6ee04e05", - "docker0", "br-87386b77b676", "br_grafana", + "docker0", "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": 47984606, - "cumulative_rx": 23992303, - "cumulative_tx": 23992303, + "cumulative_cx": 1935164, + "cumulative_rx": 967582, + "cumulative_tx": 967582, "cx": 2492, "interface_name": "lo", "is_up": True, @@ -414,7 +414,7 @@ GET now Get plugin stats:: # curl http://localhost:61208/api/3/now - "2022-07-24 10:33:51 CEST" + "2022-07-27 19:25:01 CEST" GET percpu ---------- @@ -425,29 +425,29 @@ Get plugin stats:: [{"cpu_number": 0, "guest": 0.0, "guest_nice": 0.0, - "idle": 90.0, + "idle": 58.0, "iowait": 0.0, "irq": 0.0, "key": "cpu_number", "nice": 0.0, - "softirq": 1.0, + "softirq": 0.0, "steal": 0.0, - "system": 0.0, - "total": 10.0, - "user": 4.0}, + "system": 3.0, + "total": 42.0, + "user": 20.0}, {"cpu_number": 1, "guest": 0.0, "guest_nice": 0.0, - "idle": 90.0, + "idle": 40.0, "iowait": 0.0, "irq": 0.0, "key": "cpu_number", "nice": 0.0, - "softirq": 1.0, + "softirq": 0.0, "steal": 0.0, - "system": 3.0, - "total": 10.0, - "user": 3.0}] + "system": 2.0, + "total": 60.0, + "user": 39.0}] Get a specific field:: @@ -466,7 +466,7 @@ Get plugin stats:: "port": 0, "refresh": 30, "rtt_warning": None, - "status": 0.003645, + "status": 0.005754, "timeout": 3}] Get a specific field:: @@ -483,7 +483,7 @@ Get a specific item when field matchs the given value:: "port": 0, "refresh": 30, "rtt_warning": None, - "status": 0.003645, + "status": 0.005754, "timeout": 3}]} GET processcount @@ -492,12 +492,12 @@ GET processcount Get plugin stats:: # curl http://localhost:61208/api/3/processcount - {"pid_max": 0, "running": 1, "sleeping": 233, "thread": 1256, "total": 299} + {"pid_max": 0, "running": 1, "sleeping": 211, "thread": 963, "total": 279} Get a specific field:: # curl http://localhost:61208/api/3/processcount/total - {"total": 299} + {"total": 279} GET processlist --------------- @@ -505,50 +505,50 @@ GET processlist Get plugin stats:: # curl http://localhost:61208/api/3/processlist - [{"cmdline": ["/snap/firefox/1443/usr/lib/firefox/firefox"], + [{"cmdline": ["/snap/firefox/1551/usr/lib/firefox/firefox"], "cpu_percent": 0.0, - "cpu_times": pcputimes(user=2687.47, system=1037.45, children_user=2125.3, children_system=344.64, iowait=0.0), + "cpu_times": pcputimes(user=79.91, system=24.21, children_user=23.95, children_system=4.95, iowait=0.0), "gids": pgids(real=1000, effective=1000, saved=1000), - "io_counters": [982852608, 2811539456, 0, 0, 0], + "io_counters": [537029632, 195117056, 0, 0, 0], "key": "pid", - "memory_info": pmem(rss=521953280, vms=13237006336, shared=174477312, text=741376, lib=0, data=1154760704, dirty=0), - "memory_percent": 6.659287780732119, + "memory_info": pmem(rss=487780352, vms=3243282432, shared=183926784, text=630784, lib=0, data=555700224, dirty=0), + "memory_percent": 6.2233057147261786, "name": "firefox", "nice": 0, - "num_threads": 164, - "pid": 4236, + "num_threads": 98, + "pid": 3866, "status": "S", "time_since_update": 1, "username": "nicolargo"}, - {"cmdline": ["/snap/firefox/1443/usr/lib/firefox/firefox", + {"cmdline": ["/snap/firefox/1551/usr/lib/firefox/firefox", "-contentproc", "-childID", - "3", + "1", "-isForBrowser", "-prefsLen", - "13098", + "35771", "-prefMapSize", - "255747", + "226281", "-jsInitLen", - "277128", + "277276", "-parentBuildID", - "20220609070438", + "20220707183149", "-appDir", - "/snap/firefox/1443/usr/lib/firefox/browser", - "4236", + "/snap/firefox/1551/usr/lib/firefox/browser", + "3866", "true", "tab"], "cpu_percent": 0.0, - "cpu_times": pcputimes(user=421.23, system=83.44, children_user=0.0, children_system=0.0, iowait=0.0), + "cpu_times": pcputimes(user=24.14, system=3.64, children_user=0.0, children_system=0.0, iowait=0.0), "gids": pgids(real=1000, effective=1000, saved=1000), - "io_counters": [11130880, 0, 0, 0, 0], + "io_counters": [3784704, 0, 0, 0, 0], "key": "pid", - "memory_info": pmem(rss=459653120, vms=3240546304, shared=89395200, text=741376, lib=0, data=649822208, dirty=0), - "memory_percent": 5.864437532400207, + "memory_info": pmem(rss=356777984, vms=3025420288, shared=86458368, text=630784, lib=0, data=431472640, dirty=0), + "memory_percent": 4.551922720158448, "name": "WebExtensions", "nice": 0, "num_threads": 20, - "pid": 5262, + "pid": 4232, "status": "S", "time_since_update": 1, "username": "nicolargo"}] @@ -556,175 +556,154 @@ Get plugin stats:: Get a specific field:: # curl http://localhost:61208/api/3/processlist/pid - {"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, - 9796, - 3457, - 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, + {"pid": [3866, + 4232, + 4291, + 3558, + 3173, + 5251, + 4255, + 1952, + 3996, + 2029, + 6101, + 4007, 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, - 3386, - 3382, - 58881, - 3950, - 3559, - 3923, - 3763, - 1272, - 3775, - 3753, - 393, - 3837, - 3853, - 1253, - 1101, - 3843, - 54916, - 3603, - 1245, - 1286, - 3770, - 3658, - 3623, - 3597, - 3771, - 3379, - 3758, - 3451, - 3391, - 1282, - 9827, - 1281, - 1241, - 3526, - 5562, - 3367, - 9854, - 3640, + 6902, + 6923, + 7753, + 1377, + 3084, + 2234, + 7854, + 2916, + 3288, + 1273, + 1446, + 3213, + 5463, + 1374, + 343, + 4105, + 3256, + 3319, + 2977, + 3369, + 3523, + 3370, + 4311, + 3364, + 3638, + 5576, + 2160, + 3247, + 2865, + 3378, + 1251, 3368, - 3568, - 1237, - 1259, - 42042, - 3360, - 1086, - 1244, - 1596, - 76386, - 1139, - 1300, - 73241, - 9648, - 1135, - 1996, - 3959, - 1240, - 4203, - 3433, + 1772, + 4033, + 1236, + 2195, + 3150, + 3365, + 1284, + 3064, + 3222, + 1955, + 1372, + 2868, + 3605, + 1432, + 3522, + 1077, + 1, + 3383, + 1369, + 3372, + 6775, + 3184, + 3375, + 1951, + 1285, + 2966, + 1257, + 2768, + 1429, + 2190, + 1312, + 1282, + 3422, + 3377, + 3272, + 1280, + 1742, + 1218, + 3309, + 2996, + 3376, + 2191, + 2991, + 389, + 3194, + 3174, + 1235, + 2974, + 3529, + 3366, + 1258, + 2975, + 3519, + 3570, + 3348, + 3615, + 3414, + 3207, + 2988, + 6122, + 1243, + 3227, + 1265, + 1276, + 3363, + 3373, + 1079, + 3374, + 3005, + 3199, + 3061, + 6177, + 1271, + 3265, + 1286, + 3245, + 3181, + 1231, + 2967, + 3139, + 1227, + 1588, + 1076, + 1245, + 3804, + 1234, + 1290, + 3632, + 1089, + 7844, + 1088, + 1974, + 3047, 1229, - 2006, - 76401, - 3757, - 1307, - 2049, - 2038, - 2036, + 4224, + 1219, + 7853, + 1976, + 3360, + 1294, + 1978, + 2021, + 1962, 2, 3, 4, @@ -762,9 +741,11 @@ Get a specific field:: 42, 43, 44, + 49, 91, 92, 93, + 94, 95, 96, 97, @@ -775,17 +756,21 @@ Get a specific field:: 104, 105, 107, + 109, 110, - 111, - 116, + 112, + 113, 117, 118, - 128, - 131, - 137, - 160, + 119, + 121, + 129, + 132, + 133, + 138, 187, - 190, + 188, + 195, 196, 197, 198, @@ -794,89 +779,84 @@ Get a specific field:: 201, 202, 203, + 209, 210, - 211, - 216, + 215, 217, 234, - 287, - 288, - 362, + 282, + 283, 363, - 385, - 463, - 499, + 364, + 374, + 390, + 465, + 498, + 534, 565, - 567, - 568, 569, - 788, - 789, - 790, - 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]} + 576, + 577, + 578, + 723, + 741, + 800, + 801, + 802, + 803, + 808, + 809, + 810, + 811, + 812, + 813, + 814, + 815, + 1006, + 1569, + 2006, + 2048, + 2072, + 2127, + 2128, + 2131, + 2132, + 2133, + 2134, + 2136, + 2138, + 2216, + 2217, + 3244, + 6481, + 6614, + 6629, + 6634, + 6653, + 6715, + 6974]} Get a specific item when field matchs the given value:: - # curl http://localhost:61208/api/3/processlist/pid/4236 - {"4236": [{"cmdline": ["/snap/firefox/1443/usr/lib/firefox/firefox"], + # curl http://localhost:61208/api/3/processlist/pid/3866 + {"3866": [{"cmdline": ["/snap/firefox/1551/usr/lib/firefox/firefox"], "cpu_percent": 0.0, - "cpu_times": [2687.47, 1037.45, 2125.3, 344.64, 0.0], + "cpu_times": [79.91, 24.21, 23.95, 4.95, 0.0], "gids": [1000, 1000, 1000], - "io_counters": [982852608, 2811539456, 0, 0, 0], + "io_counters": [537029632, 195117056, 0, 0, 0], "key": "pid", - "memory_info": [521953280, - 13237006336, - 174477312, - 741376, + "memory_info": [487780352, + 3243282432, + 183926784, + 630784, 0, - 1154760704, + 555700224, 0], - "memory_percent": 6.659287780732119, + "memory_percent": 6.2233057147261786, "name": "firefox", "nice": 0, - "num_threads": 164, - "pid": 4236, + "num_threads": 98, + "pid": 3866, "status": "S", "time_since_update": 1, "username": "nicolargo"}]} @@ -895,69 +875,69 @@ GET quicklook Get plugin stats:: # curl http://localhost:61208/api/3/quicklook - {"cpu": 27.2, + {"cpu": 28.9, "cpu_hz": 3000000000.0, - "cpu_hz_current": 1605066500.0, + "cpu_hz_current": 1588220000.0, "cpu_name": "Intel(R) Core(TM) i7-4500U CPU @ 1.80GHz", - "mem": 60.7, + "mem": 38.3, "percpu": [{"cpu_number": 0, "guest": 0.0, "guest_nice": 0.0, - "idle": 90.0, + "idle": 58.0, "iowait": 0.0, "irq": 0.0, "key": "cpu_number", "nice": 0.0, - "softirq": 1.0, + "softirq": 0.0, "steal": 0.0, - "system": 0.0, - "total": 10.0, - "user": 4.0}, + "system": 3.0, + "total": 42.0, + "user": 20.0}, {"cpu_number": 1, "guest": 0.0, "guest_nice": 0.0, - "idle": 90.0, + "idle": 40.0, "iowait": 0.0, "irq": 0.0, "key": "cpu_number", "nice": 0.0, - "softirq": 1.0, + "softirq": 0.0, "steal": 0.0, - "system": 3.0, - "total": 10.0, - "user": 3.0}, + "system": 2.0, + "total": 60.0, + "user": 39.0}, {"cpu_number": 2, "guest": 0.0, "guest_nice": 0.0, - "idle": 31.0, - "iowait": 0.0, + "idle": 58.0, + "iowait": 1.0, "irq": 0.0, "key": "cpu_number", "nice": 0.0, "softirq": 0.0, "steal": 0.0, - "system": 1.0, - "total": 69.0, - "user": 63.0}, + "system": 2.0, + "total": 42.0, + "user": 20.0}, {"cpu_number": 3, "guest": 0.0, "guest_nice": 0.0, - "idle": 65.0, + "idle": 73.0, "iowait": 0.0, "irq": 0.0, "key": "cpu_number", "nice": 0.0, "softirq": 0.0, "steal": 0.0, - "system": 3.0, - "total": 35.0, - "user": 26.0}], - "swap": 6.0} + "system": 2.0, + "total": 27.0, + "user": 6.0}], + "swap": 0.0} Get a specific field:: # curl http://localhost:61208/api/3/quicklook/cpu - {"cpu": 27.2} + {"cpu": 28.9} GET sensors ----------- @@ -1014,7 +994,7 @@ Get plugin stats:: "hr_name": "Ubuntu 22.04 64bit", "linux_distro": "Ubuntu 22.04", "os_name": "Linux", - "os_version": "5.15.0-40-generic", + "os_version": "5.15.0-41-generic", "platform": "64bit"} Get a specific field:: @@ -1028,7 +1008,7 @@ GET uptime Get plugin stats:: # curl http://localhost:61208/api/3/uptime - {"seconds": 692162} + {"seconds": 469} GET all stats ------------- @@ -1044,33 +1024,33 @@ GET stats history History of a plugin:: # curl http://localhost:61208/api/3/cpu/history - {"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]]} + {"system": [["2022-07-27T19:25:01.821257", 3.5], + ["2022-07-27T19:25:02.853268", 3.5], + ["2022-07-27T19:25:03.921269", 0.5]], + "user": [["2022-07-27T19:25:01.821251", 24.7], + ["2022-07-27T19:25:02.853264", 24.7], + ["2022-07-27T19:25:03.921265", 1.9]]} Limit history to last 2 values:: # curl http://localhost:61208/api/3/cpu/history/2 - {"system": [["2022-07-24T10:33:53.131720", 3.0], - ["2022-07-24T10:33:54.206957", 0.6]], - "user": [["2022-07-24T10:33:53.131716", 23.7], - ["2022-07-24T10:33:54.206953", 1.8]]} + {"system": [["2022-07-27T19:25:02.853268", 3.5], + ["2022-07-27T19:25:03.921269", 0.5]], + "user": [["2022-07-27T19:25:02.853264", 24.7], + ["2022-07-27T19:25:03.921265", 1.9]]} History for a specific field:: # curl http://localhost:61208/api/3/cpu/system/history - {"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]]} + {"system": [["2022-07-27T19:25:01.821257", 3.5], + ["2022-07-27T19:25:02.853268", 3.5], + ["2022-07-27T19:25:03.921269", 0.5]]} Limit history for a specific field to last 2 values:: # curl http://localhost:61208/api/3/cpu/system/history - {"system": [["2022-07-24T10:33:53.131720", 3.0], - ["2022-07-24T10:33:54.206957", 0.6]]} + {"system": [["2022-07-27T19:25:02.853268", 3.5], + ["2022-07-27T19:25:03.921269", 0.5]]} GET limits (used for thresholds) -------------------------------- diff --git a/docs/man/glances.1 b/docs/man/glances.1 index 29cdff72..3e329239 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" "Jul 24, 2022" "3.2.7_beta01" "Glances" +.TH "GLANCES" "1" "Jul 27, 2022" "3.2.7_beta01" "Glances" .SH NAME glances \- An eye on your system .SH SYNOPSIS From 0f226b2ba8678aa4ef41a08a97c1d3464c08121b Mon Sep 17 00:00:00 2001 From: nicolargo Date: Thu, 28 Jul 2022 10:30:55 +0200 Subject: [PATCH 08/10] Update README for Debian package users --- README.rst | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/README.rst b/README.rst index 8ece8724..e7342e4d 100644 --- a/README.rst +++ b/README.rst @@ -141,8 +141,14 @@ For Windows, just install psutil from the binary installation file. *Note 2 (for the Wifi plugin)*: If you want to use the Wifi plugin, you need to install the *wireless-tools* package on your system. -You can also install the following libraries in order to use optional -features (like the Web interface, exports modules...): +By default, Glances is installed without the Web interface dependencies. +To install it, use the following command: + +.. code-block:: console + + pip install --user 'glances[web]' + +For a full installation (with all features: .. code-block:: console @@ -153,29 +159,14 @@ To upgrade Glances to the latest version: .. code-block:: console pip install --user --upgrade glances - pip install --user --upgrade 'glances[...]'' -If you need to install Glances in a specific user location, use: - -.. code-block:: console - - export PYTHONUSERBASE=~/mylocalpath - pip install --user glances - -If you are administrator and want to install Glances for all users: - -.. code-block:: console - - sudo pip install glances - -The current develop branch is also published to the test.pypi.org package index. -If you want to test the develop version, enter: +The current develop branch is published to the test.pypi.org package index. +If you want to test the develop version (could be instable), enter: .. code-block:: console pip install --user -i https://test.pypi.org/simple/ Glances - Glances Auto Install script: the easy way ----------------------------------------- @@ -255,6 +246,10 @@ able to install it using your favorite package manager. Be aware that when you use this method the operating system `package`_ for `Glances` may not be the latest version. +Note: The Debian package (and all other Debian-based distributions) do +not include anymore the JS statics files used by the Web interface +(see ``issue2021``). + FreeBSD ------- @@ -481,3 +476,4 @@ Glances is distributed under the LGPL version 3 license. See ``COPYING`` for mor .. _wiki: https://github.com/nicolargo/glances/wiki/How-to-contribute-to-Glances-%3F .. _package: https://repology.org/metapackage/glances/packages .. _sponsors: https://github.com/sponsors/nicolargo +.. _issue2021: https://github.com/nicolargo/glances/issues/2021#issuecomment-1197831157 \ No newline at end of file From 709b4e904d831ab44e38dcf98804c63953d450b5 Mon Sep 17 00:00:00 2001 From: nicolargo Date: Thu, 28 Jul 2022 18:00:59 +0200 Subject: [PATCH 09/10] version 3.2.7 --- NEWS.rst | 41 ++- docker-compose/glances.conf | 3 +- docs/_static/glances-flame.svg | 4 +- docs/api.rst | 473 +++++++++++++++++---------------- docs/man/glances.1 | 2 +- glances/__init__.py | 2 +- 6 files changed, 291 insertions(+), 234 deletions(-) diff --git a/NEWS.rst b/NEWS.rst index 9b416b6b..be00a806 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -6,7 +6,46 @@ Version 3.2.7 =============== - Under development: see roadmap here https://github.com/nicolargo/glances/milestone/59 +Enhancements: + + * Config to disable all plugins by default (or enable an exclusive list) #2089 + * Keybind(s) for modifying nice level #2081 + * [WEBUI] Reorganize help screen #2037 + * Add a Json stdout option #2060 + * Improve error message when export error occures + * Improve error message when MQTT error occures + * Change the way core are displayed + * Remove unused key in the process list + * Refactor top menu of the curse interface + * Improve Irix display for the load plugin + +Bug corrected: + + * In the sensor plugin thresholds in the configuration file should overwrite system ones #2058 + * Drive names truncated in Web UI #2055 + * Correct issue with CPU label + +Documentation and CI: + + * Improve makefile help #2078 + * Add quote to the update command line (already ok for the installation). Related to #2073 + * Make Glances (almost) compliant with REUSE #2042 + * Update README for Debian package users + * Update documentation for Docker + * Update docs for new shortcut + * Disable Pyright on the Git actions pipeline + * Refactor comments + * Except datutil import error + * Another dep issue solved in the Alpine Docker + issue in the outdated method + +Contributors for this version: + + * Nicolargo + * Sylvain MOUQUET + * FastThenLeft + * Jiajie Chen + * dbrennand + * ewuerger =============== Version 3.2.6 diff --git a/docker-compose/glances.conf b/docker-compose/glances.conf index ab4a30e7..efcb0e95 100644 --- a/docker-compose/glances.conf +++ b/docker-compose/glances.conf @@ -524,6 +524,7 @@ port=8125 # Configuration for the --export elasticsearch option # Data are available via the ES RESTful API. ex: URL//cpu # https://www.elastic.co +scheme=http host=localhost port=9200 index=glances @@ -547,7 +548,7 @@ queue=glances_queue # Configuration for the --export mqtt option host=localhost port=8883 -tls=true +tls=false user=guest password=guest topic=glances diff --git a/docs/_static/glances-flame.svg b/docs/_static/glances-flame.svg index 7093e1ee..58209284 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 f21376cc..16f901a2 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.7136623859405518}, + "timer": 1.025280237197876}, {"count": 0, "countmax": 20.0, "countmin": None, @@ -83,7 +83,7 @@ Get plugin stats:: "refresh": 3.0, "regex": True, "result": None, - "timer": 0.7135648727416992}] + "timer": 1.025184154510498}] 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.7136623859405518}]} + "timer": 1.025280237197876}]} GET core -------- @@ -131,19 +131,19 @@ Get plugin stats:: "ctx_switches": 0, "guest": 0.0, "guest_nice": 0.0, - "idle": 71.5, + "idle": 72.3, "interrupts": 0, - "iowait": 0.3, + "iowait": 0.0, "irq": 0.0, "nice": 0.0, "soft_interrupts": 0, "softirq": 0.0, "steal": 0.0, "syscalls": 0, - "system": 3.5, + "system": 2.2, "time_since_update": 1, - "total": 28.9, - "user": 24.7} + "total": 28.3, + "user": 25.5} Fields descriptions: @@ -165,7 +165,7 @@ Fields descriptions: Get a specific field:: # curl http://localhost:61208/api/3/cpu/total - {"total": 28.9} + {"total": 28.3} GET diskio ---------- @@ -211,13 +211,13 @@ Get plugin stats:: # curl http://localhost:61208/api/3/fs [{"device_name": "/dev/mapper/ubuntu--gnome--vg-root", - "free": 94683729920, + "free": 89835802624, "fs_type": "ext4", "key": "mnt_point", "mnt_point": "/", - "percent": 59.0, + "percent": 61.1, "size": 243334156288, - "used": 136262971392}] + "used": 141110898688}] 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": 94683729920, + "free": 89835802624, "fs_type": "ext4", "key": "mnt_point", "mnt_point": "/", - "percent": 59.0, + "percent": 61.1, "size": 243334156288, - "used": 136262971392}]} + "used": 141110898688}]} GET ip ------ @@ -259,7 +259,7 @@ GET load Get plugin stats:: # curl http://localhost:61208/api/3/load - {"cpucore": 4, "min1": 0.68408203125, "min15": 0.6572265625, "min5": 1.01953125} + {"cpucore": 4, "min1": 0.89306640625, "min15": 0.623046875, "min5": 0.892578125} Fields descriptions: @@ -271,7 +271,7 @@ Fields descriptions: Get a specific field:: # curl http://localhost:61208/api/3/load/min1 - {"min1": 0.68408203125} + {"min1": 0.89306640625} GET mem ------- @@ -279,16 +279,16 @@ GET mem Get plugin stats:: # curl http://localhost:61208/api/3/mem - {"active": 1234366464, - "available": 4835037184, - "buffers": 281141248, - "cached": 3177574400, - "free": 4835037184, - "inactive": 3743072256, - "percent": 38.3, - "shared": 335007744, + {"active": 1748742144, + "available": 3150409728, + "buffers": 661204992, + "cached": 3056963584, + "free": 3150409728, + "inactive": 4735377408, + "percent": 59.8, + "shared": 604377088, "total": 7837962240, - "used": 3002925056} + "used": 4687552512} Fields descriptions: @@ -315,13 +315,13 @@ GET memswap Get plugin stats:: # curl http://localhost:61208/api/3/memswap - {"free": 8082419712, - "percent": 0.0, - "sin": 0, - "sout": 0, + {"free": 7923298304, + "percent": 2.0, + "sin": 6930432, + "sout": 161832960, "time_since_update": 1, "total": 8082419712, - "used": 0} + "used": 159121408} Fields descriptions: @@ -345,29 +345,29 @@ Get plugin stats:: # curl http://localhost:61208/api/3/network [{"alias": None, - "cumulative_cx": 1935164, - "cumulative_rx": 967582, - "cumulative_tx": 967582, - "cx": 2492, + "cumulative_cx": 63263372, + "cumulative_rx": 31631686, + "cumulative_tx": 31631686, + "cx": 2240, "interface_name": "lo", "is_up": True, "key": "interface_name", - "rx": 1246, + "rx": 1120, "speed": 0, "time_since_update": 1, - "tx": 1246}, + "tx": 1120}, {"alias": None, - "cumulative_cx": 18024325, - "cumulative_rx": 15987954, - "cumulative_tx": 2036371, - "cx": 12836, + "cumulative_cx": 6121583802, + "cumulative_rx": 5987015590, + "cumulative_tx": 134568212, + "cx": 11733, "interface_name": "wlp2s0", "is_up": True, "key": "interface_name", - "rx": 9587, + "rx": 8809, "speed": 0, "time_since_update": 1, - "tx": 3249}] + "tx": 2924}] Fields descriptions: @@ -396,17 +396,17 @@ 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": 1935164, - "cumulative_rx": 967582, - "cumulative_tx": 967582, - "cx": 2492, + "cumulative_cx": 63263372, + "cumulative_rx": 31631686, + "cumulative_tx": 31631686, + "cx": 2240, "interface_name": "lo", "is_up": True, "key": "interface_name", - "rx": 1246, + "rx": 1120, "speed": 0, "time_since_update": 1, - "tx": 1246}]} + "tx": 1120}]} GET now ------- @@ -414,7 +414,7 @@ GET now Get plugin stats:: # curl http://localhost:61208/api/3/now - "2022-07-27 19:25:01 CEST" + "2022-07-28 17:47:36 CEST" GET percpu ---------- @@ -425,29 +425,29 @@ Get plugin stats:: [{"cpu_number": 0, "guest": 0.0, "guest_nice": 0.0, - "idle": 58.0, + "idle": 90.1, "iowait": 0.0, "irq": 0.0, "key": "cpu_number", "nice": 0.0, "softirq": 0.0, "steal": 0.0, - "system": 3.0, - "total": 42.0, - "user": 20.0}, + "system": 2.7, + "total": 9.9, + "user": 7.2}, {"cpu_number": 1, "guest": 0.0, "guest_nice": 0.0, - "idle": 40.0, + "idle": 95.5, "iowait": 0.0, "irq": 0.0, "key": "cpu_number", "nice": 0.0, "softirq": 0.0, "steal": 0.0, - "system": 2.0, - "total": 60.0, - "user": 39.0}] + "system": 0.9, + "total": 4.5, + "user": 3.6}] Get a specific field:: @@ -466,7 +466,7 @@ Get plugin stats:: "port": 0, "refresh": 30, "rtt_warning": None, - "status": 0.005754, + "status": 0.003491, "timeout": 3}] Get a specific field:: @@ -483,7 +483,7 @@ Get a specific item when field matchs the given value:: "port": 0, "refresh": 30, "rtt_warning": None, - "status": 0.005754, + "status": 0.003491, "timeout": 3}]} GET processcount @@ -492,12 +492,12 @@ GET processcount Get plugin stats:: # curl http://localhost:61208/api/3/processcount - {"pid_max": 0, "running": 1, "sleeping": 211, "thread": 963, "total": 279} + {"pid_max": 0, "running": 1, "sleeping": 230, "thread": 1172, "total": 296} Get a specific field:: # curl http://localhost:61208/api/3/processcount/total - {"total": 279} + {"total": 296} GET processlist --------------- @@ -507,15 +507,15 @@ Get plugin stats:: # curl http://localhost:61208/api/3/processlist [{"cmdline": ["/snap/firefox/1551/usr/lib/firefox/firefox"], "cpu_percent": 0.0, - "cpu_times": pcputimes(user=79.91, system=24.21, children_user=23.95, children_system=4.95, iowait=0.0), + "cpu_times": pcputimes(user=1010.67, system=364.61, children_user=355.1, children_system=90.0, iowait=0.0), "gids": pgids(real=1000, effective=1000, saved=1000), - "io_counters": [537029632, 195117056, 0, 0, 0], + "io_counters": [800161792, 7131361280, 0, 0, 0], "key": "pid", - "memory_info": pmem(rss=487780352, vms=3243282432, shared=183926784, text=630784, lib=0, data=555700224, dirty=0), - "memory_percent": 6.2233057147261786, + "memory_info": pmem(rss=644706304, vms=13331173376, shared=158920704, text=630784, lib=0, data=1310646272, dirty=0), + "memory_percent": 8.225432634898736, "name": "firefox", "nice": 0, - "num_threads": 98, + "num_threads": 146, "pid": 3866, "status": "S", "time_since_update": 1, @@ -539,12 +539,12 @@ Get plugin stats:: "true", "tab"], "cpu_percent": 0.0, - "cpu_times": pcputimes(user=24.14, system=3.64, children_user=0.0, children_system=0.0, iowait=0.0), + "cpu_times": pcputimes(user=138.84, system=31.43, children_user=0.0, children_system=0.0, iowait=0.0), "gids": pgids(real=1000, effective=1000, saved=1000), - "io_counters": [3784704, 0, 0, 0, 0], + "io_counters": [8065024, 0, 0, 0, 0], "key": "pid", - "memory_info": pmem(rss=356777984, vms=3025420288, shared=86458368, text=630784, lib=0, data=431472640, dirty=0), - "memory_percent": 4.551922720158448, + "memory_info": pmem(rss=433627136, vms=3162419200, shared=83726336, text=630784, lib=0, data=573640704, dirty=0), + "memory_percent": 5.532396338770829, "name": "WebExtensions", "nice": 0, "num_threads": 20, @@ -559,151 +559,170 @@ Get a specific field:: {"pid": [3866, 4232, 4291, + 12527, 3558, 3173, - 5251, + 13334, + 12643, + 12475, 4255, - 1952, + 12512, + 12406, + 12443, 3996, - 2029, 6101, + 52860, + 52993, + 53135, + 53134, + 53215, + 1952, + 2029, + 12583, 4007, - 3456, - 6902, - 6923, - 7753, - 1377, + 12544, 3084, - 2234, - 7854, - 2916, - 3288, - 1273, - 1446, - 3213, + 53348, 5463, - 1374, + 2234, + 12723, + 3288, + 3456, + 1377, + 8852, + 12462, + 1273, 343, + 1374, + 1446, 4105, 3256, - 3319, + 3638, 2977, + 3319, + 4311, + 3213, + 2160, + 1236, + 3370, + 1251, + 3247, 3369, 3523, - 3370, - 4311, - 3364, - 3638, 5576, - 2160, - 3247, - 2865, - 3378, - 1251, - 3368, - 1772, - 4033, - 1236, 2195, - 3150, - 3365, + 3364, + 1772, + 12412, + 9801, + 3378, 1284, - 3064, - 3222, + 3368, + 2865, 1955, - 1372, - 2868, - 3605, 1432, - 3522, + 12413, + 3150, + 9884, + 4033, 1077, + 3605, 1, 3383, - 1369, + 3365, + 3064, + 1257, + 3522, 3372, 6775, 3184, - 3375, - 1951, - 1285, - 2966, - 1257, + 1369, 2768, + 3222, + 9895, + 2966, + 2868, 1429, + 3375, + 1285, 2190, - 1312, 1282, 3422, - 3377, + 14980, 3272, - 1280, + 15002, 1742, + 1280, + 3377, 1218, + 6122, 3309, 2996, - 3376, 2191, - 2991, - 389, 3194, - 3174, 1235, - 2974, - 3529, + 389, + 3174, + 12681, 3366, - 1258, - 2975, - 3519, + 3376, 3570, - 3348, - 3615, + 1258, + 3529, + 2991, 3414, - 3207, - 2988, - 6122, + 3519, + 3615, + 3348, 1243, - 3227, - 1265, + 3207, + 52896, + 2988, 1276, - 3363, - 3373, - 1079, - 3374, - 3005, - 3199, - 3061, - 6177, - 1271, 3265, - 1286, + 1265, + 3373, + 3374, + 3227, + 3363, + 3199, + 3005, + 3061, + 1079, + 1271, + 2974, + 2975, 3245, - 3181, 1231, - 2967, 3139, + 3181, 1227, + 6177, + 2967, 1588, - 1076, 1245, - 3804, + 1076, 1234, + 3804, 1290, 3632, 1089, - 7844, + 53333, 1088, 1974, - 3047, + 12429, 1229, 4224, + 3047, 1219, - 7853, + 53347, 1976, 3360, 1294, - 1978, 2021, + 1978, 1962, + 12415, 2, 3, 4, @@ -741,11 +760,9 @@ Get a specific field:: 42, 43, 44, - 49, 91, 92, 93, - 94, 95, 96, 97, @@ -756,17 +773,13 @@ Get a specific field:: 104, 105, 107, - 109, 110, 112, - 113, 117, 118, 119, - 121, 129, 132, - 133, 138, 187, 188, @@ -788,18 +801,13 @@ Get a specific field:: 283, 363, 364, - 374, 390, - 465, 498, 534, - 565, 569, 576, 577, 578, - 723, - 741, 800, 801, 802, @@ -812,8 +820,6 @@ Get a specific field:: 813, 814, 815, - 1006, - 1569, 2006, 2048, 2072, @@ -825,37 +831,48 @@ Get a specific field:: 2134, 2136, 2138, - 2216, - 2217, 3244, - 6481, - 6614, - 6629, - 6634, - 6653, - 6715, - 6974]} + 9667, + 12922, + 19063, + 49473, + 49810, + 50045, + 50203, + 50501, + 50684, + 51522, + 51523, + 51717, + 51914, + 52048, + 52159, + 52947, + 52970, + 53065, + 53329, + 53330]} Get a specific item when field matchs the given value:: # curl http://localhost:61208/api/3/processlist/pid/3866 {"3866": [{"cmdline": ["/snap/firefox/1551/usr/lib/firefox/firefox"], "cpu_percent": 0.0, - "cpu_times": [79.91, 24.21, 23.95, 4.95, 0.0], + "cpu_times": [1010.67, 364.61, 355.1, 90.0, 0.0], "gids": [1000, 1000, 1000], - "io_counters": [537029632, 195117056, 0, 0, 0], + "io_counters": [800161792, 7131361280, 0, 0, 0], "key": "pid", - "memory_info": [487780352, - 3243282432, - 183926784, + "memory_info": [644706304, + 13331173376, + 158920704, 630784, 0, - 555700224, + 1310646272, 0], - "memory_percent": 6.2233057147261786, + "memory_percent": 8.225432634898736, "name": "firefox", "nice": 0, - "num_threads": 98, + "num_threads": 146, "pid": 3866, "status": "S", "time_since_update": 1, @@ -875,69 +892,69 @@ GET quicklook Get plugin stats:: # curl http://localhost:61208/api/3/quicklook - {"cpu": 28.9, + {"cpu": 28.3, "cpu_hz": 3000000000.0, - "cpu_hz_current": 1588220000.0, + "cpu_hz_current": 1605956000.0000002, "cpu_name": "Intel(R) Core(TM) i7-4500U CPU @ 1.80GHz", - "mem": 38.3, + "mem": 59.8, "percpu": [{"cpu_number": 0, "guest": 0.0, "guest_nice": 0.0, - "idle": 58.0, + "idle": 90.1, "iowait": 0.0, "irq": 0.0, "key": "cpu_number", "nice": 0.0, "softirq": 0.0, "steal": 0.0, - "system": 3.0, - "total": 42.0, - "user": 20.0}, + "system": 2.7, + "total": 9.9, + "user": 7.2}, {"cpu_number": 1, "guest": 0.0, "guest_nice": 0.0, - "idle": 40.0, + "idle": 95.5, "iowait": 0.0, "irq": 0.0, "key": "cpu_number", "nice": 0.0, "softirq": 0.0, "steal": 0.0, - "system": 2.0, - "total": 60.0, - "user": 39.0}, + "system": 0.9, + "total": 4.5, + "user": 3.6}, {"cpu_number": 2, "guest": 0.0, "guest_nice": 0.0, - "idle": 58.0, - "iowait": 1.0, - "irq": 0.0, - "key": "cpu_number", - "nice": 0.0, - "softirq": 0.0, - "steal": 0.0, - "system": 2.0, - "total": 42.0, - "user": 20.0}, - {"cpu_number": 3, - "guest": 0.0, - "guest_nice": 0.0, - "idle": 73.0, + "idle": 23.2, "iowait": 0.0, "irq": 0.0, "key": "cpu_number", "nice": 0.0, "softirq": 0.0, "steal": 0.0, - "system": 2.0, - "total": 27.0, - "user": 6.0}], - "swap": 0.0} + "system": 3.6, + "total": 76.8, + "user": 73.2}, + {"cpu_number": 3, + "guest": 0.0, + "guest_nice": 0.0, + "idle": 77.5, + "iowait": 0.0, + "irq": 0.0, + "key": "cpu_number", + "nice": 0.0, + "softirq": 0.0, + "steal": 0.0, + "system": 0.9, + "total": 22.5, + "user": 21.6}], + "swap": 2.0} Get a specific field:: # curl http://localhost:61208/api/3/quicklook/cpu - {"cpu": 28.9} + {"cpu": 28.3} GET sensors ----------- @@ -1008,7 +1025,7 @@ GET uptime Get plugin stats:: # curl http://localhost:61208/api/3/uptime - {"seconds": 469} + {"seconds": 81023} GET all stats ------------- @@ -1024,33 +1041,33 @@ GET stats history History of a plugin:: # curl http://localhost:61208/api/3/cpu/history - {"system": [["2022-07-27T19:25:01.821257", 3.5], - ["2022-07-27T19:25:02.853268", 3.5], - ["2022-07-27T19:25:03.921269", 0.5]], - "user": [["2022-07-27T19:25:01.821251", 24.7], - ["2022-07-27T19:25:02.853264", 24.7], - ["2022-07-27T19:25:03.921265", 1.9]]} + {"system": [["2022-07-28T17:47:37.780462", 2.2], + ["2022-07-28T17:47:38.809590", 2.2], + ["2022-07-28T17:47:39.883006", 0.4]], + "user": [["2022-07-28T17:47:37.780457", 25.5], + ["2022-07-28T17:47:38.809586", 25.5], + ["2022-07-28T17:47:39.883002", 1.7]]} Limit history to last 2 values:: # curl http://localhost:61208/api/3/cpu/history/2 - {"system": [["2022-07-27T19:25:02.853268", 3.5], - ["2022-07-27T19:25:03.921269", 0.5]], - "user": [["2022-07-27T19:25:02.853264", 24.7], - ["2022-07-27T19:25:03.921265", 1.9]]} + {"system": [["2022-07-28T17:47:38.809590", 2.2], + ["2022-07-28T17:47:39.883006", 0.4]], + "user": [["2022-07-28T17:47:38.809586", 25.5], + ["2022-07-28T17:47:39.883002", 1.7]]} History for a specific field:: # curl http://localhost:61208/api/3/cpu/system/history - {"system": [["2022-07-27T19:25:01.821257", 3.5], - ["2022-07-27T19:25:02.853268", 3.5], - ["2022-07-27T19:25:03.921269", 0.5]]} + {"system": [["2022-07-28T17:47:37.780462", 2.2], + ["2022-07-28T17:47:38.809590", 2.2], + ["2022-07-28T17:47:39.883006", 0.4]]} Limit history for a specific field to last 2 values:: # curl http://localhost:61208/api/3/cpu/system/history - {"system": [["2022-07-27T19:25:02.853268", 3.5], - ["2022-07-27T19:25:03.921269", 0.5]]} + {"system": [["2022-07-28T17:47:38.809590", 2.2], + ["2022-07-28T17:47:39.883006", 0.4]]} GET limits (used for thresholds) -------------------------------- diff --git a/docs/man/glances.1 b/docs/man/glances.1 index 3e329239..053fc902 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" "Jul 27, 2022" "3.2.7_beta01" "Glances" +.TH "GLANCES" "1" "Jul 28, 2022" "3.2.7" "Glances" .SH NAME glances \- An eye on your system .SH SYNOPSIS diff --git a/glances/__init__.py b/glances/__init__.py index 62cef342..f38fd8e7 100644 --- a/glances/__init__.py +++ b/glances/__init__.py @@ -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.2.7_beta01' +__version__ = '3.2.7' __author__ = 'Nicolas Hennion ' __license__ = 'LGPLv3' From f7260fb0d27cb5306e33a51cec4a4e5fed429ecb Mon Sep 17 00:00:00 2001 From: nicolargo Date: Thu, 28 Jul 2022 18:17:04 +0200 Subject: [PATCH 10/10] On the road of version 3.3.0 --- NEWS.rst | 6 ++++++ glances/__init__.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/NEWS.rst b/NEWS.rst index be00a806..d7caa6b8 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -2,6 +2,12 @@ Glances changelog ============================================================================== +=============== +Version 3.3.0 +=============== + + Version under development: see roadmap here https://github.com/nicolargo/glances/milestone/60 + =============== Version 3.2.7 =============== diff --git a/glances/__init__.py b/glances/__init__.py index f38fd8e7..52f38258 100644 --- a/glances/__init__.py +++ b/glances/__init__.py @@ -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.2.7' +__version__ = '3.3.0_beta1' __author__ = 'Nicolas Hennion ' __license__ = 'LGPLv3'