mirror
/
glances
mirror of https://github.com/nicolargo/glances.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update snapcraft

This commit is contained in:
nicolargo 2024-05-18 11:18:01 +02:00
parent 1183b4dabd
commit 15b0a9bbab
4 changed files with 113 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
NEWS.rst
View File

@ -10,6 +10,39 @@ Under development, see roadmap here: https://github.com/nicolargo/glances/milest
Contributors are welcome ! Contributors are welcome !
===============
Version 4.0.5
===============
* SensorType change in REST API breaks compatibility in 4.0.4 #2788
* Please make pydantic optional dependency, not required one #2777
* Update the Grafana dashboard #2780
* 4.0.4 - On Glances startup "ERROR -- Can not init battery class #2776
* In codeSpace (with Python 3.8), an error occurs in ./unittest-restful.py #2773
Use Ruff as default Linter.
===============
Version 4.0.4
===============
Hostfix release for support sensors plugin on python 3.8
===============
Version 4.0.3
===============
Additional fixes for Sensor plugin
===============
Version 4.0.2
===============
* hotfix: plugin(sensors) - race conditions btw fan_speed & temperature… #2766
* fix: include requirements.txt and SECURITY.md for pypi dist #2761
Thanks to RazCrimson for the sensors patch !
=============== ===============
Version 4.0.1 Version 4.0.1
=============== ===============

150
docs/api.rst
View File

