Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
蜕变的菜鸟
glances
提交
bdd55743
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,发现更多精彩内容 >>
提交
bdd55743
编写于
5月 31, 2019
作者:
N
nicolargo
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Allow comma separated commands in AMP
上级
f7f78f7d
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
32 addition
and
18 deletion
+32
-18
NEWS
NEWS
+2
-1
conf/glances.conf
conf/glances.conf
+8
-0
glances/amps/glances_default.py
glances/amps/glances_default.py
+22
-17
未找到文件。
NEWS
浏览文件 @
bdd55743
...
...
@@ -28,6 +28,7 @@ Others:
* Documentation is unclear how to get Docker information #1386
* Add 'all' target to the Pip install (install all dependencies)
* Allow comma separated commands in AMP
Version 3.1
===========
...
...
conf/glances.conf
浏览文件 @
bdd55743
...
...
@@ -510,6 +510,14 @@ regex=.*python.*
refresh
=
3
countmax
=
20
[
amp_conntrack
]
# Use comma separated for multiple commands (no space around the comma)
enable
=
false
regex
=\/
sbin
\/
init
refresh
=
30
one_line
=
false
command
=
sysctl
net
.
netfilter
.
nf_conntrack_count
;
sysctl
net
.
netfilter
.
nf_conntrack_max
[
amp_nginx
]
# Use the NGinx AMP
# Nginx status page should be enable (https://easyengine.io/tutorials/nginx/status-page/)
...
...
glances/amps/glances_default.py
浏览文件 @
bdd55743
...
...
@@ -46,7 +46,7 @@ class Amp(GlancesAmp):
"""Glances' Default AMP."""
NAME
=
''
VERSION
=
'1.
0
'
VERSION
=
'1.
1
'
DESCRIPTION
=
''
AUTHOR
=
'Nicolargo'
EMAIL
=
'contact@nicolargo.com'
...
...
@@ -59,23 +59,28 @@ class Amp(GlancesAmp):
def
update
(
self
,
process_list
):
"""Update the AMP"""
# Get the systemctl status
logger
.
debug
(
'{}: Update AMP stats using service {}'
.
format
(
self
.
NAME
,
self
.
get
(
'service_cmd'
)))
logger
.
debug
(
'{}: Update AMP stats using command {}'
.
format
(
self
.
NAME
,
self
.
get
(
'service_cmd'
)))
# Get command to execute
try
:
res
=
self
.
get
(
'command'
)
except
OSError
as
e
:
logger
.
debug
(
'{}: Error while executing service ({})'
.
format
(
self
.
NAME
,
e
))
else
:
if
res
is
not
None
:
try
:
msg
=
u
(
check_output
(
res
.
split
(),
stderr
=
STDOUT
))
self
.
set_result
(
to_ascii
(
msg
.
rstrip
()))
except
CalledProcessError
as
e
:
self
.
set_result
(
e
.
output
)
else
:
logger
.
debug
(
'{}: Error while executing command ({})'
.
format
(
self
.
NAME
,
e
))
return
self
.
result
()
# No command found, use default message
if
res
is
None
:
# Set the default message if command return None
# Default sum of CPU and MEM for the matching regex
self
.
set_result
(
'CPU: {:.1f}% | MEM: {:.1f}%'
.
format
(
sum
([
p
[
'cpu_percent'
]
for
p
in
process_list
]),
sum
([
p
[
'memory_percent'
]
for
p
in
process_list
])))
return
self
.
result
()
# Run command(s)
# Comman separated commands can be executed
try
:
msg
=
''
for
cmd
in
res
.
split
(
';'
):
msg
+=
u
(
check_output
(
cmd
.
split
(),
stderr
=
STDOUT
))
self
.
set_result
(
to_ascii
(
msg
.
rstrip
()))
except
CalledProcessError
as
e
:
self
.
set_result
(
e
.
output
)
return
self
.
result
()
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录