From 8016705d048fab2595f5ff7d8f219fc84947ff4c Mon Sep 17 00:00:00 2001
From: nicolargo <nicolas@nicolargo.com>
Date: Thu, 3 Nov 2022 15:26:43 +0100
Subject: [PATCH 1/3] Correct an issue on alpine.Dockerfile

---
 docker-files/alpine.Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docker-files/alpine.Dockerfile b/docker-files/alpine.Dockerfile
index d8f3e09c..e7b14a49 100644
--- a/docker-files/alpine.Dockerfile
+++ b/docker-files/alpine.Dockerfile
@@ -51,9 +51,10 @@ RUN pip3 install --no-cache-dir --user glances
 
 ##############################################################################
 
-FROM buildRequirements as buildOptionalRequirements
+FROM build as buildOptionalRequirements
 ARG PYTHON_VERSION
 
+COPY requirements.txt .
 COPY optional-requirements.txt .
 RUN CASS_DRIVER_NO_CYTHON=1 pip3 install --no-cache-dir --user -r optional-requirements.txt
 

From cd520655efe177cb4dcbcac17110e94ab6211300 Mon Sep 17 00:00:00 2001
From: nicolargo <nicolas@nicolargo.com>
Date: Thu, 3 Nov 2022 15:29:20 +0100
Subject: [PATCH 2/3] version 3.3.0.4

---
 NEWS.rst            |   2 +-
 docs/api.rst        | 451 +++++++++++++++++++++-----------------------
 docs/man/glances.1  |   2 +-
 glances/__init__.py |   2 +-
 4 files changed, 215 insertions(+), 242 deletions(-)

diff --git a/NEWS.rst b/NEWS.rst
index 6609973b..d876a860 100644
--- a/NEWS.rst
+++ b/NEWS.rst
@@ -9,7 +9,7 @@ Version 3.3.1
     Under development, see milestone https://github.com/nicolargo/glances/milestone/61
 
 ===============
-Version 3.3.0.3
+Version 3.3.0.4
 ===============
 
 Refactor the Docker images factory, from now, only Alpine image wll be provided.
diff --git a/docs/api.rst b/docs/api.rst
index ac953654..31d7f9ef 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.907616376876831},
+      "timer": 0.8577334880828857},
      {"count": 0,
       "countmax": 20.0,
       "countmin": None,
@@ -83,7 +83,7 @@ Get plugin stats::
       "refresh": 3.0,
       "regex": True,
       "result": None,
-      "timer": 0.9074501991271973}]
+      "timer": 0.8575551509857178}]
 
 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.907616376876831}]}
+                  "timer": 0.8577334880828857}]}
 
 GET core
 --------
@@ -131,19 +131,19 @@ Get plugin stats::
      "ctx_switches": 0,
      "guest": 0.0,
      "guest_nice": 0.0,
-     "idle": 31.2,
+     "idle": 56.6,
      "interrupts": 0,
-     "iowait": 0.3,
+     "iowait": 0.2,
      "irq": 0.0,
      "nice": 0.0,
      "soft_interrupts": 0,
-     "softirq": 0.3,
+     "softirq": 0.0,
      "steal": 0.0,
      "syscalls": 0,
-     "system": 16.3,
+     "system": 6.9,
      "time_since_update": 1,
-     "total": 68.6,
-     "user": 51.8}
+     "total": 44.6,
+     "user": 36.3}
 
 Fields descriptions:
 
@@ -166,7 +166,7 @@ Fields descriptions:
 Get a specific field::
 
     # curl http://localhost:61208/api/3/cpu/total
-    {"total": 68.6}
+    {"total": 44.6}
 
 GET diskio
 ----------
@@ -232,13 +232,13 @@ Get plugin stats::
 
     # curl http://localhost:61208/api/3/fs
     [{"device_name": "/dev/mapper/ubuntu--gnome--vg-root",
-      "free": 64597147648,
+      "free": 64636698624,
       "fs_type": "ext4",
       "key": "mnt_point",
       "mnt_point": "/",
       "percent": 72.0,
       "size": 243334156288,
-      "used": 166349553664},
+      "used": 166310002688},
      {"device_name": "zsfpool",
       "free": 41811968,
       "fs_type": "zfs",
@@ -257,13 +257,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": 64597147648,
+            "free": 64636698624,
             "fs_type": "ext4",
             "key": "mnt_point",
             "mnt_point": "/",
             "percent": 72.0,
             "size": 243334156288,
-            "used": 166349553664}]}
+            "used": 166310002688}]}
 
 GET ip
 ------
@@ -289,10 +289,7 @@ GET load
 Get plugin stats::
 
     # curl http://localhost:61208/api/3/load
-    {"cpucore": 4,
-     "min1": 3.93310546875,
-     "min15": 1.45654296875,
-     "min5": 1.90234375}
+    {"cpucore": 4, "min1": 2.04541015625, "min15": 1.93603515625, "min5": 2.21875}
 
 Fields descriptions:
 
@@ -304,7 +301,7 @@ Fields descriptions:
 Get a specific field::
 
     # curl http://localhost:61208/api/3/load/min1
-    {"min1": 3.93310546875}
+    {"min1": 2.04541015625}
 
 GET mem
 -------
@@ -312,16 +309,16 @@ GET mem
 Get plugin stats::
 
     # curl http://localhost:61208/api/3/mem
-    {"active": 2785243136,
-     "available": 2688724992,
-     "buffers": 335642624,
-     "cached": 3159732224,
-     "free": 2688724992,
-     "inactive": 3652173824,
-     "percent": 65.7,
-     "shared": 656850944,
+    {"active": 2864410624,
+     "available": 2522054656,
+     "buffers": 289193984,
+     "cached": 3059560448,
+     "free": 2522054656,
+     "inactive": 3469127680,
+     "percent": 67.8,
+     "shared": 689233920,
      "total": 7836188672,
-     "used": 5147463680}
+     "used": 5314134016}
 
 Fields descriptions:
 
@@ -348,13 +345,13 @@ GET memswap
 Get plugin stats::
 
     # curl http://localhost:61208/api/3/memswap
-    {"free": 4102291456,
-     "percent": 49.2,
-     "sin": 2500702208,
-     "sout": 8687992832,
+    {"free": 4256505856,
+     "percent": 47.3,
+     "sin": 2737213440,
+     "sout": 8771731456,
      "time_since_update": 1,
      "total": 8082419712,
-     "used": 3980128256}
+     "used": 3825913856}
 
 Fields descriptions:
 
@@ -378,29 +375,29 @@ Get plugin stats::
 
     # curl http://localhost:61208/api/3/network
     [{"alias": None,
-      "cumulative_cx": 447086708,
-      "cumulative_rx": 223543354,
-      "cumulative_tx": 223543354,
-      "cx": 5508,
+      "cumulative_cx": 449461276,
+      "cumulative_rx": 224730638,
+      "cumulative_tx": 224730638,
+      "cx": 6686,
       "interface_name": "lo",
       "is_up": True,
       "key": "interface_name",
-      "rx": 2754,
+      "rx": 3343,
       "speed": 0,
       "time_since_update": 1,
-      "tx": 2754},
+      "tx": 3343},
      {"alias": None,
-      "cumulative_cx": 9965024132,
-      "cumulative_rx": 9332509571,
-      "cumulative_tx": 632514561,
-      "cx": 36232,
+      "cumulative_cx": 10025928817,
+      "cumulative_rx": 9388587487,
+      "cumulative_tx": 637341330,
+      "cx": 27382,
       "interface_name": "wlp2s0",
       "is_up": True,
       "key": "interface_name",
-      "rx": 27771,
+      "rx": 20981,
       "speed": 0,
       "time_since_update": 1,
-      "tx": 8461}]
+      "tx": 6401}]
 
 Fields descriptions:
 
@@ -430,17 +427,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": 447086708,
-             "cumulative_rx": 223543354,
-             "cumulative_tx": 223543354,
-             "cx": 5508,
+             "cumulative_cx": 449461276,
+             "cumulative_rx": 224730638,
+             "cumulative_tx": 224730638,
+             "cx": 6686,
              "interface_name": "lo",
              "is_up": True,
              "key": "interface_name",
