Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-Glances for openSUSE:Factory
checked in at 2022-11-01 13:42:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-Glances (Old)
and /work/SRC/openSUSE:Factory/.python-Glances.new.2275 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-Glances"
Tue Nov 1 13:42:27 2022 rev:22 rq:1032518 version:3.3.0.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-Glances/python-Glances.changes
2022-10-18 12:45:30.389792940 +0200
+++ /work/SRC/openSUSE:Factory/.python-Glances.new.2275/python-Glances.changes
2022-11-01 13:42:38.275918331 +0100
@@ -1,0 +2,7 @@
+Mon Oct 31 11:35:40 UTC 2022 - Michael Str??der <mich...@stroeder.com>
+
+- Update to version 3.3.0.2
+ * Password files in same configuration dir in effect #2143
+ * Fail to load config file on Python 3.10 #2176
+
+-------------------------------------------------------------------
Old:
----
v3.3.0.tar.gz
New:
----
v3.3.0.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-Glances.spec ++++++
--- /var/tmp/diff_new_pack.tsoyHy/_old 2022-11-01 13:42:39.279923671 +0100
+++ /var/tmp/diff_new_pack.tsoyHy/_new 2022-11-01 13:42:39.283923693 +0100
@@ -19,7 +19,7 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%define skip_python2 1
Name: python-Glances
-Version: 3.3.0
+Version: 3.3.0.2
Release: 0
Summary: A cross-platform curses-based monitoring tool
License: LGPL-3.0-only
++++++ v3.3.0.tar.gz -> v3.3.0.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/glances-3.3.0/NEWS.rst new/glances-3.3.0.2/NEWS.rst
--- old/glances-3.3.0/NEWS.rst 2022-10-16 15:30:33.000000000 +0200
+++ new/glances-3.3.0.2/NEWS.rst 2022-10-30 14:57:18.000000000 +0100
@@ -3,6 +3,26 @@
==============================================================================
===============
+Version 3.3.1
+===============
+
+ Under development, see milestone
https://github.com/nicolargo/glances/milestone/61
+
+===============
+Version 3.3.0.2
+===============
+
+Bug corrected:
+ * Password files in same configuration dir in effect #2143
+ * Fail to load config file on Python 3.10 #2176
+
+===============
+Version 3.3.0.1
+===============
+
+Just a version to rebuild the Docker images.
+
+===============
Version 3.3.0
===============
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/glances-3.3.0/docker-files/alpine.Dockerfile
new/glances-3.3.0.2/docker-files/alpine.Dockerfile
--- old/glances-3.3.0/docker-files/alpine.Dockerfile 2022-10-16
15:30:33.000000000 +0200
+++ new/glances-3.3.0.2/docker-files/alpine.Dockerfile 2022-10-30
14:57:18.000000000 +0100
@@ -34,7 +34,11 @@
FROM build as buildRequirements
ARG PYTHON_VERSION
COPY requirements.txt .
+COPY webui-requirements.txt .
RUN pip3 install --no-cache-dir --user -r requirements.txt
+# Minimal means no webui, but it break what is done previously (see #2155)
+# So install the webui requirements...
+RUN pip3 install --no-cache-dir --user -r webui-requirements.txt
# As minimal image we want to monitor others docker containers
RUN pip3 install --no-cache-dir --user docker
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/glances-3.3.0/docker-files/debian.Dockerfile
new/glances-3.3.0.2/docker-files/debian.Dockerfile
--- old/glances-3.3.0/docker-files/debian.Dockerfile 2022-10-16
15:30:33.000000000 +0200
+++ new/glances-3.3.0.2/docker-files/debian.Dockerfile 2022-10-30
14:57:18.000000000 +0100
@@ -31,7 +31,11 @@
FROM build as buildRequirements
ARG PYTHON_VERSION
COPY requirements.txt .
+COPY webui-requirements.txt .
RUN pip3 install --no-cache-dir --user -r requirements.txt
+# Minimal means no webui, but it break what is done previously (see #2155)
+# So install the webui requirements...
+RUN pip3 install --no-cache-dir --user -r webui-requirements.txt
# As minimal image we want to monitor others docker containers
RUN pip3 install --no-cache-dir --user docker
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/glances-3.3.0/docs/api.rst
new/glances-3.3.0.2/docs/api.rst
--- old/glances-3.3.0/docs/api.rst 2022-10-16 15:30:33.000000000 +0200
+++ new/glances-3.3.0.2/docs/api.rst 2022-10-30 14:57:18.000000000 +0100
@@ -60,6 +60,25 @@
"uptime",
"wifi"]
+GET alert
+---------
+
+Get plugin stats::
+
+ # curl http://localhost:61208/api/3/alert
+ [[1667138120.0,
+ -1,
+ "CRITICAL",
+ "CPU_TOTAL",
+ 99.9,
+ 99.9,
+ 99.9,
+ 99.9,
+ 1,
+ [],
+ "",
+ "cpu_percent"]]
+
GET amps
--------
@@ -74,7 +93,7 @@
"refresh": 3.0,
"regex": True,
"result": None,
- "timer": 1.0110199451446533},
+ "timer": 2.3771681785583496},
{"count": 0,
"countmax": 20.0,
"countmin": None,
@@ -83,7 +102,7 @@
"refresh": 3.0,
"regex": True,
"result": None,
- "timer": 1.0108563899993896}]
+ "timer": 2.374648332595825}]
Get a specific field::
@@ -101,7 +120,7 @@
"refresh": 3.0,
"regex": True,
"result": None,
- "timer": 1.0110199451446533}]}
+ "timer": 2.3771681785583496}]}
GET core
--------
@@ -131,19 +150,19 @@
"ctx_switches": 0,
"guest": 0.0,
"guest_nice": 0.0,
- "idle": 72.9,
+ "idle": 0.2,
"interrupts": 0,
"iowait": 0.0,
"irq": 0.0,
- "nice": 0.0,
+ "nice": 13.1,
"soft_interrupts": 0,
- "softirq": 0.0,
+ "softirq": 0.5,
"steal": 0.0,
"syscalls": 0,
- "system": 2.7,
+ "system": 23.5,
"time_since_update": 1,
- "total": 27.7,
- "user": 24.4}
+ "total": 99.9,
+ "user": 62.7}
Fields descriptions:
@@ -166,7 +185,7 @@
Get a specific field::
# curl http://localhost:61208/api/3/cpu/total
- {"total": 27.7}
+ {"total": 99.9}
GET diskio
----------
@@ -205,6 +224,26 @@
"write_bytes": 0,
"write_count": 0}]}
+GET docker
+----------
+
+Get plugin stats::
+
+ # curl http://localhost:61208/api/3/docker
+ [{"Command": ["/portainer"],
+ "Id": "3abd51c615968482d9ccff5afc629f267f6dda113ed68b75b432615fae3b49fb",
+ "Image": ["portainer/portainer-ce:2.9.3"],
+ "Status": "running",
+ "Uptime": "a min",
+ "cpu_percent": 0.0,
+ "io_r": None,
+ "io_w": None,
+ "key": "name",
+ "memory_usage": None,
+ "name": "portainer",
+ "network_rx": None,
+ "network_tx": None}]
+
GET fs
------
@@ -212,13 +251,13 @@
# curl http://localhost:61208/api/3/fs
[{"device_name": "/dev/mapper/ubuntu--gnome--vg-root",
- "free": 76639870976,
+ "free": 68973690880,
"fs_type": "ext4",
"key": "mnt_point",
"mnt_point": "/",
- "percent": 66.8,
+ "percent": 70.1,
"size": 243334156288,
- "used": 154306830336},
+ "used": 161973010432},
{"device_name": "zsfpool",
"free": 41811968,
"fs_type": "zfs",
@@ -237,13 +276,13 @@
# curl http://localhost:61208/api/3/fs/mnt_point//
{"/": [{"device_name": "/dev/mapper/ubuntu--gnome--vg-root",
- "free": 76639870976,
+ "free": 68973690880,
"fs_type": "ext4",
"key": "mnt_point",
"mnt_point": "/",
- "percent": 66.8,
+ "percent": 70.1,
"size": 243334156288,
- "used": 154306830336}]}
+ "used": 161973010432}]}
GET ip
------
@@ -270,9 +309,9 @@
# curl http://localhost:61208/api/3/load
{"cpucore": 4,
- "min1": 1.7685546875,
- "min15": 0.98388671875,
- "min5": 1.60888671875}
+ "min1": 8.32861328125,
+ "min15": 3.55517578125,
+ "min5": 5.59521484375}
Fields descriptions:
@@ -284,7 +323,7 @@
Get a specific field::
# curl http://localhost:61208/api/3/load/min1
- {"min1": 1.7685546875}
+ {"min1": 8.32861328125}
GET mem
-------
@@ -292,16 +331,16 @@
Get plugin stats::
# curl http://localhost:61208/api/3/mem
- {"active": 2591764480,
- "available": 3011506176,
- "buffers": 380743680,
- "cached": 2927734784,
- "free": 3011506176,
- "inactive": 3734249472,
- "percent": 61.6,
- "shared": 515334144,
+ {"active": 2941202432,
+ "available": 3058556928,
+ "buffers": 245547008,
+ "cached": 3377664000,
+ "free": 3058556928,
+ "inactive": 3580866560,
+ "percent": 61.0,
+ "shared": 446537728,
"total": 7836188672,
- "used": 4824682496}
+ "used": 4777631744}
Fields descriptions:
@@ -328,13 +367,13 @@
Get plugin stats::
# curl http://localhost:61208/api/3/memswap
- {"free": 7375319040,
- "percent": 8.7,
- "sin": 44937216,
- "sout": 747577344,
+ {"free": 5359255552,
+ "percent": 33.7,
+ "sin": 1496064000,
+ "sout": 5930201088,
"time_since_update": 1,
"total": 8082419712,
- "used": 707100672}
+ "used": 2723164160}
Fields descriptions:
@@ -358,29 +397,29 @@
# curl http://localhost:61208/api/3/network
[{"alias": None,
- "cumulative_cx": 89411064,
- "cumulative_rx": 44705532,
- "cumulative_tx": 44705532,
- "cx": 6622,
+ "cumulative_cx": 324035404,
+ "cumulative_rx": 162017702,
+ "cumulative_tx": 162017702,
+ "cx": 8656,
"interface_name": "lo",
"is_up": True,
"key": "interface_name",
- "rx": 3311,
+ "rx": 4328,
"speed": 0,
"time_since_update": 1,
- "tx": 3311},
+ "tx": 4328},
{"alias": None,
- "cumulative_cx": 2052012520,
- "cumulative_rx": 1919949329,
- "cumulative_tx": 132063191,
- "cx": 28380,
+ "cumulative_cx": 7020944105,
+ "cumulative_rx": 6584640933,
+ "cumulative_tx": 436303172,
+ "cx": 40118,
"interface_name": "wlp2s0",
"is_up": True,
"key": "interface_name",
- "rx": 21325,
+ "rx": 30455,
"speed": 0,
"time_since_update": 1,
- "tx": 7055}]
+ "tx": 9663}]
Fields descriptions:
@@ -403,23 +442,24 @@
"br_grafana",
"br-119e6ee04e05",
"docker0",
- "mpqemubr0"]}
+ "mpqemubr0",
+ "vethfb650c2"]}
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": 89411064,
- "cumulative_rx": 44705532,
- "cumulative_tx": 44705532,
- "cx": 6622,
+ "cumulative_cx": 324035404,
+ "cumulative_rx": 162017702,
+ "cumulative_tx": 162017702,
+ "cx": 8656,
"interface_name": "lo",
"is_up": True,
"key": "interface_name",
- "rx": 3311,
+ "rx": 4328,
"speed": 0,
"time_since_update": 1,
- "tx": 3311}]}
+ "tx": 4328}]}
GET now
-------
@@ -427,7 +467,7 @@
Get plugin stats::
# curl http://localhost:61208/api/3/now
- "2022-10-16 14:53:36 CEST"
+ "2022-10-30 14:55:19 CET"
GET percpu
----------
@@ -438,29 +478,29 @@
[{"cpu_number": 0,
"guest": 0.0,
"guest_nice": 0.0,
- "idle": 39.1,
- "iowait": 0.0,
+ "idle": 0.3,
+ "iowait": 0.3,
"irq": 0.0,
"key": "cpu_number",
- "nice": 0.0,
+ "nice": 2.0,
"softirq": 0.0,
"steal": 0.0,
- "system": 2.6,
- "total": 60.9,
- "user": 58.3},
+ "system": 23.1,
+ "total": 99.7,
+ "user": 74.4},
{"cpu_number": 1,
"guest": 0.0,
"guest_nice": 0.0,
- "idle": 59.0,
+ "idle": 0.3,
"iowait": 0.0,
"irq": 0.0,
"key": "cpu_number",
- "nice": 0.0,
+ "nice": 0.3,
"softirq": 0.0,
"steal": 0.0,
- "system": 1.7,
- "total": 41.0,
- "user": 39.3}]
+ "system": 20.4,
+ "total": 99.7,
+ "user": 79.1}]
Get a specific field::
@@ -479,7 +519,7 @@
"port": 0,
"refresh": 30,
"rtt_warning": None,
- "status": 0.005856,
+ "status": 0.021405,
"timeout": 3}]
Get a specific field::
@@ -496,7 +536,7 @@
"port": 0,
"refresh": 30,
"rtt_warning": None,
- "status": 0.005856,
+ "status": 0.021405,
"timeout": 3}]}
GET processcount
@@ -505,12 +545,12 @@
Get plugin stats::
# curl http://localhost:61208/api/3/processcount
- {"pid_max": 0, "running": 1, "sleeping": 277, "thread": 1275, "total": 341}
+ {"pid_max": 0, "running": 4, "sleeping": 308, "thread": 1501, "total": 390}
Get a specific field::
# curl http://localhost:61208/api/3/processcount/total
- {"total": 341}
+ {"total": 390}
GET processlist
---------------
@@ -518,51 +558,56 @@
Get plugin stats::
# curl http://localhost:61208/api/3/processlist
- [{"cmdline": ["/snap/firefox/1877/usr/lib/firefox/firefox",
+ [{"cmdline": ["/usr/share/code/code",
+ "--ms-enable-electron-run-as-node",
+
"/home/nicolargo/.vscode/extensions/ms-python.vscode-pylance-2022.10.40/dist/server.bundle.js",
+
"--cancellationReceive=file:97bd564ed75c2175235169e7d92ebebc9051c6973a",
+ "--node-ipc",
+ "--clientProcessId=315791"],
+ "cpu_percent": 0.0,
+ "cpu_times": pcputimes(user=379.52, system=28.88, children_user=3.52,
children_system=0.45, iowait=0.0),
+ "gids": pgids(real=1000, effective=1000, saved=1000),
+ "io_counters": [95522816, 733184, 0, 0, 0],
+ "key": "pid",
+ "memory_info": pmem(rss=392232960, vms=39119650816, shared=40448000,
text=112652288, lib=0, data=682287104, dirty=0),
+ "memory_percent": 5.005404749907481,
+ "name": "code",
+ "nice": 0,
+ "num_threads": 15,
+ "pid": 315949,
+ "status": "R",
+ "time_since_update": 1,
+ "username": "nicolargo"},
+ {"cmdline": ["/snap/firefox/1943/usr/lib/firefox/firefox",
"-contentproc",
"-childID",
- "4",
+ "1",
"-isForBrowser",
"-prefsLen",
- "35977",
+ "30965",
"-prefMapSize",
- "236080",
+ "235589",
"-jsInitLen",
"246848",
"-parentBuildID",
- "20220922230616",
+ "20221007191409",
"-appDir",
- "/snap/firefox/1877/usr/lib/firefox/browser",
- "{8b6f29ad-9cbd-4eac-aac5-a3a7552fe4c0}",
- "4281",
+ "/snap/firefox/1943/usr/lib/firefox/browser",
+ "{9845d5f8-7cf9-4af9-9d46-4d914b28196f}",
+ "252940",
"true",
"tab"],
"cpu_percent": 0.0,
- "cpu_times": pcputimes(user=523.33, system=98.59, children_user=0.0,
children_system=0.0, iowait=0.0),
+ "cpu_times": pcputimes(user=636.51, system=120.75, children_user=0.0,
children_system=0.0, iowait=0.0),
"gids": pgids(real=1000, effective=1000, saved=1000),
- "io_counters": [11357184, 0, 0, 0, 0],
+ "io_counters": [44116992, 0, 0, 0, 0],
"key": "pid",
- "memory_info": pmem(rss=478035968, vms=3425415168, shared=92233728,
text=634880, lib=0, data=838303744, dirty=0),
- "memory_percent": 6.100363174104035,
+ "memory_info": pmem(rss=379420672, vms=3176718336, shared=72417280,
text=634880, lib=0, data=588877824, dirty=0),
+ "memory_percent": 4.841903224659877,
"name": "WebExtensions",
"nice": 0,
"num_threads": 20,
- "pid": 4719,
- "status": "S",
- "time_since_update": 1,
- "username": "nicolargo"},
- {"cmdline": ["/snap/firefox/1877/usr/lib/firefox/firefox"],
- "cpu_percent": 0.0,
- "cpu_times": pcputimes(user=2225.75, system=781.08,
children_user=1849.32, children_system=399.5, iowait=0.0),
- "gids": pgids(real=1000, effective=1000, saved=1000),
- "io_counters": [1147966464, 3020849152, 0, 0, 0],
- "key": "pid",
- "memory_info": pmem(rss=437329920, vms=13218963456, shared=132329472,
text=634880, lib=0, data=1301897216, dirty=0),
- "memory_percent": 5.580900847406243,
- "name": "firefox",
- "nice": 0,
- "num_threads": 126,
- "pid": 4281,
+ "pid": 253132,
"status": "S",
"time_since_update": 1,
"username": "nicolargo"}]
@@ -570,180 +615,213 @@
Get a specific field::
# curl http://localhost:61208/api/3/processlist/pid
- {"pid": [4719,
- 4281,
- 17501,
- 4494,
- 107498,
- 10818,
+ {"pid": [315949,
+ 253132,
+ 252940,
3549,
- 17308,
+ 293825,
+ 253182,
+ 427502,
+ 253186,
+ 315791,
+ 428662,
+ 424495,
+ 426999,
17347,
- 4498,
+ 293759,
5818,
- 50586,
- 4463,
- 107499,
- 19717,
- 17233,
- 107901,
- 17346,
+ 453170,
+ 317004,
+ 253147,
+ 293862,
11646,
- 109608,
- 109513,
- 109404,
- 109647,
- 17274,
- 17754,
+ 450641,
+ 446469,
+ 448787,
+ 448343,
+ 427103,
+ 293796,
+ 449090,
+ 315800,
+ 428709,
+ 17308,
+ 453358,
+ 388750,
3499,
- 9453,
- 58814,
- 17566,
2245,
- 109831,
- 17755,
- 5126,
- 17373,
- 2429,
- 49129,
- 3844,
- 4440,
- 51440,
- 17292,
- 3651,
- 5659,
- 1405,
- 4062,
4055,
- 1615,
- 3627,
- 3364,
- 1567,
- 3744,
+ 425004,
+ 51440,
+ 450239,
+ 293894,
+ 293804,
+ 3958,
+ 315877,
+ 315875,
+ 253654,
+ 253071,
+ 450957,
+ 3844,
+ 17501,
+ 17346,
4977,
- 1539,
- 1381,
- 3663,
- 3737,
- 2371,
- 1369,
+ 255947,
+ 4062,
+ 2429,
3743,
+ 3651,
+ 107498,
+ 3737,
+ 19717,
+ 3744,
+ 3364,
3806,
- 17237,
- 1945,
- 3958,
- 3618,
- 2412,
- 17238,
- 3592,
- 1391,
3760,
+ 17373,
+ 3742,
4087,
- 1415,
+ 107499,
+ 430951,
+ 1369,
+ 293764,
+ 425025,
+ 109608,
+ 293765,
+ 3627,
1,
- 3742,
- 1587,
- 49142,
- 4518,
+ 1391,
+ 425059,
3929,
+ 453601,
+ 17755,
2917,
+ 17754,
+ 1587,
+ 17292,
+ 17566,
+ 1415,
3528,
- 2187,
- 3739,
- 49148,
- 51420,
- 3736,
- 3444,
+ 3663,
+ 1945,
+ 1381,
3345,
- 16698,
- 1416,
- 3557,
- 1487,
- 3891,
+ 3618,
+ 3592,
+ 2371,
3353,
- 3745,
+ 3557,
+ 3736,
+ 2187,
+ 3750,
+ 2412,
1593,
3637,
- 3750,
- 3817,
+ 3745,
+ 3739,
+ 3891,
1352,
- 1412,
- 1917,
- 2405,
+ 1368,
+ 11667,
+ 3817,
+ 1487,
+ 51420,
+ 1615,
+ 180852,
+ 3378,
+ 17237,
+ 3373,
+ 1416,
+ 54676,
14997,
+ 294139,
+ 3697,
+ 450933,
+ 452064,
+ 3588,
1408,
- 3599,
+ 16698,
+ 3799,
+ 1917,
3755,
+ 1392,
+ 3905,
+ 3599,
+ 3444,
+ 1375,
+ 3380,
15018,
+ 3943,
3569,
- 3697,
- 54676,
- 3905,
+ 3604,
3741,
- 3373,
- 2406,
- 1392,
- 1368,
- 3943,
- 3380,
- 3378,
- 3547,
- 90800,
- 3588,
- 3799,
- 3804,
- 109240,
+ 1539,
3813,
- 1375,
- 3753,
- 3604,
- 3734,
- 3747,
- 3729,
+ 17238,
1407,
- 3633,
- 54624,
3583,
- 3385,
- 1397,
- 11667,
+ 3747,
+ 3734,
+ 1412,
+ 3547,
3748,
- 3437,
+ 3633,
+ 3753,
+ 3804,
+ 3729,
+ 1365,
3616,
- 2920,
+ 1397,
3361,
- 17516,
- 1399,
+ 3437,
+ 4518,
+ 282637,
+ 17258,
+ 3385,
+ 2405,
3362,
3517,
- 1365,
- 3556,
+ 54624,
+ 1399,
1360,
+ 3556,
1743,
+ 2406,
1367,
- 1176,
1377,
+ 2920,
+ 450920,
+ 1176,
+ 450913,
+ 450892,
+ 450882,
1470,
+ 17516,
3953,
+ 293781,
+ 181215,
+ 452597,
58637,
- 109810,
- 17258,
- 3221,
58407,
+ 293767,
54523,
1363,
- 3354,
+ 181218,
+ 3221,
+ 181225,
4187,
1353,
- 109830,
- 3425,
+ 453356,
+ 181228,
+ 453600,
2208,
3733,
- 1485,
- 2252,
- 2226,
+ 3425,
58639,
- 17240,
+ 2226,
+ 3354,
+ 2252,
+ 1485,
+ 181221,
2,
3,
4,
@@ -876,15 +954,8 @@
2256,
2266,
3584,
- 24098,
- 24099,
- 24101,
- 48940,
- 48941,
- 48942,
- 48943,
- 48945,
- 48992,
+ 17240,
+ 17274,
58642,
58643,
58644,
@@ -894,66 +965,76 @@
58648,
58649,
58650,
- 98606,
- 102668,
- 105560,
- 105857,
- 106032,
- 106313,
- 106388,
- 106546,
- 106715,
- 106836,
- 107074,
- 107590,
- 107596,
- 109342,
- 109688,
- 109690,
- 109759]}
+ 393410,
+ 402735,
+ 402736,
+ 402737,
+ 405762,
+ 408876,
+ 413643,
+ 417539,
+ 419011,
+ 419088,
+ 421434,
+ 422634,
+ 424786,
+ 424787,
+ 424793,
+ 424794,
+ 424798,
+ 424799,
+ 424800,
+ 424802,
+ 424803,
+ 424804,
+ 424852,
+ 424855,
+ 424997,
+ 428574,
+ 429232,
+ 429437,
+ 430079,
+ 430202,
+ 430203,
+ 430204,
+ 430738,
+ 446547,
+ 448820,
+ 448926,
+ 448927,
+ 449488,
+ 450140,
+ 450640]}
Get a specific item when field matchs the given value::
- # curl http://localhost:61208/api/3/processlist/pid/4719
- {"4719": [{"cmdline": ["/snap/firefox/1877/usr/lib/firefox/firefox",
- "-contentproc",
- "-childID",
- "4",
- "-isForBrowser",
- "-prefsLen",
- "35977",
- "-prefMapSize",
- "236080",
- "-jsInitLen",
- "246848",
- "-parentBuildID",
- "20220922230616",
- "-appDir",
- "/snap/firefox/1877/usr/lib/firefox/browser",
- "{8b6f29ad-9cbd-4eac-aac5-a3a7552fe4c0}",
- "4281",
- "true",
- "tab"],
- "cpu_percent": 0.0,
- "cpu_times": [523.33, 98.59, 0.0, 0.0, 0.0],
- "gids": [1000, 1000, 1000],
- "io_counters": [11357184, 0, 0, 0, 0],
- "key": "pid",
- "memory_info": [478035968,
- 3425415168,
- 92233728,
- 634880,
- 0,
- 838303744,
- 0],
- "memory_percent": 6.100363174104035,
- "name": "WebExtensions",
- "nice": 0,
- "num_threads": 20,
- "pid": 4719,
- "status": "S",
- "time_since_update": 1,
- "username": "nicolargo"}]}
+ # curl http://localhost:61208/api/3/processlist/pid/315949
+ {"315949": [{"cmdline": ["/usr/share/code/code",
+ "--ms-enable-electron-run-as-node",
+
"/home/nicolargo/.vscode/extensions/ms-python.vscode-pylance-2022.10.40/dist/server.bundle.js",
+
"--cancellationReceive=file:97bd564ed75c2175235169e7d92ebebc9051c6973a",
+ "--node-ipc",
+ "--clientProcessId=315791"],
+ "cpu_percent": 0.0,
+ "cpu_times": [379.52, 28.88, 3.52, 0.45, 0.0],
+ "gids": [1000, 1000, 1000],
+ "io_counters": [95522816, 733184, 0, 0, 0],
+ "key": "pid",
+ "memory_info": [392232960,
+ 39119650816,
+ 40448000,
+ 112652288,
+ 0,
+ 682287104,
+ 0],
+ "memory_percent": 5.005404749907481,
+ "name": "code",
+ "nice": 0,
+ "num_threads": 15,
+ "pid": 315949,
+ "status": "R",
+ "time_since_update": 1,
+ "username": "nicolargo"}]}
GET psutilversion
-----------------
@@ -969,69 +1050,69 @@
Get plugin stats::
# curl http://localhost:61208/api/3/quicklook
- {"cpu": 27.7,
+ {"cpu": 99.9,
"cpu_hz": 1700000000.0,
- "cpu_hz_current": 1249079250.0,
+ "cpu_hz_current": 1696051750.0,
"cpu_name": "Intel(R) Core(TM) i7-4500U CPU @ 1.80GHz",
- "mem": 61.6,
+ "mem": 61.0,
"percpu": [{"cpu_number": 0,
"guest": 0.0,
"guest_nice": 0.0,
- "idle": 39.1,
- "iowait": 0.0,
+ "idle": 0.3,
+ "iowait": 0.3,
"irq": 0.0,
"key": "cpu_number",
- "nice": 0.0,
+ "nice": 2.0,
"softirq": 0.0,
"steal": 0.0,
- "system": 2.6,
- "total": 60.9,
- "user": 58.3},
+ "system": 23.1,
+ "total": 99.7,
+ "user": 74.4},
{"cpu_number": 1,
"guest": 0.0,
"guest_nice": 0.0,
- "idle": 59.0,
+ "idle": 0.3,
"iowait": 0.0,
"irq": 0.0,
"key": "cpu_number",
- "nice": 0.0,
+ "nice": 0.3,
"softirq": 0.0,
"steal": 0.0,
- "system": 1.7,
- "total": 41.0,
- "user": 39.3},
+ "system": 20.4,
+ "total": 99.7,
+ "user": 79.1},
{"cpu_number": 2,
"guest": 0.0,
"guest_nice": 0.0,
- "idle": 94.8,
+ "idle": 0.0,
"iowait": 0.0,
"irq": 0.0,
"key": "cpu_number",
- "nice": 0.0,
- "softirq": 0.0,
+ "nice": 35.8,
+ "softirq": 1.5,
"steal": 0.0,
- "system": 0.9,
- "total": 5.2,
- "user": 4.3},
+ "system": 26.3,
+ "total": 100.0,
+ "user": 36.3},
{"cpu_number": 3,
"guest": 0.0,
"guest_nice": 0.0,
- "idle": 94.8,
+ "idle": 0.3,
"iowait": 0.0,
"irq": 0.0,
"key": "cpu_number",
- "nice": 0.0,
- "softirq": 0.0,
+ "nice": 14.3,
+ "softirq": 0.8,
"steal": 0.0,
- "system": 1.7,
- "total": 5.2,
- "user": 3.4}],
- "swap": 8.7}
+ "system": 26.6,
+ "total": 99.7,
+ "user": 58.0}],
+ "swap": 33.7}
Get a specific field::
# curl http://localhost:61208/api/3/quicklook/cpu
- {"cpu": 27.7}
+ {"cpu": 99.9}
GET sensors
-----------
@@ -1102,7 +1183,7 @@
Get plugin stats::
# curl http://localhost:61208/api/3/uptime
- {"seconds": 105130}
+ {"seconds": 1314827}
GET all stats
-------------
@@ -1118,33 +1199,33 @@
History of a plugin::
# curl http://localhost:61208/api/3/cpu/history
- {"system": [["2022-10-16T14:53:37.160026", 2.7],
- ["2022-10-16T14:53:38.211423", 2.7],
- ["2022-10-16T14:53:39.414393", 0.8]],
- "user": [["2022-10-16T14:53:37.160016", 24.4],
- ["2022-10-16T14:53:38.211414", 24.4],
- ["2022-10-16T14:53:39.414386", 2.9]]}
+ {"system": [["2022-10-30T14:55:20.666293", 23.5],
+ ["2022-10-30T14:55:22.010041", 23.5],
+ ["2022-10-30T14:55:23.678028", 22.4]],
+ "user": [["2022-10-30T14:55:20.666277", 62.7],
+ ["2022-10-30T14:55:22.010026", 62.7],
+ ["2022-10-30T14:55:23.678009", 67.3]]}
Limit history to last 2 values::
# curl http://localhost:61208/api/3/cpu/history/2
- {"system": [["2022-10-16T14:53:38.211423", 2.7],
- ["2022-10-16T14:53:39.414393", 0.8]],
- "user": [["2022-10-16T14:53:38.211414", 24.4],
- ["2022-10-16T14:53:39.414386", 2.9]]}
+ {"system": [["2022-10-30T14:55:22.010041", 23.5],
+ ["2022-10-30T14:55:23.678028", 22.4]],
+ "user": [["2022-10-30T14:55:22.010026", 62.7],
+ ["2022-10-30T14:55:23.678009", 67.3]]}
History for a specific field::
# curl http://localhost:61208/api/3/cpu/system/history
- {"system": [["2022-10-16T14:53:37.160026", 2.7],
- ["2022-10-16T14:53:38.211423", 2.7],
- ["2022-10-16T14:53:39.414393", 0.8]]}
+ {"system": [["2022-10-30T14:55:20.666293", 23.5],
+ ["2022-10-30T14:55:22.010041", 23.5],
+ ["2022-10-30T14:55:23.678028", 22.4]]}
Limit history for a specific field to last 2 values::
# curl http://localhost:61208/api/3/cpu/system/history
- {"system": [["2022-10-16T14:53:38.211423", 2.7],
- ["2022-10-16T14:53:39.414393", 0.8]]}
+ {"system": [["2022-10-30T14:55:22.010041", 23.5],
+ ["2022-10-30T14:55:23.678028", 22.4]]}
GET limits (used for thresholds)
--------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/glances-3.3.0/docs/man/glances.1
new/glances-3.3.0.2/docs/man/glances.1
--- old/glances-3.3.0/docs/man/glances.1 2022-10-16 15:30:33.000000000
+0200
+++ new/glances-3.3.0.2/docs/man/glances.1 2022-10-30 14:57:18.000000000
+0100
@@ -27,7 +27,7 @@
.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
..
-.TH "GLANCES" "1" "Oct 16, 2022" "3.3.0" "Glances"
+.TH "GLANCES" "1" "Oct 30, 2022" "3.3.0.2" "Glances"
.SH NAME
glances \- An eye on your system
.SH SYNOPSIS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/glances-3.3.0/glances/__init__.py
new/glances-3.3.0.2/glances/__init__.py
--- old/glances-3.3.0/glances/__init__.py 2022-10-16 15:30:33.000000000
+0200
+++ new/glances-3.3.0.2/glances/__init__.py 2022-10-30 14:57:18.000000000
+0100
@@ -19,7 +19,7 @@
# Global name
# Version should start and end with a numerical char
# See https://packaging.python.org/specifications/core-metadata/#version
-__version__ = '3.3.0'
+__version__ = '3.3.0.2'
__author__ = 'Nicolas Hennion <nico...@nicolargo.com>'
__license__ = 'LGPLv3'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/glances-3.3.0/glances/main.py
new/glances-3.3.0.2/glances/main.py
--- old/glances-3.3.0/glances/main.py 2022-10-16 15:30:33.000000000 +0200
+++ new/glances-3.3.0.2/glances/main.py 2022-10-30 14:57:18.000000000 +0100
@@ -773,5 +773,5 @@
"""
from glances.password import GlancesPassword
- password = GlancesPassword(username=username)
+ password = GlancesPassword(username=username, config=self.get_config())
return password.get_password(description, confirm, clear)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/glances-3.3.0/glances/outputs/glances_bottle.py
new/glances-3.3.0.2/glances/outputs/glances_bottle.py
--- old/glances-3.3.0/glances/outputs/glances_bottle.py 2022-10-16
15:30:33.000000000 +0200
+++ new/glances-3.3.0.2/glances/outputs/glances_bottle.py 2022-10-30
14:57:18.000000000 +0100
@@ -127,7 +127,8 @@
if username == self.args.username:
from glances.password import GlancesPassword
- pwd = GlancesPassword()
+ pwd = GlancesPassword(username=username,
+ config=self.config)
return pwd.check_password(self.args.password,
pwd.sha256_hash(password))
else:
return False
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/glances-3.3.0/glances/password.py
new/glances-3.3.0.2/glances/password.py
--- old/glances-3.3.0/glances/password.py 2022-10-16 15:30:33.000000000
+0200
+++ new/glances-3.3.0.2/glances/password.py 2022-10-30 14:57:18.000000000
+0100
@@ -38,9 +38,12 @@
"""Return the local password path.
Related toissue: Password files in same configuration dir in effect
#2143
"""
- return self.config.get_value('passwords',
- 'local_password_path',
- default=user_config_dir())
+ if self.config is None:
+ return user_config_dir()
+ else:
+ 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/glances-3.3.0/webui-requirements.txt
new/glances-3.3.0.2/webui-requirements.txt
--- old/glances-3.3.0/webui-requirements.txt 1970-01-01 01:00:00.000000000
+0100
+++ new/glances-3.3.0.2/webui-requirements.txt 2022-10-30 14:57:18.000000000
+0100
@@ -0,0 +1,4 @@
+# install with base requirements file
+-r requirements.txt
+
+bottle
