Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
蜕变的菜鸟
glances
提交
d398cf0f
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,发现更多精彩内容 >>
提交
d398cf0f
编写于
12月 04, 2014
作者:
A
Alessio Sergi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove unused and duplicate import statements
Clean up import order.
上级
5b78805b
变更
28
显示空白变更内容
内联
并排
Showing
28 changed file
with
60 addition
and
70 deletion
+60
-70
glances/core/glances_client.py
glances/core/glances_client.py
+1
-2
glances/core/glances_client_browser.py
glances/core/glances_client_browser.py
+1
-2
glances/core/glances_config.py
glances/core/glances_config.py
+2
-2
glances/core/glances_logging.py
glances/core/glances_logging.py
+2
-1
glances/core/glances_main.py
glances/core/glances_main.py
+2
-2
glances/core/glances_processes.py
glances/core/glances_processes.py
+7
-5
glances/core/glances_server.py
glances/core/glances_server.py
+1
-1
glances/core/glances_standalone.py
glances/core/glances_standalone.py
+1
-2
glances/core/glances_staticlist.py
glances/core/glances_staticlist.py
+2
-2
glances/core/glances_stats.py
glances/core/glances_stats.py
+6
-7
glances/outputs/glances_bottle.py
glances/outputs/glances_bottle.py
+3
-3
glances/outputs/glances_colorconsole.py
glances/outputs/glances_colorconsole.py
+0
-2
glances/outputs/glances_csv.py
glances/outputs/glances_csv.py
+2
-3
glances/plugins/glances_alert.py
glances/plugins/glances_alert.py
+0
-1
glances/plugins/glances_core.py
glances/plugins/glances_core.py
+2
-2
glances/plugins/glances_cpu.py
glances/plugins/glances_cpu.py
+5
-5
glances/plugins/glances_diskio.py
glances/plugins/glances_diskio.py
+2
-2
glances/plugins/glances_fs.py
glances/plugins/glances_fs.py
+2
-4
glances/plugins/glances_hddtemp.py
glances/plugins/glances_hddtemp.py
+1
-1
glances/plugins/glances_load.py
glances/plugins/glances_load.py
+0
-1
glances/plugins/glances_mem.py
glances/plugins/glances_mem.py
+4
-4
glances/plugins/glances_memswap.py
glances/plugins/glances_memswap.py
+2
-2
glances/plugins/glances_network.py
glances/plugins/glances_network.py
+2
-2
glances/plugins/glances_percpu.py
glances/plugins/glances_percpu.py
+2
-4
glances/plugins/glances_plugin.py
glances/plugins/glances_plugin.py
+2
-2
glances/plugins/glances_processlist.py
glances/plugins/glances_processlist.py
+1
-1
glances/plugins/glances_psutilversion.py
glances/plugins/glances_psutilversion.py
+2
-2
glances/plugins/glances_uptime.py
glances/plugins/glances_uptime.py
+3
-3
未找到文件。
glances/core/glances_client.py
浏览文件 @
d398cf0f
...
@@ -35,10 +35,9 @@ except ImportError:
...
@@ -35,10 +35,9 @@ except ImportError:
import
httplib
import
httplib
# Import Glances libs
# Import Glances libs
from
glances.core.glances_globals
import
version
,
logger
from
glances.core.glances_globals
import
logger
,
version
from
glances.core.glances_stats
import
GlancesStatsClient
from
glances.core.glances_stats
import
GlancesStatsClient
from
glances.outputs.glances_curses
import
GlancesCursesClient
from
glances.outputs.glances_curses
import
GlancesCursesClient
from
glances.core.glances_autodiscover
import
GlancesAutoDiscoverServer
class
GlancesClientTransport
(
Transport
):
class
GlancesClientTransport
(
Transport
):
...
...
glances/core/glances_client_browser.py
浏览文件 @
d398cf0f
...
@@ -31,8 +31,8 @@ except ImportError:
...
@@ -31,8 +31,8 @@ except ImportError:
# Import Glances libs
# Import Glances libs
from
glances.core.glances_globals
import
logger
from
glances.core.glances_globals
import
logger
from
glances.outputs.glances_curses
import
GlancesCursesBrowser
from
glances.outputs.glances_curses
import
GlancesCursesBrowser
from
glances.core.glances_client
import
GlancesClientTransport
,
GlancesClient
from
glances.core.glances_autodiscover
import
GlancesAutoDiscoverServer
from
glances.core.glances_autodiscover
import
GlancesAutoDiscoverServer
from
glances.core.glances_client
import
GlancesClient
,
GlancesClientTransport
from
glances.core.glances_staticlist
import
GlancesStaticServer
from
glances.core.glances_staticlist
import
GlancesStaticServer
...
@@ -221,7 +221,6 @@ class GlancesClientBrowser(object):
...
@@ -221,7 +221,6 @@ class GlancesClientBrowser(object):
key
,
key
,
value
)
value
)
def
end
(
self
):
def
end
(
self
):
"""End of the client browser session."""
"""End of the client browser session."""
self
.
screen
.
end
()
self
.
screen
.
end
()
glances/core/glances_config.py
浏览文件 @
d398cf0f
...
@@ -37,9 +37,9 @@ from glances.core.glances_globals import (
...
@@ -37,9 +37,9 @@ from glances.core.glances_globals import (
is_mac
,
is_mac
,
is_py3
,
is_py3
,
is_windows
,
is_windows
,
logger
,
sys_prefix
,
sys_prefix
,
work_path
,
work_path
logger
)
)
...
...
glances/core/glances_logging.py
浏览文件 @
d398cf0f
...
@@ -21,8 +21,8 @@
...
@@ -21,8 +21,8 @@
import
logging
import
logging
import
logging.config
import
logging.config
import
tempfile
import
os
import
os
import
tempfile
# Define the logging configuration
# Define the logging configuration
LOGGING_CFG
=
{
LOGGING_CFG
=
{
...
@@ -70,6 +70,7 @@ LOGGING_CFG = {
...
@@ -70,6 +70,7 @@ LOGGING_CFG = {
}
}
}
}
def
glancesLogger
():
def
glancesLogger
():
_logger
=
logging
.
getLogger
()
_logger
=
logging
.
getLogger
()
try
:
try
:
...
...
glances/core/glances_main.py
浏览文件 @
d398cf0f
...
@@ -21,13 +21,13 @@
...
@@ -21,13 +21,13 @@
# Import system libs
# Import system libs
import
argparse
import
argparse
import
sys
import
os
import
os
import
sys
import
tempfile
import
tempfile
# Import Glances libs
# Import Glances libs
from
glances.core.glances_config
import
Config
from
glances.core.glances_config
import
Config
from
glances.core.glances_globals
import
appname
,
psutil_version
,
version
,
logger
,
is_windows
from
glances.core.glances_globals
import
appname
,
is_windows
,
logger
,
psutil_version
,
version
class
GlancesMain
(
object
):
class
GlancesMain
(
object
):
...
...
glances/core/glances_processes.py
浏览文件 @
d398cf0f
...
@@ -17,15 +17,17 @@
...
@@ -17,15 +17,17 @@
# You should have received a copy of the GNU Lesser General Public License
# You should have received a copy of the GNU Lesser General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Import Glances lib
from
glances.core.glances_globals
import
is_linux
,
is_bsd
,
is_mac
,
is_windows
,
logger
from
glances.core.glances_timer
import
Timer
,
getTimeSinceLastUpdate
# Import Python lib
# Import Python lib
import
collections
import
collections
import
psutil
import
re
import
re
# Import psutil
import
psutil
# Import Glances lib
from
glances.core.glances_globals
import
is_bsd
,
is_linux
,
is_mac
,
is_windows
,
logger
from
glances.core.glances_timer
import
getTimeSinceLastUpdate
,
Timer
class
ProcessTreeNode
(
object
):
class
ProcessTreeNode
(
object
):
...
...
glances/core/glances_server.py
浏览文件 @
d398cf0f
...
@@ -32,7 +32,7 @@ except ImportError: # Python 2
...
@@ -32,7 +32,7 @@ except ImportError: # Python 2
from
SimpleXMLRPCServer
import
SimpleXMLRPCServer
from
SimpleXMLRPCServer
import
SimpleXMLRPCServer
# Import Glances libs
# Import Glances libs
from
glances.core.glances_globals
import
version
,
logger
from
glances.core.glances_globals
import
logger
,
version
from
glances.core.glances_stats
import
GlancesStatsServer
from
glances.core.glances_stats
import
GlancesStatsServer
from
glances.core.glances_timer
import
Timer
from
glances.core.glances_timer
import
Timer
from
glances.core.glances_autodiscover
import
GlancesAutoDiscoverClient
from
glances.core.glances_autodiscover
import
GlancesAutoDiscoverClient
...
...
glances/core/glances_standalone.py
浏览文件 @
d398cf0f
...
@@ -20,10 +20,9 @@
...
@@ -20,10 +20,9 @@
"""Manage the Glances standalone session."""
"""Manage the Glances standalone session."""
# Import Glances libs
# Import Glances libs
from
glances.core.glances_globals
import
logger
from
glances.core.glances_globals
import
glances_processes
,
is_windows
,
logger
from
glances.core.glances_stats
import
GlancesStats
from
glances.core.glances_stats
import
GlancesStats
from
glances.outputs.glances_curses
import
GlancesCursesStandalone
from
glances.outputs.glances_curses
import
GlancesCursesStandalone
from
glances.core.glances_globals
import
glances_processes
,
is_windows
class
GlancesStandalone
(
object
):
class
GlancesStandalone
(
object
):
...
...
glances/core/glances_staticlist.py
浏览文件 @
d398cf0f
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
"""Manage the Glances server static list """
"""Manage the Glances server static list """
# System lib
# System lib
from
socket
import
g
ethostbyname
,
gaierror
from
socket
import
g
aierror
,
gethostbyname
# Import Glances libs
# Import Glances libs
from
glances.core.glances_globals
import
logger
from
glances.core.glances_globals
import
logger
...
...
glances/core/glances_stats.py
浏览文件 @
d398cf0f
...
@@ -21,10 +21,10 @@
...
@@ -21,10 +21,10 @@
import
collections
import
collections
import
os
import
os
import
sys
import
re
import
re
import
sys
from
glances.core.glances_globals
import
plugins_path
,
sys_path
,
logger
from
glances.core.glances_globals
import
logger
,
plugins_path
,
sys_path
# SNMP OID regexp pattern to short system name dict
# SNMP OID regexp pattern to short system name dict
oid_to_short_system_name
=
{
'.*Linux.*'
:
'linux'
,
oid_to_short_system_name
=
{
'.*Linux.*'
:
'linux'
,
...
@@ -288,7 +288,6 @@ class GlancesStatsClientSNMP(GlancesStats):
...
@@ -288,7 +288,6 @@ class GlancesStatsClientSNMP(GlancesStats):
return
short_system_name
return
short_system_name
def
update
(
self
):
def
update
(
self
):
"""Update the stats using SNMP."""
"""Update the stats using SNMP."""
# For each plugins, call the update method
# For each plugins, call the update method
...
...
glances/outputs/glances_bottle.py
浏览文件 @
d398cf0f
...
@@ -19,6 +19,7 @@
...
@@ -19,6 +19,7 @@
"""Web interface class."""
"""Web interface class."""
import
json
import
os
import
os
import
sys
import
sys
...
@@ -32,7 +33,6 @@ except ImportError:
...
@@ -32,7 +33,6 @@ except ImportError:
logger
.
critical
(
'Bottle module not found. Glances cannot start in web server mode.'
)
logger
.
critical
(
'Bottle module not found. Glances cannot start in web server mode.'
)
print
(
_
(
"Install it using pip: # pip install bottle"
))
print
(
_
(
"Install it using pip: # pip install bottle"
))
sys
.
exit
(
2
)
sys
.
exit
(
2
)
import
json
class
GlancesBottle
(
object
):
class
GlancesBottle
(
object
):
...
...
glances/outputs/glances_colorconsole.py
浏览文件 @
d398cf0f
...
@@ -21,8 +21,6 @@ import sys
...
@@ -21,8 +21,6 @@ import sys
import
threading
import
threading
import
time
import
time
from
glances.core.glances_globals
import
logger
import
msvcrt
import
msvcrt
try
:
try
:
import
colorconsole
import
colorconsole
...
...
glances/outputs/glances_csv.py
浏览文件 @
d398cf0f
...
@@ -20,12 +20,11 @@
...
@@ -20,12 +20,11 @@
"""CSV interface class."""
"""CSV interface class."""
# Import sys libs
# Import sys libs
import
sys
import
csv
import
csv
import
sys
# Import Glances lib
# Import Glances lib
from
glances.core.glances_globals
import
logger
from
glances.core.glances_globals
import
is_py3
,
logger
from
glances.core.glances_globals
import
is_py3
# List of stats enabled in the CSV output
# List of stats enabled in the CSV output
csv_stats_list
=
[
'cpu'
,
'load'
,
'mem'
,
'memswap'
]
csv_stats_list
=
[
'cpu'
,
'load'
,
'mem'
,
'memswap'
]
...
...
glances/plugins/glances_alert.py
浏览文件 @
d398cf0f
...
@@ -20,7 +20,6 @@
...
@@ -20,7 +20,6 @@
"""Alert plugin."""
"""Alert plugin."""
# Import system lib
# Import system lib
import
types
from
datetime
import
datetime
from
datetime
import
datetime
# Import Glances libs
# Import Glances libs
...
...
glances/plugins/glances_core.py
浏览文件 @
d398cf0f
...
@@ -19,10 +19,10 @@
...
@@ -19,10 +19,10 @@
"""CPU core plugin."""
"""CPU core plugin."""
from
glances.plugins.glances_plugin
import
GlancesPlugin
import
psutil
import
psutil
from
glances.plugins.glances_plugin
import
GlancesPlugin
class
Plugin
(
GlancesPlugin
):
class
Plugin
(
GlancesPlugin
):
...
...
glances/plugins/glances_cpu.py
浏览文件 @
d398cf0f
...
@@ -19,10 +19,10 @@
...
@@ -19,10 +19,10 @@
"""CPU plugin."""
"""CPU plugin."""
from
glances.plugins.glances_plugin
import
GlancesPlugin
import
psutil
import
psutil
from
glances.plugins.glances_plugin
import
GlancesPlugin
# SNMP OID
# SNMP OID
# percentage of user CPU time: .1.3.6.1.4.1.2021.11.9.0
# percentage of user CPU time: .1.3.6.1.4.1.2021.11.9.0
# percentages of system CPU time: .1.3.6.1.4.1.2021.11.10.0
# percentages of system CPU time: .1.3.6.1.4.1.2021.11.10.0
...
...
glances/plugins/glances_diskio.py
浏览文件 @
d398cf0f
...
@@ -19,12 +19,12 @@
...
@@ -19,12 +19,12 @@
"""Disk I/O plugin."""
"""Disk I/O plugin."""
import
psutil
# Import Glances libs
# Import Glances libs
from
glances.core.glances_timer
import
getTimeSinceLastUpdate
from
glances.core.glances_timer
import
getTimeSinceLastUpdate
from
glances.plugins.glances_plugin
import
GlancesPlugin
from
glances.plugins.glances_plugin
import
GlancesPlugin
import
psutil
# Define the history items list
# Define the history items list
# All items in this list will be historised if the --enable-history tag is set
# All items in this list will be historised if the --enable-history tag is set
# 'color' define the graph color in #RGB format
# 'color' define the graph color in #RGB format
...
...
glances/plugins/glances_fs.py
浏览文件 @
d398cf0f
...
@@ -19,12 +19,10 @@
...
@@ -19,12 +19,10 @@
"""File system plugin."""
"""File system plugin."""
# Glances libs
from
glances.plugins.glances_plugin
import
GlancesPlugin
# PSutil lib for local grab
import
psutil
import
psutil
from
glances.plugins.glances_plugin
import
GlancesPlugin
# SNMP OID
# SNMP OID
# The snmpd.conf needs to be edited.
# The snmpd.conf needs to be edited.
# Add the following to enable it on all disk
# Add the following to enable it on all disk
...
...
glances/plugins/glances_hddtemp.py
浏览文件 @
d398cf0f
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
"""HDD temperature plugin."""
"""HDD temperature plugin."""
# Import system libs
# Import system libs
import
os
.path
import
os
import
socket
import
socket
# Import Glances libs
# Import Glances libs
...
...
glances/plugins/glances_load.py
浏览文件 @
d398cf0f
...
@@ -23,7 +23,6 @@
...
@@ -23,7 +23,6 @@
import
os
import
os
# Import Glances libs
# Import Glances libs
from
glances.core.glances_globals
import
logger
from
glances.plugins.glances_core
import
Plugin
as
CorePlugin
from
glances.plugins.glances_core
import
Plugin
as
CorePlugin
from
glances.plugins.glances_plugin
import
GlancesPlugin
from
glances.plugins.glances_plugin
import
GlancesPlugin
...
...
glances/plugins/glances_mem.py
浏览文件 @
d398cf0f
...
@@ -19,10 +19,10 @@
...
@@ -19,10 +19,10 @@
"""Virtual memory plugin."""
"""Virtual memory plugin."""
from
glances.plugins.glances_plugin
import
GlancesPlugin
import
psutil
import
psutil
from
glances.plugins.glances_plugin
import
GlancesPlugin
# SNMP OID
# SNMP OID
# Total RAM in machine: .1.3.6.1.4.1.2021.4.5.0
# Total RAM in machine: .1.3.6.1.4.1.2021.4.5.0
# Total RAM used: .1.3.6.1.4.1.2021.4.6.0
# Total RAM used: .1.3.6.1.4.1.2021.4.6.0
...
...
glances/plugins/glances_memswap.py
浏览文件 @
d398cf0f
...
@@ -19,10 +19,10 @@
...
@@ -19,10 +19,10 @@
"""Swap memory plugin."""
"""Swap memory plugin."""
from
glances.plugins.glances_plugin
import
GlancesPlugin
import
psutil
import
psutil
from
glances.plugins.glances_plugin
import
GlancesPlugin
# SNMP OID
# SNMP OID
# Total Swap Size: .1.3.6.1.4.1.2021.4.3.0
# Total Swap Size: .1.3.6.1.4.1.2021.4.3.0
# Available Swap Space: .1.3.6.1.4.1.2021.4.4.0
# Available Swap Space: .1.3.6.1.4.1.2021.4.4.0
...
...
glances/plugins/glances_network.py
浏览文件 @
d398cf0f
...
@@ -21,11 +21,11 @@
...
@@ -21,11 +21,11 @@
import
base64
import
base64
import
psutil
from
glances.core.glances_timer
import
getTimeSinceLastUpdate
from
glances.core.glances_timer
import
getTimeSinceLastUpdate
from
glances.plugins.glances_plugin
import
GlancesPlugin
from
glances.plugins.glances_plugin
import
GlancesPlugin
import
psutil
# SNMP OID
# SNMP OID
# http://www.net-snmp.org/docs/mibs/interfaces.html
# http://www.net-snmp.org/docs/mibs/interfaces.html
# Dict key = interface_name
# Dict key = interface_name
...
...
glances/plugins/glances_percpu.py
浏览文件 @
d398cf0f
...
@@ -19,12 +19,10 @@
...
@@ -19,12 +19,10 @@
"""Per-CPU plugin."""
"""Per-CPU plugin."""
# Import Glances libs
from
glances.plugins.glances_plugin
import
GlancesPlugin
# Check for psutil already done in the glances_core script
import
psutil
import
psutil
from
glances.plugins.glances_plugin
import
GlancesPlugin
class
Plugin
(
GlancesPlugin
):
class
Plugin
(
GlancesPlugin
):
...
...
glances/plugins/glances_plugin.py
浏览文件 @
d398cf0f
...
@@ -24,12 +24,12 @@ I am your father...
...
@@ -24,12 +24,12 @@ I am your father...
"""
"""
# Import system libs
# Import system libs
from
datetime
import
datetime
import
json
import
json
from
datetime
import
datetime
from
operator
import
itemgetter
from
operator
import
itemgetter
# Import Glances lib
# Import Glances lib
from
glances.core.glances_globals
import
is_py3
,
glances_logs
,
logger
from
glances.core.glances_globals
import
glances_logs
,
is_py3
,
logger
class
GlancesPlugin
(
object
):
class
GlancesPlugin
(
object
):
...
...
glances/plugins/glances_processlist.py
浏览文件 @
d398cf0f
...
@@ -24,7 +24,7 @@ import os
...
@@ -24,7 +24,7 @@ import os
from
datetime
import
timedelta
from
datetime
import
timedelta
# Import Glances libs
# Import Glances libs
from
glances.core.glances_globals
import
glances_processes
,
is_
linux
,
is_bsd
,
is_mac
,
is_windows
,
logger
from
glances.core.glances_globals
import
glances_processes
,
is_
windows
from
glances.plugins.glances_plugin
import
GlancesPlugin
from
glances.plugins.glances_plugin
import
GlancesPlugin
...
...
glances/plugins/glances_psutilversion.py
浏览文件 @
d398cf0f
...
@@ -17,10 +17,10 @@
...
@@ -17,10 +17,10 @@
# You should have received a copy of the GNU Lesser General Public License
# You should have received a copy of the GNU Lesser General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# along with this program. If not, see <http://www.gnu.org/licenses/>.
from
glances.plugins.glances_plugin
import
GlancesPlugin
from
psutil
import
__version__
as
__psutil_version
from
psutil
import
__version__
as
__psutil_version
from
glances.plugins.glances_plugin
import
GlancesPlugin
class
Plugin
(
GlancesPlugin
):
class
Plugin
(
GlancesPlugin
):
...
...
glances/plugins/glances_uptime.py
浏览文件 @
d398cf0f
...
@@ -22,12 +22,12 @@
...
@@ -22,12 +22,12 @@
# Import system libs
# Import system libs
from
datetime
import
datetime
,
timedelta
from
datetime
import
datetime
,
timedelta
# Import psutil
import
psutil
# Import Glances libs
# Import Glances libs
from
glances.plugins.glances_plugin
import
GlancesPlugin
from
glances.plugins.glances_plugin
import
GlancesPlugin
# Check for psutil already done in the glances_core script
import
psutil
# SNMP OID
# SNMP OID
snmp_oid
=
{
'_uptime'
:
'1.3.6.1.2.1.1.3.0'
}
snmp_oid
=
{
'_uptime'
:
'1.3.6.1.2.1.1.3.0'
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录