-             "rx": 2754,
+             "rx": 3343,
              "speed": 0,
              "time_since_update": 1,
-             "tx": 2754}]}
+             "tx": 3343}]}
 
 GET now
 -------
@@ -448,7 +445,7 @@ GET now
 Get plugin stats::
 
     # curl http://localhost:61208/api/3/now
-    "2022-11-03 15:11:38 CET"
+    "2022-11-03 15:28:12 CET"
 
 GET percpu
 ----------
@@ -459,29 +456,29 @@ Get plugin stats::
     [{"cpu_number": 0,
       "guest": 0.0,
       "guest_nice": 0.0,
-      "idle": 25.4,
+      "idle": 37.0,
       "iowait": 0.0,
       "irq": 0.0,
       "key": "cpu_number",
       "nice": 0.0,
       "softirq": 0.0,
       "steal": 0.0,
-      "system": 13.5,
-      "total": 74.6,
-      "user": 61.1},
+      "system": 6.5,
+      "total": 63.0,
+      "user": 56.5},
      {"cpu_number": 1,
       "guest": 0.0,
       "guest_nice": 0.0,
-      "idle": 17.1,
+      "idle": 64.5,
       "iowait": 0.0,
       "irq": 0.0,
       "key": "cpu_number",
       "nice": 0.0,
       "softirq": 0.0,
       "steal": 0.0,
-      "system": 13.0,
-      "total": 82.9,
-      "user": 69.9}]
+      "system": 6.5,
+      "total": 35.5,
+      "user": 29.0}]
 
 Get a specific field::
 
@@ -500,7 +497,7 @@ Get plugin stats::
       "port": 0,
       "refresh": 30,
       "rtt_warning": None,
-      "status": 0.009095,
+      "status": 0.00666,
       "timeout": 3}]
 
 Get a specific field::
@@ -517,7 +514,7 @@ Get a specific item when field matchs the given value::
                         "port": 0,
                         "refresh": 30,
                         "rtt_warning": None,
-                        "status": 0.009095,
+                        "status": 0.00666,
                         "timeout": 3}]}
 
 GET processcount
@@ -526,12 +523,12 @@ GET processcount
 Get plugin stats::
 
     # curl http://localhost:61208/api/3/processcount
-    {"pid_max": 0, "running": 2, "sleeping": 323, "thread": 1669, "total": 397}
+    {"pid_max": 0, "running": 1, "sleeping": 326, "thread": 1659, "total": 391}
 
 Get a specific field::
 
     # curl http://localhost:61208/api/3/processcount/total
-    {"total": 397}
+    {"total": 391}
 
 GET processlist
 ---------------
@@ -539,7 +536,22 @@ GET processlist
 Get plugin stats::
 
     # curl http://localhost:61208/api/3/processlist
