From c7172ced626644e4d56c447eb6c7d4be9e925926 Mon Sep 17 00:00:00 2001 From: nicolargo Date: Sat, 9 Sep 2017 10:29:10 +0200 Subject: [PATCH 1/6] Udpate doc for release 2.11.1 --- docs/man/glances.1 | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/man/glances.1 b/docs/man/glances.1 index 8e2e9967..4ead65e4 100644 --- a/docs/man/glances.1 +++ b/docs/man/glances.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "GLANCES" "1" "Aug 27, 2017" "2.11" "Glances" +.TH "GLANCES" "1" "Sep 09, 2017" "2.11.1_DEVELOP" "Glances" .SH NAME glances \- An eye on your system . diff --git a/requirements.txt b/requirements.txt index 4cc0c6c0..398d7b19 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -psutil==5.2.2 +psutil==5.3.0 From 8b57d9508ba22d11f6b718762a2038fdab0cedfa Mon Sep 17 00:00:00 2001 From: nicolargo Date: Sat, 9 Sep 2017 10:29:37 +0200 Subject: [PATCH 2/6] Udpate version for release 2.11.1 --- glances/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glances/__init__.py b/glances/__init__.py index 604a83a3..a3ab255d 100644 --- a/glances/__init__.py +++ b/glances/__init__.py @@ -27,7 +27,7 @@ import signal import sys # Global name -__version__ = '2.11.1_DEVELOP' +__version__ = '2.11.1' __author__ = 'Nicolas Hennion ' __license__ = 'LGPLv3' From 6f0fff533e7d0250aa63445272b36e66da4e61d8 Mon Sep 17 00:00:00 2001 From: Evan Dandrea Date: Mon, 30 Oct 2017 19:40:43 +0000 Subject: [PATCH 3/6] Add missing mount-observe and system-observe interfaces. --- snap/snapcraft.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 83f7b14c..5ac5c1f1 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -15,6 +15,8 @@ apps: command: bin/glances plugs: - network + - mount-observe + - system-observe parts: glances: From 8edc48df704ea956c23729f1c648901bc32553d1 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 10 Jan 2018 12:23:06 +0000 Subject: [PATCH 4/6] Update Homebrew installation instructions glances itself is now packaged by Homebrew: https://github.com/Homebrew/homebrew-core/pull/22538 --- README.rst | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 278c62d5..a457d183 100644 --- a/README.rst +++ b/README.rst @@ -232,8 +232,7 @@ Homebrew .. code-block:: console - $ brew install python - $ pip install glances + $ brew install glances MacPorts ```````` From bb9e74144529f33609a08010260b80bda0d98b3a Mon Sep 17 00:00:00 2001 From: Matthew Jacobi Date: Wed, 17 Jan 2018 09:58:39 +0000 Subject: [PATCH 5/6] update readme docker run command slightly better way which: - doesn't leave the container around when finished - uses network host mode which then allows glances to show the network devices --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index a457d183..de5b3cb4 100644 --- a/README.rst +++ b/README.rst @@ -172,7 +172,7 @@ Run the container in *console mode*: .. code-block:: console - docker run -v /var/run/docker.sock:/var/run/docker.sock:ro --pid host -it docker.io/nicolargo/glances + docker run --rm -v /var/run/docker.sock:/var/run/docker.sock:ro --pid host --network host -it docker.io/nicolargo/glances Additionally, if you want to use your own glances.conf file, you can create your own Dockerfile: From c2863629dda28d98a1df126c65c5da3540fbf4a2 Mon Sep 17 00:00:00 2001 From: nicolargo Date: Wed, 24 Jan 2018 20:58:48 +0100 Subject: [PATCH 6/6] Rename docker folder to docker-files because import docker return always true... --- {docker => docker-files}/devel/Dockerfile | 0 {docker => docker-files}/master/Dockerfile | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename {docker => docker-files}/devel/Dockerfile (100%) rename {docker => docker-files}/master/Dockerfile (100%) diff --git a/docker/devel/Dockerfile b/docker-files/devel/Dockerfile similarity index 100% rename from docker/devel/Dockerfile rename to docker-files/devel/Dockerfile diff --git a/docker/master/Dockerfile b/docker-files/master/Dockerfile similarity index 100% rename from docker/master/Dockerfile rename to docker-files/master/Dockerfile