Merge branch 'develop' into issue2183issue2183

134 files changed, 9221 insertions, 8759 deletions

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ddd66c67..f5e4565d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -44,16 +44,16 @@ jobs:
           --outdir dist/
 
       - name: Publish distribution package to Test PyPI
-        uses: pypa/gh-action-pypi-publish@master
+        uses: pypa/gh-action-pypi-publish@release/v1
         with:
           user: __token__
           password: ${{ secrets.TEST_PYPI_API_TOKEN }}
-          repository_url: https://test.pypi.org/legacy/
-          skip_existing: true
+          repository-url: https://test.pypi.org/legacy/
+          skip-existing: true
 
       - name: Publish distribution package to PyPI
         if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
-        uses: pypa/gh-action-pypi-publish@master
+        uses: pypa/gh-action-pypi-publish@release/v1
         with:
           user: __token__
           password: ${{ secrets.PYPI_API_TOKEN }}
diff --git a/Makefile b/Makefile
index 4ffc82b9..c8f84a07 100644
--- a/Makefile
+++ b/Makefile
@@ -80,8 +80,11 @@ test-min: ## Run unit tests in minimal environment
 test-min-with-upgrade: venv-min-upgrade ## Upgrade deps and run unit tests in minimal environment
 	./venv-min/bin/python ./unitest.py
 
+test-restful-api: ## Run unit tests of the RESTful API
+	./venv/bin/python ./unitest-restful.py
+
 # ===================================================================
-# Linters and profilers
+# Linters, profilers and cyber security
 # ===================================================================
 
 format: ## Format the code
@@ -99,7 +102,7 @@ codespell: ## Run codespell to fix common misspellings in text files
 	./venv-dev/bin/codespell -S .git,./docs/_build,./Glances.egg-info,./venv*,./glances/outputs,*.svg -L hart,bu,te,statics
 
 semgrep: ## Run semgrep to find bugs and enforce code standards
-	./venv-dev/bin/semgrep --config=auto --lang python --use-git-ignore ./glances
+	./venv-dev/bin/semgrep scan --config=auto
 
 profiling: ## How to start the profiling of the Glances software
 	@echo "Please complete and run: sudo ./venv-dev/bin/py-spy record -o ./docs/_static/glances-flame.svg -d 60 -s --pid <GLANCES PID>"
@@ -123,6 +126,10 @@ memory-profiling: ## Profile memory usage
 	./venv-dev/bin/mprof plot --output ./docs/_static/glances-memory-profiling-without-history.png
 	rm -f mprofile_*.dat
 
+# Trivy installation: https://aquasecurity.github.io/trivy/latest/getting-started/installation/
+trivy: ## Run Trivy to find vulnerabilities in container images
+	trivy fs .
+
 # ===================================================================
 # Docs
 # ===================================================================
diff --git a/NEWS.rst b/NEWS.rst
index e40a63c1..944adf05 100644
--- a/NEWS.rst
+++ b/NEWS.rst
@@ -8,6 +8,17 @@ Version 4.0.0
 
 Under development: https://github.com/nicolargo/glances/issues?q=is%3Aopen+is%3Aissue+milestone%3A%22Glances+4.0.0%22
 
+**BREAKING CHANGES:**