-    [{"cmdline": ["/snap/firefox/1943/usr/lib/firefox/firefox",
+    [{"cmdline": ["/snap/firefox/1943/usr/lib/firefox/firefox"],
+      "cpu_percent": 0.0,
+      "cpu_times": pcputimes(user=8263.22, system=2791.59, children_user=7778.17, children_system=1384.45, iowait=0.0),
+      "gids": pgids(real=1000, effective=1000, saved=1000),
+      "io_counters": [4759993344, 9646694400, 0, 0, 0],
+      "key": "pid",
+      "memory_info": pmem(rss=457252864, vms=13290209280, shared=124047360, text=634880, lib=0, data=1298206720, dirty=0),
+      "memory_percent": 5.835143628353924,
+      "name": "firefox",
+      "nice": 0,
+      "num_threads": 151,
+      "pid": 252940,
+      "status": "S",
+      "time_since_update": 1,
+      "username": "nicolargo"},
+     {"cmdline": ["/snap/firefox/1943/usr/lib/firefox/firefox",
                   "-contentproc",
                   "-childID",
                   "1",
@@ -559,178 +571,166 @@ Get plugin stats::
                   "true",
                   "tab"],
       "cpu_percent": 0.0,
-      "cpu_times": pcputimes(user=1444.66, system=280.48, children_user=0.0, children_system=0.0, iowait=0.0),
+      "cpu_times": pcputimes(user=1478.27, system=286.18, children_user=0.0, children_system=0.0, iowait=0.0),
       "gids": pgids(real=1000, effective=1000, saved=1000),
-      "io_counters": [187703296, 0, 0, 0, 0],
+      "io_counters": [201466880, 0, 0, 0, 0],
       "key": "pid",
-      "memory_info": pmem(rss=432242688, vms=3539845120, shared=63496192, text=634880, lib=0, data=954109952, dirty=0),
-      "memory_percent": 5.5159811241461645,
+      "memory_info": pmem(rss=449581056, vms=3538014208, shared=79355904, text=634880, lib=0, data=936325120, dirty=0),
+      "memory_percent": 5.737241340377977,
       "name": "WebExtensions",
       "nice": 0,
       "num_threads": 20,
       "pid": 253132,
       "status": "S",
       "time_since_update": 1,
-      "username": "nicolargo"},
-     {"cmdline": ["/snap/firefox/1943/usr/lib/firefox/firefox"],
-      "cpu_percent": 0.0,
-      "cpu_times": pcputimes(user=8109.63, system=2748.28, children_user=7689.53, children_system=1363.67, iowait=0.0),
-      "gids": pgids(real=1000, effective=1000, saved=1000),
-      "io_counters": [4636195840, 9528066048, 0, 0, 0],
-      "key": "pid",
-      "memory_info": pmem(rss=412852224, vms=13106331648, shared=104534016, text=634880, lib=0, data=1161588736, dirty=0),
-      "memory_percent": 5.268533483314272,
-      "name": "firefox",
-      "nice": 0,
-      "num_threads": 141,
-      "pid": 252940,
-      "status": "S",
-      "time_since_update": 1,
       "username": "nicolargo"}]
 
 Get a specific field::
 
     # curl http://localhost:61208/api/3/processlist/pid
-    {"pid": [253132,
-             252940,
-             590528,
+    {"pid": [252940,
+             253132,
              3549,
-             590488,
+             590528,
              253182,
+             590488,
              479037,
-             253186,
-             598724,
              479255,
+             604831,
+             253186,
              479104,
              17347,
              549166,
-             600987,
              253147,
-             551388,
-             601048,
              51440,
              478972,
-             426999,
+             605269,
+             601048,
              479089,
-             600295,
-             597870,
-             600633,
-             600923,
-             600524,
-             479007,
+             605726,
+             605889,
+             606103,
              450641,
-             590512,
+             602074,
              480067,
+             479007,
+             597870,
              482393,
-             601101,
-             546430,
-             495478,
-             4055,
+             590512,
              3499,
+             606244,
+             603305,
+             546430,
+             4055,
+             602075,
+             495478,
+             3958,
              2245,
              546431,
+             479112,
              521697,
              521756,
              590492,
-             479112,
-             3958,
              253071,
              253654,
+             557500,
              521757,
-             450239,
+             16698,
              479015,
+             450239,
              521726,
              255947,
              479296,
-             557500,
              2917,
-             2429,
              3651,
              449090,
-             3364,
+             2429,
              3844,
+             3364,
              521696,
+             4977,
+             450957,
              3744,
              1369,
              3743,
-             450957,
-             4977,
-             17754,
-             4062,
-             17373,
-             1,
-             566917,
-             107498,
              17566,
-             3627,
+             17373,
+             4062,
+             17754,
+             1,
              3737,
-             1391,
+             3627,
+             107498,
              3929,
+             1391,
+             566917,
+             1415,
              478976,
-             19717,
-             3618,
              3760,
              544074,
+             3618,
              17501,
-             1415,
+             19717,
              3742,
              3345,
              1587,
+             603476,
+             3528,
              107499,
              492260,
              4087,
              3663,
              544139,
+             1945,
              3806,
-             3528,
+             3592,
              478977,
              17308,
-             1945,
-             109608,
              3736,
+             109608,
              3353,
              1381,
              17346,
              3557,
-             3592,
+             480091,
              17292,
              3750,
              2371,
-             1368,
              1416,
+             1368,
              1593,
              3745,
-             17755,
              3637,
              1487,
+             17755,
+             3378,
              2412,
              1352,
              2187,
              3891,
              3739,
              3817,
-             480091,
-             3378,
-             51420,
              1408,
+             3373,
+             51420,
              15018,
              1917,
              3799,
+             3616,
              14997,
              3697,
-             1615,
              3380,
+             1615,
              17237,
              1392,
              3943,
-             3599,
              54676,
+             3599,
              3588,
+             483374,
              1375,
              3905,
              3755,
-             16698,
-             483374,
              3547,
              3633,
              1407,
@@ -739,49 +739,48 @@ Get a specific field::
              3604,
              3444,
              3569,
-             3583,
              523017,
+             3583,
              3734,
-             3373,
              3747,
              1397,
              3753,
              3748,
              17238,
              3804,
-             3616,
-             3362,
              1365,
-             4518,
-             568870,
+             3362,
              1412,
              3437,
              3729,
-             3361,
-             1360,
              3385,
+             3361,
+             4518,
+             1360,
+             568870,
              3556,
+             479311,
              3517,
              54624,
              282637,
              1399,
              1743,
-             479311,
-             568871,
              1377,
              1176,
              17258,
+             602118,
              1367,
+             568871,
              2405,
+             450933,
              1470,
              2920,
+             606201,
              3953,
              17516,
              2406,
-             600957,
              181215,
              58637,
-             450933,
              478993,
              58407,
              54523,
@@ -790,8 +789,8 @@ Get a specific field::
              181225,
              1353,
              478979,
-             601099,
              181228,
+             606243,
              2208,
              3733,
              4187,
@@ -963,71 +962,45 @@ Get a specific field::
              557406,
              557407,
              557455,
-             572045,
-             593242,
-             593509,
-             593607,
-             595904,
-             598308,
-             598508,
-             598537,
-             598538,
              599164,
-             599266,
              599474,
-             599491,
-             599602,
              600213,
-             600362,
-             600468,
-             600600,
-             600601,
              600792,
              600828,
              600991,
              600996,
-             601037,
-             601072]}
+             601072,
+             602168,
+             604267,
+             604944,
+             605001,
+             605075,
+             605094,
+             605572,
+             605573,
+             605888]}
 
 Get a specific item when field matchs the given value::
 
-    # curl http://localhost:61208/api/3/processlist/pid/253132
-    {"253132": [{"cmdline": ["/snap/firefox/1943/usr/lib/firefox/firefox",
-                             "-contentproc",
-                             "-childID",
-                             "1",
-                             "-isForBrowser",
-                             "-prefsLen",
-                             "30965",
-                             "-prefMapSize",
-                             "235589",
-                             "-jsInitLen",
-                             "246848",
-                             "-parentBuildID",
-                             "20221007191409",
-                             "-appDir",
-                             "/snap/firefox/1943/usr/lib/firefox/browser",
-                             "{9845d5f8-7cf9-4af9-9d46-4d914b28196f}",
-                             "252940",
-                             "true",
-                             "tab"],
+    # curl http://localhost:61208/api/3/processlist/pid/252940
+    {"252940": [{"cmdline": ["/snap/firefox/1943/usr/lib/firefox/firefox"],
                  "cpu_percent": 0.0,
-                 "cpu_times": [1444.66, 280.48, 0.0, 0.0, 0.0],
+                 "cpu_times": [8263.22, 2791.59, 7778.17, 1384.45, 0.0],
                  "gids": [1000, 1000, 1000],
-                 "io_counters": [187703296, 0, 0, 0, 0],
+                 "io_counters": [4759993344, 9646694400, 0, 0, 0],
                  "key": "pid",
-                 "memory_info": [432242688,
-                                 3539845120,
-                                 63496192,
+                 "memory_info": [457252864,
+                                 13290209280,
+                                 124047360,
                                  634880,
                                  0,
-                                 954109952,
+                                 1298206720,
                                  0],
-                 "memory_percent": 5.5159811241461645,
-                 "name": "WebExtensions",
+                 "memory_percent": 5.835143628353924,
+                 "name": "firefox",
                  "nice": 0,
-                 "num_threads": 20,
-                 "pid": 253132,
+                 "num_threads": 151,
+                 "pid": 252940,
                  "status": "S",
                  "time_since_update": 1,
                  "username": "nicolargo"}]}
@@ -1046,69 +1019,69 @@ GET quicklook
 Get plugin stats::
 
     # curl http://localhost:61208/api/3/quicklook
-    {"cpu": 68.6,
+    {"cpu": 44.6,
      "cpu_hz": 1700000000.0,
-     "cpu_hz_current": 1698025750.0,
+     "cpu_hz_current": 1472035750.0,
      "cpu_name": "Intel(R) Core(TM) i7-4500U CPU @ 1.80GHz",
-     "mem": 65.7,
+     "mem": 67.8,
      "percpu": [{"cpu_number": 0,
                  "guest": 0.0,
                  "guest_nice": 0.0,
-                 "idle": 25.4,
+                 "idle": 37.0,
                  "iowait": 0.0,
                  "irq": 0.0,
                  "key": "cpu_number",
                  "nice": 0.0,
                  "softirq": 0.0,
                  "steal": 0.0,
-                 "system": 13.5,
-                 "total": 74.6,
-                 "user": 61.1},
+                 "system": 6.5,
+                 "total": 63.0,
+                 "user": 56.5},
                 {"cpu_number": 1,
                  "guest": 0.0,
                  "guest_nice": 0.0,
-                 "idle": 17.1,
+                 "idle": 64.5,
                  "iowait": 0.0,
                  "irq": 0.0,
                  "key": "cpu_number",
                  "nice": 0.0,
                  "softirq": 0.0,
                  "steal": 0.0,
-                 "system": 13.0,
-                 "total": 82.9,
-                 "user": 69.9},
+                 "system": 6.5,
+                 "total": 35.5,
+                 "user": 29.0},
                 {"cpu_number": 2,
                  "guest": 0.0,
                  "guest_nice": 0.0,
-                 "idle": 44.5,
-                 "iowait": 0.8,
+                 "idle": 74.0,
+                 "iowait": 0.0,
                  "irq": 0.0,
                  "key": "cpu_number",
                  "nice": 0.0,
-                 "softirq": 1.7,
+                 "softirq": 0.0,
                  "steal": 0.0,
-                 "system": 16.8,
-                 "total": 55.5,
-                 "user": 36.1},
+                 "system": 6.7,
+                 "total": 26.0,
+                 "user": 19.2},
                 {"cpu_number": 3,
                  "guest": 0.0,
                  "guest_nice": 0.0,
-                 "idle": 37.7,
-                 "iowait": 0.8,
+                 "idle": 47.6,
+                 "iowait": 0.0,
                  "irq": 0.0,
                  "key": "cpu_number",
                  "nice": 0.0,
-                 "softirq": 0.8,
+                 "softirq": 0.0,
                  "steal": 0.0,
-                 "system": 16.4,
-                 "total": 62.3,
-                 "user": 44.3}],
-     "swap": 49.2}
+                 "system": 2.9,
+                 "total": 52.4,
+                 "user": 49.5}],
+     "swap": 47.3}
 
 Get a specific field::
 
     # curl http://localhost:61208/api/3/quicklook/cpu
-    {"cpu": 68.6}
+    {"cpu": 44.6}
 
 GET sensors
 -----------
@@ -1179,7 +1152,7 @@ GET uptime
 Get plugin stats::
 
     # curl http://localhost:61208/api/3/uptime
-    {"seconds": 1661399}
+    {"seconds": 1662393}
 
 GET all stats
 -------------
@@ -1195,33 +1168,33 @@ GET stats history
 History of a plugin::
 
     # curl http://localhost:61208/api/3/cpu/history
-    {"system": [["2022-11-03T15:11:38.948598", 16.3],
-                ["2022-11-03T15:11:40.052559", 16.3],
-                ["2022-11-03T15:11:41.350357", 13.9]],
-     "user": [["2022-11-03T15:11:38.948569", 51.8],
-              ["2022-11-03T15:11:40.052552", 51.8],
-              ["2022-11-03T15:11:41.350342", 32.8]]}
+    {"system": [["2022-11-03T15:28:13.350934", 6.9],
+                ["2022-11-03T15:28:14.423145", 6.9],
+                ["2022-11-03T15:28:15.646191", 4.0]],
+     "user": [["2022-11-03T15:28:13.350910", 36.3],
+              ["2022-11-03T15:28:14.423138", 36.3],
+              ["2022-11-03T15:28:15.646180", 11.4]]}
 
 Limit history to last 2 values::
 
     # curl http://localhost:61208/api/3/cpu/history/2
-    {"system": [["2022-11-03T15:11:40.052559", 16.3],
-                ["2022-11-03T15:11:41.350357", 13.9]],
-     "user": [["2022-11-03T15:11:40.052552", 51.8],
-              ["2022-11-03T15:11:41.350342", 32.8]]}
+    {"system": [["2022-11-03T15:28:14.423145", 6.9],
+                ["2022-11-03T15:28:15.646191", 4.0]],
+     "user": [["2022-11-03T15:28:14.423138", 36.3],
+              ["2022-11-03T15:28:15.646180", 11.4]]}
 
 History for a specific field::
 
     # curl http://localhost:61208/api/3/cpu/system/history
-    {"system": [["2022-11-03T15:11:38.948598", 16.3],
-                ["2022-11-03T15:11:40.052559", 16.3],
-                ["2022-11-03T15:11:41.350357", 13.9]]}
+    {"system": [["2022-11-03T15:28:13.350934", 6.9],
+                ["2022-11-03T15:28:14.423145", 6.9],
+                ["2022-11-03T15:28:15.646191", 4.0]]}
 
 Limit history for a specific field to last 2 values::
 
     # curl http://localhost:61208/api/3/cpu/system/history
-    {"system": [["2022-11-03T15:11:40.052559", 16.3],
-                ["2022-11-03T15:11:41.350357", 13.9]]}
+    {"system": [["2022-11-03T15:28:14.423145", 6.9],
+                ["2022-11-03T15:28:15.646191", 4.0]]}
 
 GET limits (used for thresholds)
 --------------------------------
diff --git a/docs/man/glances.1 b/docs/man/glances.1
index 0ecf64d1..4784f867 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" "Nov 03, 2022" "3.3.0.3" "Glances"
+.TH "GLANCES" "1" "Nov 03, 2022" "3.3.0.4" "Glances"
 .SH NAME
 glances \- An eye on your system
 .SH SYNOPSIS
diff --git a/glances/__init__.py b/glances/__init__.py
index d21cf0f4..b49f0afa 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.3.0.3'
+__version__ = '3.3.0.4'
 __author__ = 'Nicolas Hennion <nicolas@nicolargo.com>'
 __license__ = 'LGPLv3'
 

From 894e046adc9ad3e0562d997a4c845f65cbcedb61 Mon Sep 17 00:00:00 2001
From: nicolargo <nicolas@nicolargo.com>
Date: Thu, 3 Nov 2022 15:33:03 +0100
Subject: [PATCH 3/3] Revert a miss

---
 .github/workflows/build.yml                   |  18 +-
 .github/workflows/codeql-analysis.yml         |   2 +-
 .github/workflows/test.yml                    |   4 +-
 Makefile                                      |   3 +
 README.rst                                    |  22 +-
 docs/api.rst                                  | 248 +++++++++---------
 docs/conf.py                                  |   2 +
 docs/man/glances.1                            |   2 +-
 glances/__init__.py                           |   2 +-
 glances/autodiscover.py                       |   3 +
 glances/outputs/glances_bottle.py             |   3 +-
 .../js/components/plugin-processcount.vue     |  11 +
 glances/outputs/static/package-lock.json      |  13 +-
 glances/outputs/static/public/glances.js      | Bin 415852 -> 415967 bytes
 glances/password.py                           |   4 +-
 glances/plugins/glances_help.py               |   7 +-
 glances/server.py                             |   8 +-
 optional-requirements.txt                     |   8 +-
 snap/snapcraft.yaml                           |   5 +-
 unitest-restful.py                            |   7 +-
 unitest-xmlrpc.py                             |   7 +-
 21 files changed, 206 insertions(+), 173 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c861028d..2d9d1376 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -25,7 +25,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Install pip install build tools
         run: >-
@@ -100,43 +100,43 @@ jobs:
         tag: ${{ fromJson(needs.create_Docker_builds.outputs.tags) }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Retrieve Repository Docker metadata
         id: docker_meta
-        uses: crazy-max/ghaction-docker-meta@v2.5.0
+        uses: crazy-max/ghaction-docker-meta@v4.1.1
         with:
           images: ${{ env.DEFAULT_DOCKER_IMAGE }}
           labels: |
             org.opencontainers.image.url=https://nicolargo.github.io/glances/
 
       - name: Cache Docker layers
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-${{ env.NODE_ENV }}-${{ matrix.os }}-${{ matrix.tag.tag }}
           restore-keys: ${{ runner.os }}-buildx-${{ env.NODE_ENV }}-${{ matrix.os }}
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
         with:
           platforms: all
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
         with:
           version: latest
 
       - name: Login to DockerHub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         if: ${{ env.PUSH_BRANCH == 'true' }}
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
+          password: ${{ secrets.DOCKER_TOKEN }}
 
       - name: Build and push image
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           push: ${{ env.PUSH_BRANCH == 'true' }}
           tags: "${{ env.DEFAULT_DOCKER_IMAGE }}:${{ matrix.os != 'alpine' && format('{0}-', matrix.os) || '' }}${{ matrix.tag.tag }}"
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 36ab13d6..d3237f44 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -39,7 +39,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e8058311..77841f0c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -14,10 +14,10 @@ jobs:
 
     steps:
 
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
 
diff --git a/Makefile b/Makefile
index 92fd4654..993bda07 100644
--- a/Makefile
+++ b/Makefile
@@ -101,6 +101,9 @@ webui: venv-dev-upgrade ## Build the Web UI
 webui-audit: venv-dev-upgrade ## Audit the Web UI
 	cd glances/outputs/static/ && npm audit
 
+webui-audit-fix: venv-dev-upgrade ## Fix audit the Web UI
+	cd glances/outputs/static/ && npm audit fix && npm ci && npm run build
+
 # ===================================================================
 # Packaging
 # ===================================================================
diff --git a/README.rst b/README.rst
index b5b5b4b9..2cc9f924 100644
--- a/README.rst
+++ b/README.rst
@@ -57,6 +57,18 @@ Glances is written in Python and uses libraries to grab information from
 your system. It is based on an open architecture where developers can
 add new plugins or exports modules.
 
+Project sponsorship
+===================
+
+You can help me to achieve my goals of improving this open-source project
+or just say "thank you" by:
+
+- sponsor me using one-time or monthly tier Github sponsors_ page
+- send me some pieces of bitcoin: 185KN9FCix3svJYp7JQM7hRMfSKyeaJR4X
+- buy me a gift on my wishlist_ page
+
+Any and all contributions are greatly appreciated.
+
 Requirements
 ============
 
@@ -437,15 +449,6 @@ There is also a chat dedicated to the Glances developers:
 .. image:: https://badges.gitter.im/Join%20Chat.svg
         :target: https://gitter.im/nicolargo/glances?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
 
-Donation
-========
-
-If you like this open-source project, you can become a sponsor.
-
-See the Github sponsors_ page (one-time or monthly tier available).
-
-Or send me some bitcoins: 185KN9FCix3svJYp7JQM7hRMfSKyeaJR4X
-
 Author
 ======
 
@@ -468,5 +471,6 @@ 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
+.. _wishlist: https://www.amazon.fr/hz/wishlist/ls/BWAAQKWFR3FI?ref_=wl_share
 .. _issue2021: https://github.com/nicolargo/glances/issues/2021#issuecomment-1197831157
 .. _issue2021comment: https://github.com/nicolargo/glances/issues/2021#issuecomment-1197831157
\ No newline at end of file
diff --git a/docs/api.rst b/docs/api.rst
index 31d7f9ef..4609b516 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.8577334880828857},
+      "timer": 0.82912278175354},
      {"count": 0,
       "countmax": 20.0,
       "countmin": None,
@@ -83,7 +83,7 @@ Get plugin stats::
       "refresh": 3.0,
       "regex": True,
       "result": None,
-      "timer": 0.8575551509857178}]
+      "timer": 0.8289539813995361}]
 
 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.8577334880828857}]}
