Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
蜕变的菜鸟
glances
提交
20576f8d
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 搜索 >>
提交
20576f8d
编写于
9月 10, 2016
作者:
N
nicolargo
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
version 2.7
上级
744cd345
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
3 addition
and
60 deletion
+3
-60
NEWS
NEWS
+2
-6
glances/compat.py
glances/compat.py
+1
-0
glances/plugins/glances_docker.py
glances/plugins/glances_docker.py
+0
-52
unitest-xmlrpc.py
unitest-xmlrpc.py
+0
-1
unitest.py
unitest.py
+0
-1
未找到文件。
NEWS
浏览文件 @
20576f8d
...
...
@@ -2,8 +2,8 @@
Glances Version 2
==============================================================================
Version 2.
6.2
===========
==
Version 2.
7
===========
Backward-incompatible changes:
...
...
@@ -55,11 +55,7 @@ Version 2.6.2
Bugs corrected:
<<<<<<< HEAD
* Crash with Docker 1.11 (issue #848)
=======
* Crash with Docker 1.11 (issue #848)
>>>>>>> master
Version 2.6.1
=============
...
...
glances/compat.py
浏览文件 @
20576f8d
...
...
@@ -27,6 +27,7 @@ import unicodedata
PY3
=
sys
.
version_info
[
0
]
==
3
def
to_ascii
(
s
):
"""Convert the unicode 's' to a ASCII string
Usefull to remove accent (diacritics)"""
...
...
glances/plugins/glances_docker.py
浏览文件 @
20576f8d
...
...
@@ -304,11 +304,7 @@ class Plugin(GlancesPlugin):
ret
[
'max_usage'
]
=
all_stats
[
'memory_stats'
][
'max_usage'
]
except
(
KeyError
,
TypeError
)
as
e
:
# all_stats do not have MEM information
<<<<<<<
HEAD
logger
.
debug
(
"Cannot grab MEM usage for container {} ({})"
.
format
(
container_id
,
e
))
=======
logger
.
debug
(
"Can not grab MEM usage for container {0} ({1})"
.
format
(
container_id
,
e
))
>>>>>>>
master
logger
.
debug
(
all_stats
)
# Return the stats
return
ret
...
...
@@ -331,11 +327,7 @@ class Plugin(GlancesPlugin):
netcounters
=
all_stats
[
"networks"
]
except
KeyError
as
e
:
# all_stats do not have NETWORK information
<<<<<<<
HEAD
logger
.
debug
(
"Cannot grab NET usage for container {} ({})"
.
format
(
container_id
,
e
))
=======
logger
.
debug
(
"Can not grab NET usage for container {0} ({1})"
.
format
(
container_id
,
e
))
>>>>>>>
master
logger
.
debug
(
all_stats
)
# No fallback available...
return
network_new
...
...
@@ -359,24 +351,14 @@ class Plugin(GlancesPlugin):
# XML/RPC API, which would otherwise be overly difficult work
# for users of the API
try
:
<<<<<<<
HEAD
network_new
[
'time_since_update'
]
=
getTimeSinceLastUpdate
(
'docker_net_{}'
.
format
(
container_id
))
=======
network_new
[
'time_since_update'
]
=
getTimeSinceLastUpdate
(
'docker_net_{0}'
.
format
(
container_id
))
>>>>>>>
master
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"
]
<<<<<<<
HEAD
except
KeyError
as
e
:
# all_stats do not have INTERFACE information
logger
.
debug
(
"Cannot grab network interface usage for container {} ({})"
.
format
(
container_id
,
e
))
=======
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
))
>>>>>>>
master
logger
.
debug
(
all_stats
)
# Save stats to compute next bitrate
...
...
@@ -403,11 +385,7 @@ class Plugin(GlancesPlugin):
iocounters
=
all_stats
[
"blkio_stats"
]
except
KeyError
as
e
:
# all_stats do not have io information
<<<<<<<
HEAD
logger
.
debug
(
"Cannot grab block IO usage for container {} ({})"
.
format
(
container_id
,
e
))
=======
logger
.
debug
(
"Can not grab block IO usage for container {0} ({1})"
.
format
(
container_id
,
e
))
>>>>>>>
master
logger
.
debug
(
all_stats
)
# No fallback available...
return
io_new
...
...
@@ -488,7 +466,6 @@ class Plugin(GlancesPlugin):
ret
.
append
(
self
.
curse_add_line
(
msg
))
msg
=
'{:>7}'
.
format
(
'MEM'
)
ret
.
append
(
self
.
curse_add_line
(
msg
))
<<<<<<<
HEAD
msg
=
'{:>7}'
.
format
(
'/MAX'
)
ret
.
append
(
self
.
curse_add_line
(
msg
))
msg
=
'{:>7}'
.
format
(
'IOR/s'
)
...
...
@@ -496,17 +473,6 @@ class Plugin(GlancesPlugin):
msg
=
'{:>7}'
.
format
(
'IOW/s'
)
ret
.
append
(
self
.
curse_add_line
(
msg
))
msg
=
'{:>7}'
.
format
(
'Rx/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:>7}'
.
format
(
'IOW/s'
)
ret
.
append
(
self
.
curse_add_line
(
msg
))
msg
=
'{0:>7}'
.
format
(
'Rx/s'
)
ret
.
append
(
self
.
curse_add_line
(
msg
))
msg
=
'{0:>7}'
.
format
(
'Tx/s'
)
>>>>>>>
master
ret
.
append
(
self
.
curse_add_line
(
msg
))
msg
=
'{:>7}'
.
format
(
'Tx/s'
)
ret
.
append
(
self
.
curse_add_line
(
msg
))
...
...
@@ -548,24 +514,13 @@ class Plugin(GlancesPlugin):
except
KeyError
:
msg
=
'{:>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"
<<<<<<<
HEAD
msg
=
'{:>7}'
.
format
(
value
)
except
KeyError
:
msg
=
'{:>7}'
.
format
(
'?'
)
=======
msg
=
'{0:>7}'
.
format
(
value
)
except
KeyError
:
msg
=
'{0:>7}'
.
format
(
'?'
)
>>>>>>>
master
ret
.
append
(
self
.
curse_add_line
(
msg
))
# NET RX/TX
if
args
.
byte
:
...
...
@@ -578,17 +533,10 @@ class Plugin(GlancesPlugin):
unit
=
'b'
for
r
in
[
'rx'
,
'tx'
]:
try
:
<<<<<<<
HEAD
value
=
self
.
auto_unit
(
int
(
container
[
'network'
][
r
]
//
container
[
'network'
][
'time_since_update'
]
*
to_bit
))
+
unit
msg
=
'{:>7}'
.
format
(
value
)
except
KeyError
:
msg
=
'{:>7}'
.
format
(
'?'
)
=======
value
=
self
.
auto_unit
(
int
(
container
[
'network'
][
r
]
//
container
[
'network'
][
'time_since_update'
]
*
8
))
+
"b"
msg
=
'{0:>7}'
.
format
(
value
)
except
KeyError
:
msg
=
'{0:>7}'
.
format
(
'?'
)
>>>>>>>
master
ret
.
append
(
self
.
curse_add_line
(
msg
))
# Command
msg
=
' {}'
.
format
(
container
[
'Command'
])
...
...
unitest-xmlrpc.py
浏览文件 @
20576f8d
...
...
@@ -182,7 +182,6 @@ class TestGlances(unittest.TestCase):
req
=
json
.
loads
(
client
.
getIrq
())
self
.
assertIsInstance
(
req
,
list
)
def
test_999_stop_server
(
self
):
"""Stop the Glances Web Server."""
print
(
'INFO: [TEST_999] Stop the Glances Server'
)
...
...
unitest.py
浏览文件 @
20576f8d
...
...
@@ -201,7 +201,6 @@ class TestGlances(unittest.TestCase):
self
.
assertTrue
(
type
(
stats_grab
)
is
list
,
msg
=
'IRQ stats is not a list'
)
print
(
'INFO: IRQ stats: %s'
%
stats_grab
)
def
test_097_attribute
(
self
):
"""Test GlancesAttribute classe"""
print
(
'INFO: [TEST_097] Test attribute'
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录