summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.ci/appveyor/download_exes.py2
-rw-r--r--.dockerignore2
-rw-r--r--.github/ISSUE_TEMPLATE.md1
-rw-r--r--.github/ISSUE_TEMPLATE/bug_report.md2
-rw-r--r--.github/workflows/build.yml18
-rw-r--r--.github/workflows/codeql-analysis.yml2
-rw-r--r--.github/workflows/test.yml4
-rw-r--r--Makefile43
-rw-r--r--NEWS.rst100
-rw-r--r--README.rst40
-rw-r--r--conf/glances.conf26
-rw-r--r--dev-requirements.txt1
-rw-r--r--docker-compose/Dockerfile2
-rw-r--r--docker-compose/docker-compose-with-traefik.yml29
-rw-r--r--docker-compose/docker-compose.yml4
-rw-r--r--docker-compose/glances.conf38
-rw-r--r--docker-files/README.md41
-rw-r--r--docker-files/alpine.Dockerfile56
-rw-r--r--docker-files/debian.Dockerfile61
-rw-r--r--docs/_static/glances-flame.svg17
-rw-r--r--docs/aoa/actions.rst15
-rw-r--r--docs/aoa/cpu.rst1
-rw-r--r--docs/aoa/diskio.rst2
-rw-r--r--docs/aoa/docker.rst6
-rw-r--r--docs/aoa/fs.rst2
-rw-r--r--docs/aoa/ports.rst2
-rw-r--r--docs/aoa/quicklook.rst2
-rw-r--r--docs/aoa/sensors.rst8
-rw-r--r--docs/api.rst836
-rw-r--r--docs/config.rst2
-rw-r--r--docs/gw/graph.rst2
-rw-r--r--docs/gw/influxdb.rst4
-rw-r--r--docs/gw/mqtt.rst2
-rw-r--r--docs/man/glances.14
-rw-r--r--docs/quickstart.rst4
-rw-r--r--glances/__init__.py6
-rw-r--r--glances/amps_list.py19
-rw-r--r--glances/autodiscover.py2
-rw-r--r--glances/compat.py2
-rw-r--r--glances/exports/couchdb/__init__.py6
-rw-r--r--glances/filter.py6
-rw-r--r--glances/main.py8
-rw-r--r--glances/outputs/glances_bottle.py3
-rw-r--r--glances/outputs/glances_curses.py22
-rw-r--r--glances/outputs/glances_stdout_issue.py10
-rw-r--r--glances/outputs/static/css/style.scss26
-rw-r--r--glances/outputs/static/js/App.vue256
-rw-r--r--glances/outputs/static/js/components/plugin-alert.vue4
-rw-r--r--glances/outputs/static/js/components/plugin-cloud.vue2
-rw-r--r--glances/outputs/static/js/components/plugin-connections.vue2
-rw-r--r--glances/outputs/static/js/components/plugin-cpu.vue65
-rw-r--r--glances/outputs/static/js/components/plugin-diskio.vue2
-rw-r--r--glances/outputs/static/js/components/plugin-docker.vue105
-rw-r--r--glances/outputs/static/js/components/plugin-folders.vue2
-rw-r--r--glances/outputs/static/js/components/plugin-fs.vue2
-rw-r--r--glances/outputs/static/js/components/plugin-ip.vue17
-rw-r--r--glances/outputs/static/js/components/plugin-irq.vue2
-rw-r--r--glances/outputs/static/js/components/plugin-network.vue2
-rw-r--r--glances/outputs/static/js/components/plugin-now.vue20
-rw-r--r--glances/outputs/static/js/components/plugin-ports.vue4
-rw-r--r--glances/outputs/static/js/components/plugin-process.vue114
-rw-r--r--glances/outputs/static/js/components/plugin-processcount.vue6
-rw-r--r--glances/outputs/static/js/components/plugin-processlist.vue17
-rw-r--r--glances/outputs/static/js/components/plugin-quicklook.vue2
-rw-r--r--glances/outputs/static/js/components/plugin-raid.vue2
-rw-r--r--glances/outputs/static/js/components/plugin-sensors.vue2
-rw-r--r--glances/outputs/static/js/components/plugin-system.vue2
-rw-r--r--glances/outputs/static/js/components/plugin-uptime.vue2
-rw-r--r--glances/outputs/static/js/components/plugin-wifi.vue2
-rw-r--r--glances/outputs/static/js/services.js1
-rw-r--r--glances/outputs/static/package-lock.json1270
-rw-r--r--glances/outputs/static/package.json30
-rw-r--r--glances/outputs/static/public/glances.js12
-rw-r--r--glances/password.py17
-rw-r--r--glances/plugins/cloud/model.py2
-rw-r--r--glances/plugins/cpu/model.py68
-rw-r--r--glances/plugins/fs/model.py8
-rw-r--r--glances/plugins/glances_docker/model.py124
-rw-r--r--glances/plugins/help/model.py245
-rw-r--r--glances/plugins/ip/model.py8
-rw-r--r--glances/plugins/load/model.py2
-rw-r--r--glances/plugins/plugin/model.py10
-rw-r--r--glances/plugins/processcount/model.py19
-rw-r--r--glances/plugins/processlist/model.py4
-rw-r--r--glances/processes.py15
-rw-r--r--glances/secure.py2
-rw-r--r--glances/server.py14
-rw-r--r--glances/stats.py2
-rw-r--r--glances/stats_client_snmp.py2
-rw-r--r--glances/stats_server.py4
-rw-r--r--optional-requirements.txt8
-rw-r--r--renovate.json6
-rwxr-xr-xsetup.py2
-rwxr-xr-xsnap/local/launchers/glances-launch2
-rw-r--r--snap/snapcraft.yaml5
-rwxr-xr-xunitest.py4
-rw-r--r--webui-requirements.txt4
97 files changed, 2652 insertions, 1363 deletions
diff --git a/.ci/appveyor/download_exes.py b/.ci/appveyor/download_exes.py
index cb8cb0b2..2e8973c1 100644
--- a/.ci/appveyor/download_exes.py
+++ b/.ci/appveyor/download_exes.py
@@ -7,7 +7,7 @@
"""
Script which downloads exe and wheel files hosted on AppVeyor:
https://ci.appveyor.com/project/giampaolo/psutil
-Copied and readapted from the original recipe of Ibarra Corretge'
+Copied and re-adapted from the original recipe of Ibarra Corretge'
<saghul@gmail.com>:
http://code.saghul.net/index.php/2015/09/09/
"""
diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 00000000..c2e5dbd2
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,2 @@
+.dockerignore
+.git
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index d14150fc..ebcfa8a9 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -12,6 +12,7 @@ For an enhancement or new feature: Describe your needs.
* Glances & psutil (glances -V):
* Operating System (lsb_release -a):
+* How do you install Glances (Pypi package, script, package manager, source):
#### Logs
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 4f79ea23..e602208c 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -12,7 +12,7 @@ A clear and concise description of what the bug is.
**To Reproduce**
Steps to reproduce the behavior:
-1. Start Glances with the followings options '...'
+1. Start Glances with the following options '...'
2. Press the key '....'
3. See error
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a6e4b27e..5c6cc2ed 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 != 'debian' && 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 c1e6c46e..808e7d7b 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 01cd9023..584543ca 100644
--- a/Makefile
+++ b/Makefile
@@ -61,6 +61,9 @@ format: venv-dev-upgrade ## Format the code
flake8: venv-dev-upgrade ## Run flake8 linter.
@git ls-files '*.py' | xargs ./venv/bin/python -m flake8 --config=.flake8
+codespell: venv-dev-upgrade ## Run codespell to fix common misspellings in text files
+ ./venv/bin/codespell -S .git,./docs/_build,