+                  "timer": 0.82912278175354}]}
 
 GET core
 --------
@@ -131,19 +131,19 @@ Get plugin stats::
      "ctx_switches": 0,
      "guest": 0.0,
      "guest_nice": 0.0,
-     "idle": 56.6,
+     "idle": 60.1,
      "interrupts": 0,
-     "iowait": 0.2,
+     "iowait": 0.0,
      "irq": 0.0,
      "nice": 0.0,
      "soft_interrupts": 0,
-     "softirq": 0.0,
+     "softirq": 0.2,
      "steal": 0.0,
      "syscalls": 0,
-     "system": 6.9,
+     "system": 5.3,
      "time_since_update": 1,
-     "total": 44.6,
-     "user": 36.3}
+     "total": 40.6,
+     "user": 34.4}
 
 Fields descriptions:
 
@@ -166,7 +166,7 @@ Fields descriptions:
 Get a specific field::
 
     # curl http://localhost:61208/api/3/cpu/total
-    {"total": 44.6}
+    {"total": 40.6}
 
 GET diskio
 ----------
@@ -232,13 +232,13 @@ Get plugin stats::
 
     # curl http://localhost:61208/api/3/fs
     [{"device_name": "/dev/mapper/ubuntu--gnome--vg-root",
-      "free": 64636698624,
+      "free": 64636235776,
       "fs_type": "ext4",
       "key": "mnt_point",
       "mnt_point": "/",
       "percent": 72.0,
       "size": 243334156288,
-      "used": 166310002688},
+      "used": 166310465536},
      {"device_name": "zsfpool",
       "free": 41811968,
       "fs_type": "zfs",
@@ -257,13 +257,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": 64636698624,
+            "free": 64636235776,
             "fs_type": "ext4",
             "key": "mnt_point",
             "mnt_point": "/",
             "percent": 72.0,
             "size": 243334156288,
-            "used": 166310002688}]}
+            "used": 166310465536}]}
 
 GET ip
 ------
