Skip to content

Commit 0d35d54

Browse files
committed
version 3.1.6
2 parents cdb6bfb + 1b36ed9 commit 0d35d54

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+1861
-4316
lines changed
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
**Describe the bug**
11+
A clear and concise description of what the bug is.
12+
13+
**To Reproduce**
14+
Steps to reproduce the behavior:
15+
1. Start Glances with the followings options '...'
16+
2. Press the key '....'
17+
3. See error
18+
19+
**Expected behavior**
20+
A clear and concise description of what you expected to happen.
21+
22+
**Screenshots**
23+
If applicable, add screenshots to help explain your problem.
24+
25+
**Desktop (please complete the following information):**
26+
- OS: [e.g. GNU/Linux Ubuntu 20.04]
27+
- Glances Version [output of glances -V]
28+
- Glances logs file [output of tail -10 <glances logs file>]
29+
30+
**Additional context**
31+
Add any other context about the problem here.
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for this project
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
**Is your feature request related to a problem? Please describe.**
11+
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
12+
13+
**Describe the solution you'd like**
14+
A clear and concise description of what you want to happen.
15+
16+
**Describe alternatives you've considered**
17+
A clear and concise description of any alternative solutions or features you've considered.
18+
19+
**Additional context**
20+
Add any other context or screenshots about the feature request here.

