mirror of
https://github.com/nicolargo/glances.git
synced 2024-12-26 10:42:29 +03:00
Add a disable HDD temperature option on the command line (issue #515)
This commit is contained in:
parent
183cbce7aa
commit
0a99b139b6
1
NEWS
1
NEWS
@ -9,6 +9,7 @@ Enhancements and news features:
|
|||||||
|
|
||||||
* Grab FAN speed in the Glances sensors plugin (issue #501)
|
* Grab FAN speed in the Glances sensors plugin (issue #501)
|
||||||
* Allow logical mounts points in the FS plugin (issue #448)
|
* Allow logical mounts points in the FS plugin (issue #448)
|
||||||
|
* Add a --disable-hddtemp to disable HDD temperature module at startup (issue #515)
|
||||||
|
|
||||||
Bugs corrected:
|
Bugs corrected:
|
||||||
|
|
||||||
|
@ -143,6 +143,7 @@ Command-Line Options
|
|||||||
--disable-fs disable filesystem module
|
--disable-fs disable filesystem module
|
||||||
--disable-network disable network module
|
--disable-network disable network module
|
||||||
--disable-sensors disable sensors module
|
--disable-sensors disable sensors module
|
||||||
|
--disable-hddtemp disable HDDTemp module
|
||||||
--disable-left-sidebar
|
--disable-left-sidebar
|
||||||
disable left sidebar
|
disable left sidebar
|
||||||
--disable-process disable process module
|
--disable-process disable process module
|
||||||
|
@ -110,6 +110,8 @@ Start the client browser (browser mode):\n\
|
|||||||
dest='disable_fs', help=_('disable filesystem module'))
|
dest='disable_fs', help=_('disable filesystem module'))
|
||||||
parser.add_argument('--disable-sensors', action='store_true', default=False,
|
parser.add_argument('--disable-sensors', action='store_true', default=False,
|
||||||
dest='disable_sensors', help=_('disable sensors module'))
|
dest='disable_sensors', help=_('disable sensors module'))
|
||||||
|
parser.add_argument('--disable-hddtemp', action='store_true', default=False,
|
||||||
|
dest='disable_hddtemp', help=_('disable HD Temperature module'))
|
||||||
parser.add_argument('--disable-raid', action='store_true', default=False,
|
parser.add_argument('--disable-raid', action='store_true', default=False,
|
||||||
dest='disable_raid', help=_('disable RAID module'))
|
dest='disable_raid', help=_('disable RAID module'))
|
||||||
parser.add_argument('--disable-docker', action='store_true', default=False,
|
parser.add_argument('--disable-docker', action='store_true', default=False,
|
||||||
@ -264,6 +266,11 @@ Start the client browser (browser mode):\n\
|
|||||||
sys.exit(2)
|
sys.exit(2)
|
||||||
logger.debug("History output path is set to {0}".format(args.path_history))
|
logger.debug("History output path is set to {0}".format(args.path_history))
|
||||||
|
|
||||||
|
# Disable HDDTemp if sensors are disabled
|
||||||
|
if args.disable_sensors:
|
||||||
|
args.disable_hddtemp = True
|
||||||
|
logger.debug("Sensors and HDDTemp are disabled")
|
||||||
|
|
||||||
return args
|
return args
|
||||||
|
|
||||||
def __hash_password(self, plain_password):
|
def __hash_password(self, plain_password):
|
||||||
|
@ -25,6 +25,7 @@ import socket
|
|||||||
|
|
||||||
# Import Glances libs
|
# Import Glances libs
|
||||||
from glances.plugins.glances_plugin import GlancesPlugin
|
from glances.plugins.glances_plugin import GlancesPlugin
|
||||||
|
from glances.core.glances_logging import logger
|
||||||
|
|
||||||
|
|
||||||
class Plugin(GlancesPlugin):
|
class Plugin(GlancesPlugin):
|
||||||
@ -39,7 +40,7 @@ class Plugin(GlancesPlugin):
|
|||||||
GlancesPlugin.__init__(self, args=args)
|
GlancesPlugin.__init__(self, args=args)
|
||||||
|
|
||||||
# Init the sensor class
|
# Init the sensor class
|
||||||
self.glancesgrabhddtemp = GlancesGrabHDDTemp()
|
self.glancesgrabhddtemp = GlancesGrabHDDTemp(args=args)
|
||||||
|
|
||||||
# We do not want to display the stat in a dedicated area
|
# We do not want to display the stat in a dedicated area
|
||||||
# The HDD temp is displayed within the sensors plugin
|
# The HDD temp is displayed within the sensors plugin
|
||||||
@ -73,8 +74,9 @@ class GlancesGrabHDDTemp(object):
|
|||||||
|
|
||||||
"""Get hddtemp stats using a socket connection."""
|
"""Get hddtemp stats using a socket connection."""
|
||||||
|
|
||||||
def __init__(self, host='127.0.0.1', port=7634):
|
def __init__(self, host='127.0.0.1', port=7634, args=None):
|
||||||
"""Init hddtemp stats."""
|
"""Init hddtemp stats."""
|
||||||
|
self.args = args
|
||||||
self.host = host
|
self.host = host
|
||||||
self.port = port
|
self.port = port
|
||||||
self.cache = ""
|
self.cache = ""
|
||||||
@ -89,6 +91,10 @@ class GlancesGrabHDDTemp(object):
|
|||||||
# Reset the list
|
# Reset the list
|
||||||
self.reset()
|
self.reset()
|
||||||
|
|
||||||
|
# Only update if --disable-hddtemp is not set
|
||||||
|
if self.args.disable_hddtemp:
|
||||||
|
return
|
||||||
|
|
||||||
# Fetch the data
|
# Fetch the data
|
||||||
data = self.fetch()
|
data = self.fetch()
|
||||||
|
|
||||||
@ -125,7 +131,10 @@ class GlancesGrabHDDTemp(object):
|
|||||||
sck.connect((self.host, self.port))
|
sck.connect((self.host, self.port))
|
||||||
data = sck.recv(4096)
|
data = sck.recv(4096)
|
||||||
sck.close()
|
sck.close()
|
||||||
except socket.error:
|
except socket.error as e:
|
||||||
|
logger.warning("Can not connect to an HDDtemp server ({0}:{1} => {2})".format(self.host, self.port, e))
|
||||||
|
logger.debug("Disable the HDDtemp module. Use the --disable-hddtemp to hide the previous message.")
|
||||||
|
self.args.disable_hddtemp = True
|
||||||
data = ""
|
data = ""
|
||||||
|
|
||||||
return data
|
return data
|
||||||
|
@ -49,6 +49,10 @@ disable network module
|
|||||||
.B \-\-disable-sensors
|
.B \-\-disable-sensors
|
||||||
disable sensors module
|
disable sensors module
|
||||||
.TP
|
.TP
|
||||||
|
.B \-\-disable-hddtemp
|
||||||
|
disable HDDTemp module
|
||||||
|
.TP
|
||||||
|
.TP
|
||||||
.B \-\-disable-left-sidebar
|
.B \-\-disable-left-sidebar
|
||||||
disable network, disk IO, FS and sensors modules
|
disable network, disk IO, FS and sensors modules
|
||||||
.TP
|
.TP
|
||||||
@ -210,9 +214,31 @@ Show/hide processes list (for low CPU consumption)
|
|||||||
Switch between global CPU and per-CPU stats
|
Switch between global CPU and per-CPU stats
|
||||||
.SH EXAMPLES
|
.SH EXAMPLES
|
||||||
.TP
|
.TP
|
||||||
Refresh information every 5 seconds:
|
Monitor local machine (standalone mode):
|
||||||
.B glances
|
.B $ glances
|
||||||
\-t 5
|
.PP
|
||||||
|
Monitor local machine with the Web interface (Web UI):
|
||||||
|
.B $ glances -w
|
||||||
|
.PP
|
||||||
|
Glances web server started on http://0.0.0.0:61208/
|
||||||
|
.PP
|
||||||
|
Monitor local machine and export stats to a CSV file (standalone mode):
|
||||||
|
.B $ glances --export-csv
|
||||||
|
.PP
|
||||||
|
Monitor local machine and export stats to a InfluxDB server with 5s refresh time (standalone mode):
|
||||||
|
.B $ glances -t 5 --export-influxdb
|
||||||
|
.PP
|
||||||
|
Start a Glances server (server mode):
|
||||||
|
.B $ glances -s
|
||||||
|
.PP
|
||||||
|
Connect Glances to a Glances server (client mode):
|
||||||
|
.B $ glances -c <ip_server>
|
||||||
|
.PP
|
||||||
|
Connect Glances to a Glances server and export stats to a StatsD server (client mode):
|
||||||
|
.B $ glances -c <ip_server> --export-statsd
|
||||||
|
.PP
|
||||||
|
Start the client browser (browser mode):
|
||||||
|
.B $ glances --browser
|
||||||
.PP
|
.PP
|
||||||
.SH EXIT STATUS
|
.SH EXIT STATUS
|
||||||
Glances returns a zero exit status if it succeeds to print/grab information.
|
Glances returns a zero exit status if it succeeds to print/grab information.
|
||||||
|
Loading…
Reference in New Issue
Block a user