@@ -289,7 +289,7 @@ GET load
 Get plugin stats::
 
     # curl http://localhost:61208/api/3/load
-    {"cpucore": 4, "min1": 2.04541015625, "min15": 1.93603515625, "min5": 2.21875}
+    {"cpucore": 4, "min1": 1.79931640625, "min15": 1.958984375, "min5": 2.16015625}
 
 Fields descriptions:
 
@@ -301,7 +301,7 @@ Fields descriptions:
 Get a specific field::
 
     # curl http://localhost:61208/api/3/load/min1
-    {"min1": 2.04541015625}
+    {"min1": 1.79931640625}
 
 GET mem
 -------
@@ -309,16 +309,16 @@ GET mem
 Get plugin stats::
 
     # curl http://localhost:61208/api/3/mem
-    {"active": 2864410624,
-     "available": 2522054656,
-     "buffers": 289193984,
-     "cached": 3059560448,
-     "free": 2522054656,
-     "inactive": 3469127680,
-     "percent": 67.8,
-     "shared": 689233920,
+    {"active": 2861182976,
+     "available": 2539823104,
+     "buffers": 288755712,
+     "cached": 3050266624,
+     "free": 2539823104,
+     "inactive": 3463237632,
+     "percent": 67.6,
+     "shared": 680669184,
      "total": 7836188672,
-     "used": 5314134016}
+     "used": 5296365568}
 
 Fields descriptions:
 
@@ -345,13 +345,13 @@ GET memswap
 Get plugin stats::
 
     # curl http://localhost:61208/api/3/memswap
-    {"free": 4256505856,
+    {"free": 4256415744,
      "percent": 47.3,
-     "sin": 2737213440,
-     "sout": 8771731456,
+     "sin": 2738352128,
+     "sout": 8773423104,
      "time_since_update": 1,
      "total": 8082419712,
-     "used": 3825913856}
+     "used": 3826003968}
 
 Fields descriptions:
 
@@ -375,29 +375,29 @@ Get plugin stats::
 
     # curl http://localhost:61208/api/3/network
     [{"alias": None,
-      "cumulative_cx": 449461276,
-      "cumulative_rx": 224730638,
-      "cumulative_tx": 224730638,
-      "cx": 6686,
+      "cumulative_cx": 449777162,
+      "cumulative_rx": 224888581,
+      "cumulative_tx": 224888581,
+      "cx": 5508,
       "interface_name": "lo",
       "is_up": True,
       "key": "interface_name",
-      "rx": 3343,
+      "rx": 2754,
       "speed": 0,
       "time_since_update": 1,
-      "tx": 3343},
+      "tx": 2754},
      {"alias": None,
-      "cumulative_cx": 10025928817,
-      "cumulative_rx": 9388587487,
-      "cumulative_tx": 637341330,
-      "cx": 27382,
+      "cumulative_cx": 10026810126,
+      "cumulative_rx": 9389174147,
+      "cumulative_tx": 637635979,
+      "cx": 25944,
       "interface_name": "wlp2s0",
       "is_up": True,
       "key": "interface_name",
-      "rx": 20981,
+      "rx": 19839,
       "speed": 0,
       "time_since_update": 1,
-      "tx": 6401}]
+      "tx": 6105}]
 
 Fields descriptions:
 
@@ -427,17 +427,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": 449461276,
-             "cumulative_rx": 224730638,
-             "cumulative_tx": 224730638,
-             "cx": 6686,
+             "cumulative_cx": 449777162,
+             "cumulative_rx": 224888581,
+             "cumulative_tx": 224888581,
+             "cx": 5508,
              "interface_name": "lo",
              "is_up": True,
              "key": "interface_name",
-             "rx": 3343,
+             "rx": 2754,
              "speed": 0,
              "time_since_update": 1,
-             "tx": 3343}]}
+             "tx": 2754}]}
 
 GET now
 -------
@@ -445,7 +445,7 @@ GET now
 Get plugin stats::
 
     # curl http://localhost:61208/api/3/now
-    "2022-11-03 15:28:12 CET"
+    "2022-11-03 15:30:23 CET"
 
 GET percpu
 ----------
@@ -456,29 +456,29 @@ Get plugin stats::
     [{"cpu_number": 0,
       "guest": 0.0,
       "guest_nice": 0.0,
-      "idle": 37.0,
+      "idle": 59.2,
       "iowait": 0.0,
       "irq": 0.0,
       "key": "cpu_number",
       "nice": 0.0,
       "softirq": 0.0,
       "steal": 0.0,
-      "system": 6.5,
-      "total": 63.0,
-      "user": 56.5},
+      "system": 4.9,
+      "total": 40.8,
+      "user": 35.9},
      {"cpu_number": 1,
       "guest": 0.0,
       "guest_nice": 0.0,
-      "idle": 64.5,
+      "idle": 82.0,
       "iowait": 0.0,
       "irq": 0.0,
       "key": "cpu_number",
       "nice": 0.0,
       "softirq": 0.0,
       "steal": 0.0,
-      "system": 6.5,
-      "total": 35.5,
-      "user": 29.0}]
+      "system": 5.0,
+      "total": 18.0,
+      "user": 13.0}]
 
 Get a specific field::
 
@@ -497,7 +497,7 @@ Get plugin stats::
       "port": 0,
       "refresh": 30,
       "rtt_warning": None,
-      "status": 0.00666,
+      "status": 0.005885,
       "timeout": 3}]
 
 Get a specific field::
@@ -514,7 +514,7 @@ Get a specific item when field matchs the given value::
                         "port": 0,
                         "refresh": 30,
                         "rtt_warning": None,
-                        "status": 0.00666,
+                        "status": 0.005885,
                         "timeout": 3}]}
 
 GET processcount
@@ -523,12 +523,12 @@ GET processcount
 Get plugin stats::
 
     # curl http://localhost:61208/api/3/processcount
-    {"pid_max": 0, "running": 1, "sleeping": 326, "thread": 1659, "total": 391}
+    {"pid_max": 0, "running": 1, "sleeping": 326, "thread": 1654, "total": 389}
 
 Get a specific field::
 
     # curl http://localhost:61208/api/3/processcount/total
