Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
蜕变的菜鸟
glances
提交
9c08a38c
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,体验更适合开发者的 AI 搜索 >>
提交
9c08a38c
编写于
4月 18, 2016
作者:
N
nicolargo
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Crash with Docker 1.11 #848
上级
8abb6d45
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
35 addition
and
17 deletion
+35
-17
glances/plugins/glances_docker.py
glances/plugins/glances_docker.py
+35
-17
未找到文件。
glances/plugins/glances_docker.py
浏览文件 @
9c08a38c
...
...
@@ -256,6 +256,7 @@ class Plugin(GlancesPlugin):
except
KeyError
as
e
:
# all_stats do not have CPU information
logger
.
debug
(
"Can not grab CPU usage for container {0} ({1})"
.
format
(
container_id
,
e
))
logger
.
debug
(
all_stats
)
else
:
# Previous CPU stats stored in the cpu_old variable
if
not
hasattr
(
self
,
'cpu_old'
):
...
...
@@ -294,13 +295,16 @@ class Plugin(GlancesPlugin):
ret
=
{}
# Read the stats
try
:
ret
[
'rss'
]
=
all_stats
[
'memory_stats'
][
'stats'
][
'rss'
]
ret
[
'cache'
]
=
all_stats
[
'memory_stats'
][
'stats'
][
'cache'
]
# Do not exist anymore with Docker 1.11 (issue #848)
# ret['rss'] = all_stats['memory_stats']['stats']['rss']
# ret['cache'] = all_stats['memory_stats']['stats']['cache']
ret
[
'usage'
]
=
all_stats
[
'memory_stats'
][
'usage'
]
ret
[
'limit'
]
=
all_stats
[
'memory_stats'
][
'limit'
]
ret
[
'max_usage'
]
=
all_stats
[
'memory_stats'
][
'max_usage'
]
except
KeyError
as
e
:
except
(
KeyError
,
TypeError
)
as
e
:
# all_stats do not have MEM information
logger
.
debug
(
"Can not grab MEM usage for container {0} ({1})"
.
format
(
container_id
,
e
))
logger
.
debug
(
all_stats
)
# Return the stats
return
ret
...
...
@@ -319,10 +323,11 @@ class Plugin(GlancesPlugin):
# Read the rx/tx stats (in bytes)
try
:
netcounters
=
all_stats
[
"network"
]
netcounters
=
all_stats
[
"network
s
"
]
except
KeyError
as
e
:
# all_stats do not have NETWORK information
logger
.
debug
(
"Can not grab NET usage for container {0} ({1})"
.
format
(
container_id
,
e
))
logger
.
debug
(
all_stats
)
# No fallback available...
return
network_new
...
...
@@ -344,11 +349,16 @@ class Plugin(GlancesPlugin):
# By storing time data we enable Rx/s and Tx/s calculations in the
# XML/RPC API, which would otherwise be overly difficult work
# for users of the API
network_new
[
'time_since_update'
]
=
getTimeSinceLastUpdate
(
'docker_net_{0}'
.
format
(
container_id
))
network_new
[
'rx'
]
=
netcounters
[
"rx_bytes"
]
-
self
.
netcounters_old
[
container_id
][
"rx_bytes"
]
network_new
[
'tx'
]
=
netcounters
[
"tx_bytes"
]
-
self
.
netcounters_old
[
container_id
][
"tx_bytes"
]
network_new
[
'cumulative_rx'
]
=
netcounters
[
"rx_bytes"
]
network_new
[
'cumulative_tx'
]
=
netcounters
[
"tx_bytes"
]
try
:
network_new
[
'time_since_update'
]
=
getTimeSinceLastUpdate
(
'docker_net_{0}'
.
format
(
container_id
))
network_new
[
'rx'
]
=
netcounters
[
"eth0"
][
"rx_bytes"
]
-
self
.
netcounters_old
[
container_id
][
"eth0"
][
"rx_bytes"
]
network_new
[
'tx'
]
=
netcounters
[
"eth0"
][
"tx_bytes"
]
-
self
.
netcounters_old
[
container_id
][
"eth0"
][
"tx_bytes"
]
network_new
[
'cumulative_rx'
]
=
netcounters
[
"eth0"
][
"rx_bytes"
]
network_new
[
'cumulative_tx'
]
=
netcounters
[
"eth0"
][
"tx_bytes"
]
except
KeyError
:
# all_stats do not have INTERFACE information
logger
.
debug
(
"Can not grab network interface usage for container {0} ({1})"
.
format
(
container_id
,
e
))
logger
.
debug
(
all_stats
)
# Save stats to compute next bitrate
self
.
netcounters_old
[
container_id
]
=
netcounters
...
...
@@ -375,6 +385,7 @@ class Plugin(GlancesPlugin):
except
KeyError
as
e
:
# all_stats do not have io information
logger
.
debug
(
"Can not grab block IO usage for container {0} ({1})"
.
format
(
container_id
,
e
))
logger
.
debug
(
all_stats
)
# No fallback available...
return
io_new
...
...
@@ -455,13 +466,15 @@ class Plugin(GlancesPlugin):
ret
.
append
(
self
.
curse_add_line
(
msg
))
msg
=
'{0:>7}'
.
format
(
'MEM'
)
ret
.
append
(
self
.
curse_add_line
(
msg
))
msg
=
'{0:>6}'
.
format
(
'IOR/s'
)
msg
=
'{0:>7}'
.
format
(
'/MAX'
)
ret
.
append
(
self
.
curse_add_line
(
msg
))
msg
=
'{0:>7}'
.
format
(
'IOR/s'
)
ret
.
append
(
self
.
curse_add_line
(
msg
))
msg
=
'{0:>
6
}'
.
format
(
'IOW/s'
)
msg
=
'{0:>
7
}'
.
format
(
'IOW/s'
)
ret
.
append
(
self
.
curse_add_line
(
msg
))
msg
=
'{0:>
6
}'
.
format
(
'Rx/s'
)
msg
=
'{0:>
7
}'
.
format
(
'Rx/s'
)
ret
.
append
(
self
.
curse_add_line
(
msg
))
msg
=
'{0:>
6
}'
.
format
(
'Tx/s'
)
msg
=
'{0:>
7
}'
.
format
(
'Tx/s'
)
ret
.
append
(
self
.
curse_add_line
(
msg
))
msg
=
' {0:8}'
.
format
(
'Command'
)
ret
.
append
(
self
.
curse_add_line
(
msg
))
...
...
@@ -496,21 +509,26 @@ class Plugin(GlancesPlugin):
except
KeyError
:
msg
=
'{0:>7}'
.
format
(
'?'
)
ret
.
append
(
self
.
curse_add_line
(
msg
))
try
:
msg
=
'{0:>7}'
.
format
(
self
.
auto_unit
(
container
[
'memory'
][
'limit'
]))
except
KeyError
:
msg
=
'{0:>7}'
.
format
(
'?'
)
ret
.
append
(
self
.
curse_add_line
(
msg
))
# IO R/W
for
r
in
[
'ior'
,
'iow'
]:
try
:
value
=
self
.
auto_unit
(
int
(
container
[
'io'
][
r
]
//
container
[
'io'
][
'time_since_update'
]
*
8
))
+
"b"
msg
=
'{0:>
6
}'
.
format
(
value
)
msg
=
'{0:>
7
}'
.
format
(
value
)
except
KeyError
:
msg
=
'{0:>
6
}'
.
format
(
'?'
)
msg
=
'{0:>
7
}'
.
format
(
'?'
)
ret
.
append
(
self
.
curse_add_line
(
msg
))
# NET RX/TX
for
r
in
[
'rx'
,
'tx'
]:
try
:
value
=
self
.
auto_unit
(
int
(
container
[
'network'
][
r
]
//
container
[
'network'
][
'time_since_update'
]
*
8
))
+
"b"
msg
=
'{0:>
6
}'
.
format
(
value
)
msg
=
'{0:>
7
}'
.
format
(
value
)
except
KeyError
:
msg
=
'{0:>
6
}'
.
format
(
'?'
)
msg
=
'{0:>
7
}'
.
format
(
'?'
)
ret
.
append
(
self
.
curse_add_line
(
msg
))
# Command
msg
=
' {0}'
.
format
(
container
[
'Command'
])
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录