.github/workflows/main.yml

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
name: CI
2+
3+
env:
4+
DEFAULT_DOCKER_IMAGE: nicolargo/glances
5+
NODE_ENV: ${{ (contains('refs/heads/master', github.ref) || startsWith(github.ref, 'refs/tags/v')) && 'prod' || 'dev' }}
6+
PUSH_BRANCH: ${{ 'refs/heads/develop' == github.ref || 'refs/heads/master' == github.ref || startsWith(github.ref, 'refs/tags/v') }}
7+
DOCKER_PLATFORMS: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/386
8+
9+
on:
10+
pull_request:
11+
branches: [ develop ]
12+
push:
13+
branches: [ master, develop ]
14+
tags:
15+
- v*
16+
17+
jobs:
18+
buildx:
19+
runs-on: ubuntu-latest
20+
steps:
21+
- name: Checkout
22+
uses: actions/checkout@v2
23+
24+
- name: Cache Docker layers
25+
uses: actions/cache@v2
26+
with:
27+
path: /tmp/.buildx-cache
28+
key: ${{ runner.os }}-buildx-${{ env.NODE_ENV }}-${{ github.sha }}
29+
restore-keys: |
30+
${{ runner.os }}-buildx-${{ env.NODE_ENV }}
31+
32+
- name: Configure ENVs
33+
env:
34+
DOCKER_IMAGE: ${{ secrets.DOCKER_IMAGE || env.DEFAULT_DOCKER_IMAGE }}
35+
DOCKERFILE: ${{ env.NODE_ENV == 'prod' && './docker-files/Dockerfile' || './docker-files/dev.Dockerfile' }}
36+
run: |
37+
ls -la /tmp/.buildx-cache || true
38+
VERSION=latest
39+
40+
if [[ $GITHUB_REF == refs/tags/* ]]; then
41+
VERSION=${GITHUB_REF#refs/tags/v}
42+
fi
43+
44+
if [[ $GITHUB_REF == refs/heads/develop ]]; then
45+
VERSION=dev
46+
fi
47+
48+
echo "DOCKERFILE=${DOCKERFILE}" >> $GITHUB_ENV
49+
echo "VERSION=${VERSION}" >> $GITHUB_ENV
50+
echo "TAGS=${DOCKER_IMAGE}:${VERSION}" >> $GITHUB_ENV
51+
echo "BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_ENV
52+
echo "VCS_REF=${GITHUB_SHA::8}" >> $GITHUB_ENV
53+
54+
- name: Set up QEMU
55+
uses: docker/setup-qemu-action@v1
56+
with:
57+
platforms: all
58+
59+
- name: Set up Docker Buildx
60+
id: buildx
61+
uses: docker/setup-buildx-action@v1
62+
with:
63+
version: latest
64+
65+
- name: Login to DockerHub
66+
uses: docker/login-action@v1
67+
if: ${{ env.PUSH_BRANCH == 'true' }}
68+
with:
69+
username: ${{ secrets.DOCKER_USERNAME }}
70+
password: ${{ secrets.DOCKER_PASSWORD }}
71+
72+
- name: Build and push
73+
uses: docker/build-push-action@v2
74+
with:
75+
push: ${{ env.PUSH_BRANCH == 'true' }}
76+
tags: ${{env.TAGS}}
77+
build-args: |
78+
VERSION=${{env.VERSION}}
79+
BUILD_DATE=${{env.BUILD_DATE}}
80+
VCS_REF=${{env.VCS_REF}}
81+
context: .
82+
file: ${{env.DOCKERFILE}}
83+
platforms: ${{env.DOCKER_PLATFORMS}}
84+
cache-from: type=local,src=/tmp/.buildx-cache
85+
cache-to: type=local,dest=/tmp/.buildx-cache,mode=max

.travis.yml

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,22 @@ after_success:
2323
- coveralls
2424

2525
deploy:
26-
provider: pypi
27-
user: nicolargo
28-
password:
29-
secure: Fms23jiiKKq6qJMsZYrmBz5mC753VGrjCxzVrsioENfH3KaFf6kUc9fTYntaLvjLPTNBkU3R2IORfVOikJKmNWqWVZOdJ/nq8zPl6o9MgdNcX7qWTvY8Fi9MW7tIZHrehhm0LvWFVq8ZSc8iYzw3/741lvBh8vpJZSQs3sq/1QI=
30-
on:
31-
tags: true
32-
branch: master
33-
distributions: sdist bdist_wheel
34-
repo: nicolargo/glances
26+
- provider: pypi
27+
user: nicolargo
28+
password:
29+
secure: Fms23jiiKKq6qJMsZYrmBz5mC753VGrjCxzVrsioENfH3KaFf6kUc9fTYntaLvjLPTNBkU3R2IORfVOikJKmNWqWVZOdJ/nq8zPl6o9MgdNcX7qWTvY8Fi9MW7tIZHrehhm0LvWFVq8ZSc8iYzw3/741lvBh8vpJZSQs3sq/1QI=
30+
on:
31+
tags: true
32+
branch: master
33+
distributions: sdist bdist_wheel
34+
repo: nicolargo/glances
35+
- provider: pypi
36+
server: https://test.pypi.org/legacy/
37+
user: nicolargo
38+
password:
39+
secure: kxchYP3VJWe74jun0rJjuEFFpnO2sF3WHsK5Axlz4flJ6dtX0OPeZd9SlqgMX7cv9FHcXxyukVKrw4PHVqUNcWoaKM8TNeddKkGeSjcVY5C7NIExXh5es4SguozdT4cckoJUyN2xXc7cUAM68CHWfxijR6NiDMXIuMJrZumye6c=
40+
on:
41+
tags: false
42+
branch: develop
43+
distributions: sdist bdist_wheel
44+
repo: nicolargo/glances

NEWS.rst

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,54 @@
22
Glances Version 3
33
==============================================================================
44

5+
Version 3.1.6
6+
=============
7+
8+
Enhancements and new features:
9+
10+
* Kill a process from the Curses interface #1444
11+
* Manual refresh on F5 in the Curses interface #1753
12+
* Hide function in sensors section #1590
13+
* Enhancement Request: .conf parameter for AMP #1690
14+
* Password for Web/Browser mode #1674
15+
* Unable to connect to Influxdb 2.0 #1776
16+
* ci: fix release process and improve build speeds #1782
17+
* Cache cpuinfo output #1700
18+
* sort by clicking improvements and bug #1578
19+
* Allow embedded AMP python script to be placed in a configurable location #1734
20+
* Add attributes to stdout/stdout-csv plugins #1733
21+
* Do not shorten container names #1723
22+
23+
Bugs corrected:
24+
25+
* Version tag for docker image packaging #1754
26+
* Unusual characters in cmdline cause lines to disappear and corrupt the display #1692
27+
* UnicodeDecodeError on any command with a utf8 character in its name #1676
28+
* Docker image is not up to date install #1662
29+
* Add option to set the strftime format #1785
30+
* fix: docker dev build contains all optional requirements #1779
31+
* GPU information is incomplete via web #1697
32+
* [WebUI] Fix display of null values for GPU plugin #1773
33+
* crash on startup on Illumos when no swap is configured #1767
34+
* Glances crashes with 2 GPUS bug #1683
35+
* [Feature Request] Filter Docker containers#1748
36+
* Error with IP Plugin : object has no attribute #1528
37+
* docker-compose #1760
38+
* [WebUI] Fix sort by disk io #1759
39+
* Connection to MQTT server failst #1705
40+
* Misleading image tag latest-arm needs contributor packaging #1419
41+
* Docker nicolargo/glances:latest missing arm builds? #1746
42+
* Alpine image is broken packaging #1744
43+
* RIP Alpine? needs contributor packaging #1741
44+
* Manpage improvement documentation #1743
45+
* Make build reproducible packaging #1740
46+
* Automated multiarch builds for docker #1716
47+
* web ui of glances is not coming #1721
48+
* fixing command in json.rst #1724
49+
* Fix container rss value #1722
50+
* Alpine Image is broken needs test packaging #1720
51+
* Fix gpu plugin to handle multiple gpus with different reporting capabilities bug #1634
52+
553
Version 3.1.5
654
=============
755

README.rst

Lines changed: 30 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,13 @@ Glances - An eye on your system
99
:target: https://github.com/nicolargo/glances/
1010
:alt: Github stars
1111

12+
.. image:: https://img.shields.io/docker/pulls/nicolargo/glances
13+
:target: https://hub.docker.com/r/nicolargo/glances/
14+
:alt: Docker pull
15+
1216
.. image:: https://pepy.tech/badge/glances/month
1317
:target: https://pepy.tech/project/glances
14-
:alt: Downloads
18+
:alt: Pypi downloads
1519

1620
.. image:: https://img.shields.io/travis/nicolargo/glances/master.svg?maxAge=3600&label=Linux%20/%20BSD%20/%20macOS
1721
:target: https://travis-ci.org/nicolargo/glances
@@ -24,8 +28,8 @@ Glances - An eye on your system
2428
.. image:: https://scrutinizer-ci.com/g/nicolargo/glances/badges/quality-score.png?b=develop
2529
:target: https://scrutinizer-ci.com/g/nicolargo/glances/?branch=develop
2630

27-
.. image:: https://img.shields.io/badge/Donate-PayPal-green.svg
28-
:target: https://www.paypal.me/nicolargo
31+
.. image:: https://img.shields.io/static/v1?label=Sponsor&message=%E2%9D%A4&logo=GitHub&link=https://github.com/sponsors/nicolargo
32+
:target: https://github.com/sponsors/nicolargo
2933

3034
.. image:: https://img.shields.io/twitter/url/https/twitter.com/cloudposse.svg?style=social&label=Follow%20%40nicolargo
3135
:target: https://twitter.com/nicolargo
@@ -65,7 +69,8 @@ Optional dependencies:
6569
- ``docker`` (for the Docker monitoring support) [Linux/macOS-only]
6670
- ``elasticsearch`` (for the Elastic Search export module)
6771
- ``hddtemp`` (for HDD temperature monitoring support) [Linux-only]
68-
- ``influxdb`` (for the InfluxDB export module)
72+
- ``influxdb`` (for the InfluxDB version 1 export module)
73+
- ``influxdb-client`` (for the InfluxDB version 2 export module) [Only for Python >= 3.6]
6974
- ``kafka-python`` (for the Kafka export module)
7075
- ``netifaces`` (for the IP plugin)
7176
- ``nvidia-ml-py3`` (for the GPU plugin)
@@ -161,31 +166,44 @@ If you need to install Glances in a specific user location, use:
161166
export PYTHONUSERBASE=~/mylocalpath
162167
pip install --user glances
163168
169+
The current develop branch is also published to the test.pypi.org package index.
170+
If you want to test the develop version, enter:
171+
172+
.. code-block:: console
173+
174+
pip install -i https://test.pypi.org/simple/ Glances
175+
164176
Docker: the funny way
165177
---------------------
166178

167179
A Glances container is available. It includes the latest development
168180
HEAD version. You can use it to monitor your server and all your other
169181
containers!
170182

171-
Get the Glances container:
183+
Get the Glances container (latest develop branch):
172184

173185
.. code-block:: console
174186
175-
docker pull nicolargo/glances
187+
docker pull nicolargo/glances:dev
188+
189+
Note, you can choose another branch with :
190+
191+
- nicolargo/glances:latest for the last master branch (included multiple architectures 386, amd64, arm/v7 and arm64)
192+
- nicolargo/glances:dev for the last develop branch (included multiple architectures 386, amd64, arm/v7 and arm64)
193+
- nicolargo/glances:<version> for the specific <version> (included multiple architectures 386, amd64, arm/v7 and arm64)
176194

177195
Run the container in *console mode*:
178196

179197
.. code-block:: console
180198
181-
docker run --rm -v /var/run/docker.sock:/var/run/docker.sock:ro --pid host --network host -it docker.io/nicolargo/glances
199+
docker run --rm -v /var/run/docker.sock:/var/run/docker.sock:ro --pid host --network host -it nicolargo/glances:dev
182200
183201
Additionally, if you want to use your own glances.conf file, you can
184202
create your own Dockerfile:
185203

186204
.. code-block:: console
187205
188-
FROM nicolargo/glances
206+
FROM nicolargo/glances:dev
189207
COPY glances.conf /glances/conf/glances.conf
190208
CMD python -m glances -C /glances/conf/glances.conf $GLANCES_OPT
191209
@@ -194,7 +212,7 @@ docker run options:
194212

195213
.. code-block:: console
196214
197-
docker run -v `pwd`/glances.conf:/glances/conf/glances.conf -v /var/run/docker.sock:/var/run/docker.sock:ro --pid host -it docker.io/nicolargo/glances
215+
docker run -v `pwd`/glances.conf:/glances/conf/glances.conf -v /var/run/docker.sock:/var/run/docker.sock:ro --pid host -it nicolargo/glances:dev
198216
199217
Where \`pwd\`/glances.conf is a local directory containing your glances.conf file.
200218

@@ -203,7 +221,7 @@ variable setting parameters for the glances startup command):
203221

204222
.. code-block:: console
205223
206-
docker run -d --restart="always" -p 61208-61209:61208-61209 -e GLANCES_OPT="-w" -v /var/run/docker.sock:/var/run/docker.sock:ro --pid host docker.io/nicolargo/glances
224+
docker run -d --restart="always" -p 61208-61209:61208-61209 -e GLANCES_OPT="-w" -v /var/run/docker.sock:/var/run/docker.sock:ro --pid host nicolargo/glances:dev
207225
208226
GNU/Linux
209227
---------
@@ -416,8 +434,7 @@ Donation
416434

417435
If this project help you, you can give me a tip ;)
418436

419-
.. image:: https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif
420-
:target: https://www.paypal.me/nicolargo
437+
See the sponsors_ page.
421438

422439
Author
423440
======
@@ -440,3 +457,4 @@ Glances is distributed under the LGPL version 3 license. See ``COPYING`` for mor
440457
.. _forum: https://groups.google.com/forum/?hl=en#!forum/glances-users
441458
.. _wiki: https://github.com/nicolargo/glances/wiki/How-to-contribute-to-Glances-%3F
442459
.. _package: https://repology.org/metapackage/glances/packages
460+
.. _sponsors: https://github.com/sponsors/nicolargo

0 commit comments

Comments
 (0)