-    {"total": 391}
+    {"total": 389}
 
 GET processlist
 ---------------
@@ -538,15 +538,15 @@ Get plugin stats::
     # curl http://localhost:61208/api/3/processlist
     [{"cmdline": ["/snap/firefox/1943/usr/lib/firefox/firefox"],
       "cpu_percent": 0.0,
-      "cpu_times": pcputimes(user=8263.22, system=2791.59, children_user=7778.17, children_system=1384.45, iowait=0.0),
+      "cpu_times": pcputimes(user=8265.26, system=2792.3, children_user=7778.43, children_system=1384.62, iowait=0.0),
       "gids": pgids(real=1000, effective=1000, saved=1000),
-      "io_counters": [4759993344, 9646694400, 0, 0, 0],
+      "io_counters": [4759993344, 9648111616, 0, 0, 0],
       "key": "pid",
-      "memory_info": pmem(rss=457252864, vms=13290209280, shared=124047360, text=634880, lib=0, data=1298206720, dirty=0),
-      "memory_percent": 5.835143628353924,
+      "memory_info": pmem(rss=462217216, vms=13290643456, shared=124010496, text=634880, lib=0, data=1298190336, dirty=0),
+      "memory_percent": 5.898495242356513,
       "name": "firefox",
       "nice": 0,
-      "num_threads": 151,
+      "num_threads": 150,
       "pid": 252940,
       "status": "S",
       "time_since_update": 1,
@@ -571,12 +571,12 @@ Get plugin stats::
                   "true",
                   "tab"],
       "cpu_percent": 0.0,
-      "cpu_times": pcputimes(user=1478.27, system=286.18, children_user=0.0, children_system=0.0, iowait=0.0),
+      "cpu_times": pcputimes(user=1479.73, system=286.38, children_user=0.0, children_system=0.0, iowait=0.0),
       "gids": pgids(real=1000, effective=1000, saved=1000),
       "io_counters": [201466880, 0, 0, 0, 0],
       "key": "pid",
-      "memory_info": pmem(rss=449581056, vms=3538014208, shared=79355904, text=634880, lib=0, data=936325120, dirty=0),
-      "memory_percent": 5.737241340377977,
+      "memory_info": pmem(rss=448593920, vms=3538014208, shared=79355904, text=634880, lib=0, data=936325120, dirty=0),
+      "memory_percent": 5.724644196009476,
       "name": "WebExtensions",
       "nice": 0,
       "num_threads": 20,
@@ -592,8 +592,8 @@ Get a specific field::
              253132,
              3549,
              590528,
-             253182,
              590488,
+             253182,
              479037,
              479255,
              604831,
@@ -604,11 +604,11 @@ Get a specific field::
              253147,
              51440,
              478972,
-             605269,
-             601048,
              479089,
              605726,
+             601048,
              605889,
+             606596,
              606103,
              450641,
              602074,
@@ -618,7 +618,7 @@ Get a specific field::
              482393,
              590512,
              3499,
-             606244,
+             606696,
              603305,
              546430,
              4055,
@@ -635,8 +635,8 @@ Get a specific field::
              253654,
              557500,
              521757,
-             16698,
              479015,
+             16698,
              450239,
              521726,
              255947,
@@ -649,11 +649,11 @@ Get a specific field::
              3364,
              521696,
              4977,
-             450957,
              3744,
              1369,
              3743,
              17566,
+             450957,
              17373,
              4062,
              17754,
@@ -677,8 +677,8 @@ Get a specific field::
              603476,
              3528,
              107499,
-             492260,
              4087,
+             492260,
              3663,
              544139,
              1945,
@@ -775,8 +775,8 @@ Get a specific field::
              450933,
              1470,
              2920,
-             606201,
              3953,
+             606671,
              17516,
              2406,
              181215,
@@ -789,8 +789,8 @@ Get a specific field::
              181225,
              1353,
              478979,
+             606695,
              181228,
-             606243,
              2208,
              3733,
              4187,
@@ -964,9 +964,6 @@ Get a specific field::
              557455,
              599164,
              599474,
-             600213,
-             600792,
-             600828,
              600991,
              600996,
              601072,
@@ -978,28 +975,29 @@ Get a specific field::
              605094,
              605572,
              605573,
-             605888]}
+             605888,
+             606456]}
 
 Get a specific item when field matchs the given value::
 
     # curl http://localhost:61208/api/3/processlist/pid/252940
     {"252940": [{"cmdline": ["/snap/firefox/1943/usr/lib/firefox/firefox"],
                  "cpu_percent": 0.0,
-                 "cpu_times": [8263.22, 2791.59, 7778.17, 1384.45, 0.0],
+                 "cpu_times": [8265.26, 2792.3, 7778.43, 1384.62, 0.0],
                  "gids": [1000, 1000, 1000],
-                 "io_counters": [4759993344, 9646694400, 0, 0, 0],
+                 "io_counters": [4759993344, 9648111616, 0, 0, 0],
                  "key": "pid",
-                 "memory_info": [457252864,
-                                 13290209280,
-                                 124047360,
+                 "memory_info": [462217216,
+                                 13290643456,
+                                 124010496,
                                  634880,
                                  0,
-                                 1298206720,
+                                 1298190336,
                                  0],
-                 "memory_percent": 5.835143628353924,
+                 "memory_percent": 5.898495242356513,
                  "name": "firefox",
                  "nice": 0,
-                 "num_threads": 151,
+                 "num_threads": 150,
                  "pid": 252940,
                  "status": "S",
                  "time_since_update": 1,
@@ -1019,69 +1017,69 @@ GET quicklook
 Get plugin stats::
 
     # curl http://localhost:61208/api/3/quicklook
-    {"cpu": 44.6,
+    {"cpu": 40.6,
      "cpu_hz": 1700000000.0,
-     "cpu_hz_current": 1472035750.0,
+     "cpu_hz_current": 1248027000.0,
      "cpu_name": "Intel(R) Core(TM) i7-4500U CPU @ 1.80GHz",
-     "mem": 67.8,
+     "mem": 67.6,
      "percpu": [{"cpu_number": 0,
                  "guest": 0.0,
                  "guest_nice": 0.0,
-                 "idle": 37.0,
+                 "idle": 59.2,
                  "iowait": 0.0,
                  "irq": 0.0,
                  "key": "cpu_number",
                  "nice": 0.0,
                  "softirq": 0.0,
                  "steal": 0.0,
-                 "system": 6.5,
-                 "total": 63.0,
-                 "user": 56.5},
+                 "system": 4.9,
+                 "total": 40.8,
+                 "user": 35.9},
                 {"cpu_number": 1,
                  "guest": 0.0,
                  "guest_nice": 0.0,
-                 "idle": 64.5,
+                 "idle": 82.0,
                  "iowait": 0.0,
                  "irq": 0.0,
                  "key": "cpu_number",
                  "nice": 0.0,
                  "softirq": 0.0,
                  "steal": 0.0,
-                 "system": 6.5,
-                 "total": 35.5,
-                 "user": 29.0},
+                 "system": 5.0,
+                 "total": 18.0,
+                 "user": 13.0},
                 {"cpu_number": 2,
                  "guest": 0.0,
                  "guest_nice": 0.0,
-                 "idle": 74.0,
+                 "idle": 64.0,
                  "iowait": 0.0,
                  "irq": 0.0,
                  "key": "cpu_number",
                  "nice": 0.0,
                  "softirq": 0.0,
                  "steal": 0.0,
-                 "system": 6.7,
-                 "total": 26.0,
-                 "user": 19.2},
+                 "system": 5.0,
+                 "total": 36.0,
+                 "user": 31.0},
                 {"cpu_number": 3,
                  "guest": 0.0,
                  "guest_nice": 0.0,
-                 "idle": 47.6,
+                 "idle": 34.3,
                  "iowait": 0.0,
                  "irq": 0.0,
                  "key": "cpu_number",
                  "nice": 0.0,
                  "softirq": 0.0,
                  "steal": 0.0,
-                 "system": 2.9,
-                 "total": 52.4,
-                 "user": 49.5}],
+                 "system": 1.0,
+                 "total": 65.7,
+                 "user": 64.7}],
      "swap": 47.3}
 
 Get a specific field::
 
     # curl http://localhost:61208/api/3/quicklook/cpu