@ -141,7 +141,7 @@ Get plugin stats::
"refresh": 3.0, "refresh": 3.0,
"regex": True, "regex": True,
"result": None, "result": None,
"timer": 0.16403412818908691}, "timer": 0.14174199104309082},
{"count": 0, {"count": 0,
"countmax": 20.0, "countmax": 20.0,
"countmin": None, "countmin": None,
@ -150,7 +150,7 @@ Get plugin stats::
"refresh": 3.0, "refresh": 3.0,
"regex": True, "regex": True,
"result": None, "result": None,
"timer": 0.1639845371246338}] "timer": 0.1416921615600586}]
Fields descriptions: Fields descriptions:
@ -178,7 +178,7 @@ Get a specific item when field matches the given value::
"refresh": 3.0, "refresh": 3.0,
"regex": True, "regex": True,
"result": None, "result": None,
"timer": 0.16403412818908691}]} "timer": 0.14174199104309082}]}
GET cloud GET cloud
--------- ---------
@ -265,18 +265,18 @@ Get plugin stats::
# curl http://localhost:61208/api/4/cpu # curl http://localhost:61208/api/4/cpu
{"cpucore": 16, {"cpucore": 16,
"ctx_switches": 25153730, "ctx_switches": 30813084,
"guest": 0.0, "guest": 0.0,
"idle": 0.0, "idle": 2.0,
"interrupts": 29700238, "interrupts": 37331978,
"iowait": 0.0, "iowait": 0.0,
"irq": 0.0, "irq": 0.0,
"nice": 0.0, "nice": 0.0,
"soft_interrupts": 7506737, "soft_interrupts": 9264867,
"steal": 0.0, "steal": 0.0,
"syscalls": 0, "syscalls": 0,
"system": 0.0, "system": 0.0,
"total": 33.3, "total": 0.0,
"user": 0.0} "user": 0.0}
Fields descriptions: Fields descriptions:
@ -310,7 +310,7 @@ Fields descriptions:
Get a specific field:: Get a specific field::
# curl http://localhost:61208/api/4/cpu/total # curl http://localhost:61208/api/4/cpu/total
{"total": 33.3} {"total": 0.0}
GET diskio GET diskio
---------- ----------
@ -320,10 +320,10 @@ Get plugin stats::
# curl http://localhost:61208/api/4/diskio # curl http://localhost:61208/api/4/diskio
[{"disk_name": "nvme0n1", [{"disk_name": "nvme0n1",
"key": "disk_name", "key": "disk_name",
"read_bytes": 3986516480, "read_bytes": 3991489024,
"read_count": 136339, "read_count": 136511,
"write_bytes": 4063384576, "write_bytes": 4227564544,
"write_count": 162743}, "write_count": 174572},
{"disk_name": "nvme0n1p1", {"disk_name": "nvme0n1p1",
"key": "disk_name", "key": "disk_name",
"read_bytes": 7476224, "read_bytes": 7476224,
@ -363,10 +363,10 @@ Get a specific item when field matches the given value::
# curl http://localhost:61208/api/4/diskio/disk_name/nvme0n1 # curl http://localhost:61208/api/4/diskio/disk_name/nvme0n1
{"nvme0n1": [{"disk_name": "nvme0n1", {"nvme0n1": [{"disk_name": "nvme0n1",
"key": "disk_name", "key": "disk_name",
"read_bytes": 3986516480, "read_bytes": 3991489024,
"read_count": 136339, "read_count": 136511,
"write_bytes": 4063384576, "write_bytes": 4227564544,
"write_count": 162743}]} "write_count": 174572}]}
GET folders GET folders
----------- -----------
@ -393,13 +393,13 @@ Get plugin stats::
# curl http://localhost:61208/api/4/fs # curl http://localhost:61208/api/4/fs
[{"device_name": "/dev/mapper/ubuntu--vg-ubuntu--lv", [{"device_name": "/dev/mapper/ubuntu--vg-ubuntu--lv",
"free": 905287376896, "free": 905282502656,
"fs_type": "ext4", "fs_type": "ext4",
"key": "mnt_point", "key": "mnt_point",
"mnt_point": "/", "mnt_point": "/",
"percent": 5.0, "percent": 5.0,
"size": 1003736440832, "size": 1003736440832,
"used": 47386558464}] "used": 47391432704}]
Fields descriptions: Fields descriptions:
@ -420,13 +420,13 @@ Get a specific item when field matches the given value::
# curl http://localhost:61208/api/4/fs/mnt_point// # curl http://localhost:61208/api/4/fs/mnt_point//
{"/": [{"device_name": "/dev/mapper/ubuntu--vg-ubuntu--lv", {"/": [{"device_name": "/dev/mapper/ubuntu--vg-ubuntu--lv",
"free": 905287376896, "free": 905282502656,
"fs_type": "ext4", "fs_type": "ext4",
"key": "mnt_point", "key": "mnt_point",
"mnt_point": "/", "mnt_point": "/",
"percent": 5.0, "percent": 5.0,
"size": 1003736440832, "size": 1003736440832,
"used": 47386558464}]} "used": 47391432704}]}
GET gpu GET gpu
------- -------
@ -500,9 +500,9 @@ Get plugin stats::
# curl http://localhost:61208/api/4/load # curl http://localhost:61208/api/4/load
{"cpucore": 16, {"cpucore": 16,
"min1": 0.798828125, "min1": 0.3486328125,
"min15": 0.48681640625, "min15": 0.724609375,
"min5": 0.55712890625} "min5": 0.78466796875}
Fields descriptions: Fields descriptions:
@ -514,7 +514,7 @@ Fields descriptions:
Get a specific field:: Get a specific field::
# curl http://localhost:61208/api/4/load/min1 # curl http://localhost:61208/api/4/load/min1
{"min1": 0.798828125} {"min1": 0.3486328125}
GET mem GET mem
------- -------
@ -522,16 +522,16 @@ GET mem
Get plugin stats:: Get plugin stats::
# curl http://localhost:61208/api/4/mem # curl http://localhost:61208/api/4/mem
{"active": 5785235456, {"active": 5943754752,
"available": 10593468416, "available": 10590150656,
"buffers": 249212928, "buffers": 254464000,
"cached": 5973450752, "cached": 5853790208,
"free": 10593468416, "free": 10590150656,
"inactive": 3566735360, "inactive": 3587186688,
"percent": 35.5, "percent": 35.5,
"shared": 800735232, "shared": 660152320,
"total": 16422486016, "total": 16422486016,
"used": 5829017600} "used": 5832335360}
Fields descriptions: Fields descriptions:
@ -589,15 +589,15 @@ Get plugin stats::
# curl http://localhost:61208/api/4/network # curl http://localhost:61208/api/4/network
[{"alias": None, [{"alias": None,
"bytes_all": 0, "bytes_all": 0,
"bytes_all_gauge": 446889349, "bytes_all_gauge": 458925635,
"bytes_recv": 0, "bytes_recv": 0,
"bytes_recv_gauge": 423854852, "bytes_recv_gauge": 430825924,
"bytes_sent": 0, "bytes_sent": 0,
"bytes_sent_gauge": 23034497, "bytes_sent_gauge": 28099711,
"interface_name": "wlp0s20f3", "interface_name": "wlp0s20f3",
"key": "interface_name", "key": "interface_name",
"speed": 0, "speed": 0,
"time_since_update": 0.16993069648742676}] "time_since_update": 0.14712095260620117}]
Fields descriptions: Fields descriptions:
@ -626,15 +626,15 @@ Get a specific item when field matches the given value::
# curl http://localhost:61208/api/4/network/interface_name/wlp0s20f3 # curl http://localhost:61208/api/4/network/interface_name/wlp0s20f3
{"wlp0s20f3": [{"alias": None, {"wlp0s20f3": [{"alias": None,
"bytes_all": 0, "bytes_all": 0,
"bytes_all_gauge": 446889349, "bytes_all_gauge": 458925635,
"bytes_recv": 0, "bytes_recv": 0,
"bytes_recv_gauge": 423854852, "bytes_recv_gauge": 430825924,
"bytes_sent": 0, "bytes_sent": 0,
"bytes_sent_gauge": 23034497, "bytes_sent_gauge": 28099711,
"interface_name": "wlp0s20f3", "interface_name": "wlp0s20f3",
"key": "interface_name", "key": "interface_name",
"speed": 0, "speed": 0,
"time_since_update": 0.16993069648742676}]} "time_since_update": 0.14712095260620117}]}
GET now GET now
------- -------
@ -642,7 +642,7 @@ GET now
Get plugin stats:: Get plugin stats::
# curl http://localhost:61208/api/4/now # curl http://localhost:61208/api/4/now
{"custom": "2024-05-18 10:58:14 CEST", "iso": "2024-05-18T10:58:14+02:00"} {"custom": "2024-05-18 11:17:24 CEST", "iso": "2024-05-18T11:17:24+02:00"}
Fields descriptions: Fields descriptions:
@ -652,7 +652,7 @@ Fields descriptions:
Get a specific field:: Get a specific field::
# curl http://localhost:61208/api/4/now/iso # curl http://localhost:61208/api/4/now/iso
{"iso": "2024-05-18T10:58:14+02:00"} {"iso": "2024-05-18T11:17:24+02:00"}
GET percpu GET percpu
---------- ----------
@ -676,7 +676,7 @@ Get plugin stats::
{"cpu_number": 1, {"cpu_number": 1,
"guest": 0.0, "guest": 0.0,
"guest_nice": 0.0, "guest_nice": 0.0,
"idle": 1.0, "idle": 0.0,
"iowait": 0.0, "iowait": 0.0,
"irq": 0.0, "irq": 0.0,
"key": "cpu_number", "key": "cpu_number",
@ -684,7 +684,7 @@ Get plugin stats::
"softirq": 0.0, "softirq": 0.0,
"steal": 0.0, "steal": 0.0,
"system": 0.0, "system": 0.0,
"total": 99.0, "total": 100.0,
"user": 0.0}] "user": 0.0}]
Fields descriptions: Fields descriptions:
@ -719,7 +719,7 @@ Get plugin stats::
"port": 0, "port": 0,
"refresh": 30, "refresh": 30,
"rtt_warning": None, "rtt_warning": None,
"status": 0.005056, "status": 0.005013,
"timeout": 3}] "timeout": 3}]
Fields descriptions: Fields descriptions:
@ -747,7 +747,7 @@ Get a specific item when field matches the given value::
"port": 0, "port": 0,
"refresh": 30, "refresh": 30,
"rtt_warning": None, "rtt_warning": None,
"status": 0.005056, "status": 0.005013,
"timeout": 3}]} "timeout": 3}]}
GET processcount GET processcount
@ -756,7 +756,7 @@ GET processcount
Get plugin stats:: Get plugin stats::
# curl http://localhost:61208/api/4/processcount # curl http://localhost:61208/api/4/processcount
{"pid_max": 0, "running": 1, "sleeping": 275, "thread": 1578, "total": 413} {"pid_max": 0, "running": 1, "sleeping": 274, "thread": 1536, "total": 407}
Fields descriptions: Fields descriptions:
@ -769,7 +769,7 @@ Fields descriptions:
Get a specific field:: Get a specific field::
# curl http://localhost:61208/api/4/processcount/total # curl http://localhost:61208/api/4/processcount/total
{"total": 413} {"total": 407}
GET processlist GET processlist
--------------- ---------------
@ -809,14 +809,14 @@ GET quicklook
Get plugin stats:: Get plugin stats::
# curl http://localhost:61208/api/4/quicklook # curl http://localhost:61208/api/4/quicklook
{"cpu": 33.3, {"cpu": 0.0,
"cpu_hz": 4475000000.0, "cpu_hz": 4475000000.0,
"cpu_hz_current": 2291256812.5000005, "cpu_hz_current": 1458593437.5,
"cpu_log_core": 16, "cpu_log_core": 16,
"cpu_name": "13th Gen Intel(R) Core(TM) i7-13620H", "cpu_name": "13th Gen Intel(R) Core(TM) i7-13620H",
"cpu_phys_core": 10, "cpu_phys_core": 10,
"load": 3.0, "load": 4.5,
"mem": 35.5, "mem": 35.6,
"percpu": [{"cpu_number": 0, "percpu": [{"cpu_number": 0,
"guest": 0.0, "guest": 0.0,
"guest_nice": 0.0, "guest_nice": 0.0,
@ -833,7 +833,7 @@ Get plugin stats::
{"cpu_number": 1, {"cpu_number": 1,
"guest": 0.0, "guest": 0.0,
"guest_nice": 0.0, "guest_nice": 0.0,
"idle": 1.0, "idle": 0.0,
"iowait": 0.0, "iowait": 0.0,
"irq": 0.0, "irq": 0.0,
"key": "cpu_number", "key": "cpu_number",
@ -841,12 +841,12 @@ Get plugin stats::
"softirq": 0.0, "softirq": 0.0,
"steal": 0.0, "steal": 0.0,
"system": 0.0, "system": 0.0,
"total": 99.0, "total": 100.0,
"user": 0.0}, "user": 0.0},
{"cpu_number": 2, {"cpu_number": 2,
"guest": 0.0, "guest": 0.0,
"guest_nice": 0.0, "guest_nice": 0.0,
"idle": 1.0, "idle": 0.0,
"iowait": 0.0, "iowait": 0.0,
"irq": 0.0, "irq": 0.0,
"key": "cpu_number", "key": "cpu_number",
@ -854,7 +854,7 @@ Get plugin stats::
"softirq": 0.0, "softirq": 0.0,
"steal": 0.0, "steal": 0.0,
"system": 0.0, "system": 0.0,
"total": 99.0, "total": 100.0,
"user": 0.0}, "user": 0.0},
{"cpu_number": 3, {"cpu_number": 3,
"guest": 0.0, "guest": 0.0,
@ -879,7 +879,7 @@ Get plugin stats::
"nice": 0.0, "nice": 0.0,
"softirq": 0.0, "softirq": 0.0,
"steal": 0.0, "steal": 0.0,
"system": 1.0, "system": 0.0,
"total": 100.0, "total": 100.0,
"user": 0.0}, "user": 0.0},
{"cpu_number": 5, {"cpu_number": 5,
@ -1175,7 +1175,7 @@ GET uptime
Get plugin stats:: Get plugin stats::
# curl http://localhost:61208/api/4/uptime # curl http://localhost:61208/api/4/uptime
"4 days, 11:51:02" "4 days, 12:10:13"
GET version GET version
----------- -----------
@ -1251,34 +1251,34 @@ GET stats history
History of a plugin:: History of a plugin::
# curl http://localhost:61208/api/4/cpu/history # curl http://localhost:61208/api/4/cpu/history
{"system": [["2024-05-18T10:58:15.082386", 0.0], {"system": [["2024-05-18T11:17:25.730926", 0.0],
["2024-05-18T10:58:16.112316", 0.0], ["2024-05-18T11:17:26.770417", 0.0],
["2024-05-18T10:58:17.175583", 0.0]], ["2024-05-18T11:17:27.827660", 0.0]],
"user": [["2024-05-18T10:58:15.082375", 0.0], "user": [["2024-05-18T11:17:25.730915", 0.0],
["2024-05-18T10:58:16.112310", 0.0], ["2024-05-18T11:17:26.770412", 0.0],
["2024-05-18T10:58:17.175574", 0.0]]} ["2024-05-18T11:17:27.827644", 0.0]]}
Limit history to last 2 values:: Limit history to last 2 values::
# curl http://localhost:61208/api/4/cpu/history/2 # curl http://localhost:61208/api/4/cpu/history/2
{"system": [["2024-05-18T10:58:16.112316", 0.0], {"system": [["2024-05-18T11:17:26.770417", 0.0],
["2024-05-18T10:58:17.175583", 0.0]], ["2024-05-18T11:17:27.827660", 0.0]],
"user": [["2024-05-18T10:58:16.112310", 0.0], "user": [["2024-05-18T11:17:26.770412", 0.0],
["2024-05-18T10:58:17.175574", 0.0]]} ["2024-05-18T11:17:27.827644", 0.0]]}
History for a specific field:: History for a specific field::
# curl http://localhost:61208/api/4/cpu/system/history # curl http://localhost:61208/api/4/cpu/system/history
{"system": [["2024-05-18T10:58:14.000245", 0.0], {"system": [["2024-05-18T11:17:24.636762", 0.0],
["2024-05-18T10:58:15.082386", 0.0], ["2024-05-18T11:17:25.730926", 0.0],
["2024-05-18T10:58:16.112316", 0.0], ["2024-05-18T11:17:26.770417", 0.0],
["2024-05-18T10:58:17.175583", 0.0]]} ["2024-05-18T11:17:27.827660", 0.0]]}
Limit history for a specific field to last 2 values:: Limit history for a specific field to last 2 values::
# curl http://localhost:61208/api/4/cpu/system/history # curl http://localhost:61208/api/4/cpu/system/history
{"system": [["2024-05-18T10:58:16.112316", 0.0], {"system": [["2024-05-18T11:17:26.770417", 0.0],
["2024-05-18T10:58:17.175583", 0.0]]} ["2024-05-18T11:17:27.827660", 0.0]]}
GET limits (used for thresholds) GET limits (used for thresholds)
-------------------------------- --------------------------------

3
glances/__init__.py
View File

@ -89,7 +89,8 @@ def start(config, args):
from glances.standalone import GlancesStandalone as GlancesMode from glances.standalone import GlancesStandalone as GlancesMode
elif core.is_client(): elif core.is_client():
if core.is_client_browser(): if core.is_client_browser():
from glances.client_browser import GlancesClientBrowser as GlancesMode from glances.client_browser import \
GlancesClientBrowser as GlancesMode
else: else:
from glances.client import GlancesClient as GlancesMode from glances.client import GlancesClient as GlancesMode
elif core.is_server(): elif core.is_server():

6
snap/snapcraft.yaml
View File

@ -1,5 +1,5 @@
name: glances name: glances
version: '4.1.0+beta01' ## '4.0.0' version: '4.0.5' ## '4.0.5'
summary: Glances an Eye on your system. A top/htop alternative. summary: Glances an Eye on your system. A top/htop alternative.
description: | description: |
@ -9,7 +9,7 @@ description: |
depending on the user interface size. depending on the user interface size.
base: core22 base: core22
grade: devel grade: stable # devel
confinement: strict confinement: strict
apps: apps:
@ -49,7 +49,7 @@ parts:
glances: glances:
plugin: python plugin: python
source: https://github.com/nicolargo/glances.git source: https://github.com/nicolargo/glances.git
source-branch: devel source-branch: master # develop
python-requirements: python-requirements:
- requirements.txt - requirements.txt
- webui-requirements.txt - webui-requirements.txt