Merge branch 'refs/heads/support/v4.0.x'

# Conflicts: # NEWS.rst # docs/api.rst # docs/man/glances.1 # glances/__init__.py # glances/plugins/sensors/__init__.py # snap/snapcraft.yaml
nicolargo · May 16, 2024 · fecd23b · fecd23b
2 parents eb83f6e + 16621cf
commit fecd23b
Show file tree

Hide file tree

Showing 6 changed files with 122 additions and 144 deletions.
diff --git a/NEWS.rst b/NEWS.rst
@@ -10,6 +10,19 @@ Under development, see roadmap here: https://github.com/nicolargo/glances/milest
 
 Contributors are welcome !
 
+===============
+Version 4.0.4
+===============
+
+Hostfix release for support sensors plugin on python3.8
+
+===============
+Version 4.0.3
+===============
+
+Additional fixes for Sensor plugin.
+
+
 ===============
 Version 4.0.2
 ===============

diff --git a/docs/api.rst b/docs/api.rst
@@ -480,7 +480,13 @@ GET gpu
 Get plugin stats::
 
     # curl http://localhost:61208/api/4/gpu
-    []
+    [{"fan_speed": 29,
+      "gpu_id": "nvidia0",
+      "key": "gpu_id",
+      "mem": 46.144612630208336,
+      "name": "NVIDIA GeForce GTX 1060 3GB",
+      "proc": 2,
+      "temperature": 57}]
 
 Fields descriptions:
 
@@ -491,6 +497,22 @@ Fields descriptions:
 * **temperature**: GPU temperature (unit is *celsius*)
 * **fan_speed**: GPU fan speed (unit is *roundperminute*)
 
+Get a specific field::
+
+    # curl http://localhost:61208/api/4/gpu/gpu_id
+    {"gpu_id": ["nvidia0"]}
+
+Get a specific item when field matches the given value::
+
+    # curl http://localhost:61208/api/4/gpu/gpu_id/nvidia0
+    {"nvidia0": [{"fan_speed": 29,
+                  "gpu_id": "nvidia0",
+                  "key": "gpu_id",
+                  "mem": 46.144612630208336,
+                  "name": "NVIDIA GeForce GTX 1060 3GB",
+                  "proc": 2,
+                  "temperature": 57}]}
+
 GET help
 --------
 
@@ -1226,7 +1248,7 @@ GET version
 Get plugin stats::
 
     # curl http://localhost:61208/api/4/version
-    "4.0.2"
+    "4.0.4"
 
 GET wifi
 --------

diff --git a/docs/man/glances.1 b/docs/man/glances.1
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "GLANCES" "1" "May 13, 2024" "4.0.2" "Glances"
+.TH "GLANCES" "1" "May 15, 2024" "4.0.4" "Glances"
 .SH NAME
 glances \- An eye on your system
 .SH SYNOPSIS

diff --git a/glances/__init__.py b/glances/__init__.py
@@ -20,7 +20,7 @@
 # Global name
 # Version should start and end with a numerical char
 # See https://packaging.python.org/specifications/core-metadata/#version
-__version__ = '4.0.2'
+__version__ = '4.0.4'
 __apiversion__ = '4'
 __author__ = 'Nicolas Hennion <nicolas@nicolargo.com>'
 __license__ = 'LGPLv3'