-    {"cpu": 44.6}
+    {"cpu": 40.6}
 
 GET sensors
 -----------
@@ -1152,7 +1150,7 @@ GET uptime
 Get plugin stats::
 
     # curl http://localhost:61208/api/3/uptime
-    {"seconds": 1662393}
+    {"seconds": 1662524}
 
 GET all stats
 -------------
@@ -1168,33 +1166,33 @@ GET stats history
 History of a plugin::
 
     # curl http://localhost:61208/api/3/cpu/history
-    {"system": [["2022-11-03T15:28:13.350934", 6.9],
-                ["2022-11-03T15:28:14.423145", 6.9],
-                ["2022-11-03T15:28:15.646191", 4.0]],
-     "user": [["2022-11-03T15:28:13.350910", 36.3],
-              ["2022-11-03T15:28:14.423138", 36.3],
-              ["2022-11-03T15:28:15.646180", 11.4]]}
+    {"system": [["2022-11-03T15:30:24.540635", 5.3],
+                ["2022-11-03T15:30:25.618359", 5.3],
+                ["2022-11-03T15:30:26.877869", 4.3]],
+     "user": [["2022-11-03T15:30:24.540625", 34.4],
+              ["2022-11-03T15:30:25.618348", 34.4],
+              ["2022-11-03T15:30:26.877858", 13.3]]}
 
 Limit history to last 2 values::
 
     # curl http://localhost:61208/api/3/cpu/history/2
-    {"system": [["2022-11-03T15:28:14.423145", 6.9],
-                ["2022-11-03T15:28:15.646191", 4.0]],
-     "user": [["2022-11-03T15:28:14.423138", 36.3],
-              ["2022-11-03T15:28:15.646180", 11.4]]}
+    {"system": [["2022-11-03T15:30:25.618359", 5.3],
+                ["2022-11-03T15:30:26.877869", 4.3]],
+     "user": [["2022-11-03T15:30:25.618348", 34.4],
+              ["2022-11-03T15:30:26.877858", 13.3]]}
 
 History for a specific field::
 
     # curl http://localhost:61208/api/3/cpu/system/history
-    {"system": [["2022-11-03T15:28:13.350934", 6.9],
-                ["2022-11-03T15:28:14.423145", 6.9],
-                ["2022-11-03T15:28:15.646191", 4.0]]}
+    {"system": [["2022-11-03T15:30:24.540635", 5.3],
+                ["2022-11-03T15:30:25.618359", 5.3],
+                ["2022-11-03T15:30:26.877869", 4.3]]}
 
 Limit history for a specific field to last 2 values::
 
     # curl http://localhost:61208/api/3/cpu/system/history
-    {"system": [["2022-11-03T15:28:14.423145", 6.9],
-                ["2022-11-03T15:28:15.646191", 4.0]]}
+    {"system": [["2022-11-03T15:30:25.618359", 5.3],
+                ["2022-11-03T15:30:26.877869", 4.3]]}
 
 GET limits (used for thresholds)
 --------------------------------
diff --git a/docs/conf.py b/docs/conf.py
index 328b5d50..9bed95a3 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -24,8 +24,10 @@ from datetime import datetime
 # Insert Glances' path into the system.
 sys.path.insert(0, os.path.abspath('..'))
 
+# WARNING: Do not move this import before the sys.path.insert() call.
 from glances import __version__
 
+
 # -- General configuration ------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
diff --git a/docs/man/glances.1 b/docs/man/glances.1
index 4784f867..d3bf7346 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" "Nov 03, 2022" "3.3.0.4" "Glances"
+.TH "GLANCES" "1" "Nov 03, 2022" "3.3.1_beta1" "Glances"
 .SH NAME
 glances \- An eye on your system
 .SH SYNOPSIS
diff --git a/glances/__init__.py b/glances/__init__.py
index b49f0afa..4db6663f 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.3.0.4'
+__version__ = '3.3.1_beta1'
 __author__ = 'Nicolas Hennion <nicolas@nicolargo.com>'
 __license__ = 'LGPLv3'
 
diff --git a/glances/autodiscover.py b/glances/autodiscover.py
index f7e86722..b521603f 100644
--- a/glances/autodiscover.py
+++ b/glances/autodiscover.py
@@ -186,6 +186,9 @@ class GlancesAutoDiscoverClient(object):
                     # Issue #528 (no network interface available)
                     pass
 
+            # Ensure zeroconf_bind_address is an IP address not an host
+            zeroconf_bind_address = socket.gethostbyname(zeroconf_bind_address)
+
             # Check IP v4/v6
             address_family = socket.getaddrinfo(zeroconf_bind_address, args.port)[0][0]
 
diff --git a/glances/outputs/glances_bottle.py b/glances/outputs/glances_bottle.py
index cdc54f0e..f2e030cb 100644
--- a/glances/outputs/glances_bottle.py
+++ b/glances/outputs/glances_bottle.py
@@ -127,8 +127,7 @@ class GlancesBottle(object):
         if username == self.args.username:
             from glances.password import GlancesPassword
 
-            pwd = GlancesPassword(username=username,
-                                  config=self.config)
+            pwd = GlancesPassword(username=username, config=self.config)
             return pwd.check_password(self.args.password, pwd.sha256_hash(password))
         else:
             return False
diff --git a/glances/outputs/static/js/components/plugin-processcount.vue b/glances/outputs/static/js/components/plugin-processcount.vue
index a331ef87..aaa86b0e 100644
--- a/glances/outputs/static/js/components/plugin-processcount.vue
+++ b/glances/outputs/static/js/components/plugin-processcount.vue
@@ -5,12 +5,15 @@
         <span>{{ running }} run,</span>
         <span>{{ sleeping }} slp,</span>
         <span>{{ stopped }} oth</span>
+        <span>{{ args.programs ? 'Programs' : 'Threads' }}</span>
         <span class="title">{{ sorter.auto ? 'sorted automatically' : 'sorted' }}</span>
         <span>by {{ sorter.getColumnLabel(sorter.column) }}</span>
     </section>
 </template>
 
 <script>
