Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
蜕变的菜鸟
glances
提交
153ce376
G
glances
项目概览
蜕变的菜鸟
/
glances
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
glances
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
153ce376
编写于
6月 14, 2021
作者:
N
nicolargo
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Docker containers information missing with Docker 20.10.x #1878
上级
d4339de5
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
6 addition
and
8 deletion
+6
-8
conf/glances.conf
conf/glances.conf
+0
-2
docs/aoa/docker.rst
docs/aoa/docker.rst
+0
-2
docs/man/glances.1
docs/man/glances.1
+1
-1
glances/__init__.py
glances/__init__.py
+1
-1
glances/plugins/glances_docker.py
glances/plugins/glances_docker.py
+4
-2
未找到文件。
conf/glances.conf
浏览文件 @
153ce376
...
...
@@ -361,8 +361,6 @@ port_default_gateway=True
[
docker
]
disable
=
False
# Timeout for API calls (in seconds, default is 1)
timeout
=
1
# Only show specific containers (comma separeted list of container name or regular expression)
# Comment this line to display all containers (default configuration)
#show=telegraf
...
...
docs/aoa/docker.rst
浏览文件 @
153ce376
...
...
@@ -21,8 +21,6 @@ under the ``[docker]`` section:
[docker]
disable=False
# Timeout for API calls (in seconds, default is 1)
timeout=1
# Only show specific containers (comma separeted list of container name or regular expression)
show=thiscontainer,andthisone,andthoseones.*
# Hide some containers (comma separeted list of container name or regular expression)
...
...
docs/man/glances.1
浏览文件 @
153ce376
.\" Man page generated from reStructuredText.
.
.TH "GLANCES" "1" "Jun 1
2, 2021" "3.2.0b2
" "Glances"
.TH "GLANCES" "1" "Jun 1
4, 2021" "3.2.0b3
" "Glances"
.SH NAME
glances \- An eye on your system
.
...
...
glances/__init__.py
浏览文件 @
153ce376
...
...
@@ -29,7 +29,7 @@ import sys
# Global name
# Version should start and end with a numerical char
# See https://packaging.python.org/specifications/core-metadata/#version
__version__
=
'3.2.0b
2
'
__version__
=
'3.2.0b
3
'
__author__
=
'Nicolas Hennion <nicolas@nicolargo.com>'
__license__
=
'LGPLv3'
...
...
glances/plugins/glances_docker.py
浏览文件 @
153ce376
...
...
@@ -137,8 +137,10 @@ class Plugin(GlancesPlugin):
def
connect
(
self
):
"""Connect to the Docker server."""
try
:
ret
=
docker
.
from_env
(
timeout
=
int
(
self
.
get_conf_value
(
'timeout'
,
default
=
'1'
)))
# If the following line replace the next one, the issue #1878
# is reproduced (Docker containers information missing with Docker 20.10.x)
# So, for the moment disable the timeout option
ret
=
docker
.
from_env
()
except
Exception
as
e
:
logger
.
error
(
"docker plugin - Can not connect to Docker ({})"
.
format
(
e
))
ret
=
None
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录