+import { store } from '../store.js';
+
 export default {
     props: {
         data: {
@@ -20,7 +23,15 @@ export default {
             type: Object
         }
     },
+    data() {
+        return {
+            store
+        };
+    },
     computed: {
+        args() {
+            return this.store.args || {};
+        },
         stats() {
             return this.data.stats['processcount'];
         },
diff --git a/glances/outputs/static/package-lock.json b/glances/outputs/static/package-lock.json
index de4c4d07..c571b655 100644
--- a/glances/outputs/static/package-lock.json
+++ b/glances/outputs/static/package-lock.json
@@ -4,6 +4,7 @@
     "requires": true,
     "packages": {
         "": {
+            "name": "static",
             "dependencies": {
                 "bootstrap": "^3.4.1",
                 "favico.js": "^0.3.10",
@@ -4899,9 +4900,9 @@
             "dev": true
         },
         "node_modules/minimatch": {
-            "version": "3.0.4",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-            "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+            "version": "3.0.8",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.8.tgz",
+            "integrity": "sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==",
             "dev": true,
             "dependencies": {
                 "brace-expansion": "^1.1.7"
@@ -12158,9 +12159,9 @@
             "dev": true
         },
         "minimatch": {
-            "version": "3.0.4",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-            "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+            "version": "3.0.8",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.8.tgz",
+            "integrity": "sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==",
             "dev": true,
             "requires": {
                 "brace-expansion": "^1.1.7"
diff --git a/glances/outputs/static/public/glances.js b/glances/outputs/static/public/glances.js
index db4f5bb65ad7f8ce8ae4ac8945f62a717ce65028..98bbf76af3fdcdeff7c0cc4830c4fd5d1a3738ab 100644
GIT binary patch
delta 82
zcmaE}LGu1a$%Yoj7N!>F7M3lnkAF{BU}STizJ3?0{C1u{thX4aANb44shn7pUaVJ8
il%HOdm|JYG6aZx@St*5N6s0Dn6f0?NzwwuKN)!NTp&;G>

delta 36
scmcb=QS!|O$%Yoj7N!>F7M3lnkAF|EuV>ZV?)r!I7UTBFf2?g$04-b)9smFU

diff --git a/glances/password.py b/glances/password.py
index b34c13e0..08a7303d 100644
--- a/glances/password.py
+++ b/glances/password.py
@@ -41,9 +41,7 @@ class GlancesPassword(object):
         if self.config is None:
             return user_config_dir()
         else:
-            return self.config.get_value('passwords',
-                                         'local_password_path',
-                                         default=user_config_dir())
+            return self.config.get_value('passwords', 'local_password_path', default=user_config_dir())
 
     def sha256_hash(self, plain_password):
         """Return the SHA-256 of the given password."""
diff --git a/glances/plugins/glances_help.py b/glances/plugins/glances_help.py
index ffc374a8..69017f0b 100644
--- a/glances/plugins/glances_help.py
+++ b/glances/plugins/glances_help.py
@@ -14,7 +14,6 @@ Just a stupid plugin to display the help screen.
 """
 import sys
 from glances.compat import iteritems
-from collections import OrderedDict
 from glances import __version__, psutil_version
 from glances.plugins.glances_plugin import GlancesPlugin
 from itertools import chain
@@ -63,7 +62,7 @@ class Plugin(GlancesPlugin):
 
         self.view_data.update(
             [
-                ## First column
+                # First column
                 #
                 ('header_sort', msg_header.format('SORT PROCESSES:')),
                 ('sort_auto', msg_col.format('a', 'Automatically')),
@@ -91,7 +90,7 @@ class Plugin(GlancesPlugin):
                 ('show_hide_wifi_module', msg_col.format('W', 'Wifi')),
                 ('show_hide_processes', msg_col.format('z', 'Processes')),
                 ('show_hide_left_sidebar', msg_col.format('2', 'Left sidebar')),
-                ## Second column
+                # Second column
                 #
                 ('show_hide_quick_look', msg_col.format('3', 'Quick Look')),
                 ('show_hide_cpu_mem_swap', msg_col.format('4', 'CPU, MEM, and SWAP')),
@@ -146,7 +145,7 @@ class Plugin(GlancesPlugin):
 
         ret.append(self.curse_new_line())
 
-        ## key-shortcuts
+        # key-shortcuts
         #
         # Collect all values after the 1st key-msg
         # in a list of curse-lines.
diff --git a/glances/server.py b/glances/server.py
index a4c5e88f..80bafb64 100644
--- a/glances/server.py
+++ b/glances/server.py
@@ -67,7 +67,7 @@ class GlancesXMLRPCHandler(SimpleXMLRPCRequestHandler, object):
         if username in self.server.user_dict:
             from glances.password import GlancesPassword
 
-            pwd = GlancesPassword()
+            pwd = GlancesPassword(username=username, config=self.config)
             return pwd.check_password(self.server.user_dict[username], password)
         else:
             return False
@@ -93,10 +93,11 @@ class GlancesXMLRPCServer(SimpleXMLRPCServer, object):
 
     finished = False
 
-    def __init__(self, bind_address, bind_port=61209, requestHandler=GlancesXMLRPCHandler):
+    def __init__(self, bind_address, bind_port=61209, requestHandler=GlancesXMLRPCHandler, config=None):
 
         self.bind_address = bind_address
         self.bind_port = bind_port
+        self.config = config
         try:
             self.address_family = socket.getaddrinfo(bind_address, bind_port)[0][0]
         except socket.error as e:
@@ -191,7 +192,7 @@ class GlancesServer(object):
 
         # Init the XML RPC server
         try:
-            self.server = GlancesXMLRPCServer(args.bind_address, args.port, requestHandler)
+            self.server = GlancesXMLRPCServer(args.bind_address, args.port, requestHandler, config=config)
         except Exception as e:
             logger.critical("Cannot start Glances server: {}".format(e))
             sys.exit(2)
@@ -211,6 +212,7 @@ class GlancesServer(object):
         if not self.args.disable_autodiscover:
             # Note: The Zeroconf service name will be based on the hostname
             # Correct issue: Zeroconf problem with zeroconf service name #889
+            logger.info('Autodiscover is enabled with service name {}'.format(socket.gethostname().split('.', 1)[0]))
             self.autodiscover_client = GlancesAutoDiscoverClient(socket.gethostname().split('.', 1)[0], args)
         else:
             logger.info("Glances autodiscover announce is disabled")
diff --git a/optional-requirements.txt b/optional-requirements.txt
index 944f55c7..5055853e 100644
--- a/optional-requirements.txt
+++ b/optional-requirements.txt
@@ -11,8 +11,8 @@ docker>=2.0.0
 elasticsearch
 graphitesender
 hddtemp
-influxdb>=1.0.0
-influxdb-client; python_version >= "3.6"
+influxdb>=1.0.0 # For InfluxDB < 1.8
+influxdb-client; python_version >= "3.7" # For InfluxDB >= 1.8
 kafka-python
 netifaces
 py3nvml; python_version >= "3.0"
@@ -32,5 +32,5 @@ six
 sparklines
 statsd
 wifi
-zeroconf==0.19.1; python_version < "3.0"
-zeroconf; python_version >= "3.0"
+zeroconf==0.19.1; python_version < "3.7"
+zeroconf; python_version >= "3.7"
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 3ef5de26..ab8d7446 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -13,7 +13,7 @@ confinement: strict
 
 apps:
   glances:
-    command: glances-launch $SNAP/bin/glances
+    command: bin/glances-launch $SNAP/bin/glances
     plugs:
       - network
       - system-observe
@@ -63,6 +63,7 @@ parts:
       cp -r $SNAPCRAFT_PART_BUILD/dist $SNAPCRAFT_PART_INSTALL/bottle-dist
     organize:
       bottle-dist: bottle/dist
+
   docker:
     plugin: python
     source: https://github.com/docker/docker-py.git
@@ -73,11 +74,13 @@ parts:
       cp -r $SNAPCRAFT_PART_BUILD/dist $SNAPCRAFT_PART_INSTALL/docker-dist
     organize:
       bottle-dist: docker/dist
+
   launchers:
     source: snap/local/launchers
     plugin: dump
     organize:
       '*': bin/
+
   selective-checkout:
     plugin: nil
     build-packages:
diff --git a/unitest-restful.py b/unitest-restful.py
index df64cf99..362fce61 100755
--- a/unitest-restful.py
+++ b/unitest-restful.py
@@ -15,6 +15,7 @@ import subprocess
 import time
 import numbers
 import unittest
+import os
 
 from glances import __version__
 from glances.compat import text_type
@@ -54,7 +55,11 @@ class TestGlances(unittest.TestCase):
         global pid
 
         print('INFO: [TEST_000] Start the Glances Web Server')
-        cmdline = "python -m glances -B localhost -w -p %s" % SERVER_PORT
+        if os.path.isfile("./venv/bin/python"):
+            cmdline = "./venv/bin/python"
+        else:
+            cmdline = "python"
+        cmdline += " -m glances -B localhost -w -p %s" % SERVER_PORT
         print("Run the Glances Web Server on port %s" % SERVER_PORT)
         args = shlex.split(cmdline)
         pid = subprocess.Popen(args)
diff --git a/unitest-xmlrpc.py b/unitest-xmlrpc.py
index c639f994..3a75273a 100755
--- a/unitest-xmlrpc.py
+++ b/unitest-xmlrpc.py
@@ -15,6 +15,7 @@ import shlex
 import subprocess
 import time
 import unittest
+import os
 
 from glances import __version__
 from glances.compat import ServerProxy
@@ -43,7 +44,11 @@ class TestGlances(unittest.TestCase):
         global pid
 
         print('INFO: [TEST_000] Start the Glances Web Server')
-        cmdline = "python -m glances -B localhost -s -p %s" % SERVER_PORT
+        if os.path.isfile("./venv/bin/python"):
+            cmdline = "./venv/bin/python"
+        else:
+            cmdline = "python"
+        cmdline += " -m glances -B localhost -s -p %s" % SERVER_PORT
         print("Run the Glances Server on port %s" % SERVER_PORT)
         args = shlex.split(cmdline)
         pid = subprocess.Popen(args)