diff options
-rw-r--r-- | NEWS.rst | 9 | ||||
-rw-r--r-- | docker-compose/glances.conf | 133 | ||||
-rw-r--r-- | docs/man/glances.1 | 2 | ||||
-rw-r--r-- | glances/__init__.py | 2 |
4 files changed, 112 insertions, 34 deletions
@@ -6,7 +6,14 @@ Version 3.2.1 =============== -Version under development, please have a look on the roadmap here ==> https://github.com/nicolargo/glances/milestone/50 +Bugs corrected: + + * Glances 3.2.0 and influxdb export - Missing network data bug #1893 + +Enhancement requests: + + * Security audit - B411 enhancement (Monkey patch XML RPC Lib) #1025 + * Also search glances.conf file in /usr/share/doc/glances/glances.conf #1862 =============== Version 3.2.0 diff --git a/docker-compose/glances.conf b/docker-compose/glances.conf index 292065fb..ad414fd4 100644 --- a/docker-compose/glances.conf +++ b/docker-compose/glances.conf @@ -3,11 +3,15 @@ ############################################################################## [global] +# Stats refresh rate (default is a minimum of 2 seconds) +# Can be overwrite by the -t <sec> option +# It is also possible to overwrite it in each plugin sections +refresh=2 # Does Glances should check if a newer version is available on PyPI ? check_update=false # History size (maximum number of values) -# Default is 28800: 1 day with 1 point every 3 seconds -history_size=28800 +# Default is 3600 seconds (1 hour) +history_size=3600 ############################################################################## # User interface @@ -40,26 +44,48 @@ swap_careful=50 swap_warning=70 swap_critical=90 +[system] +# This plugin display the first line in the Glances UI with: +# Hostname / Operating system name / Architecture information +# Set to true to disable a plugin +disable=False +# Default refresh rate is 60 seconds +#refresh=60 + [cpu] disable=False +# See https://scoutapm.com/blog/slow_server_flow_chart +# +# I/O wait percentage should be lower than 1/# (# = Logical CPU cores) +# Leave commented to just use the default config: +# Careful=1/#*100-20% / Warning=1/#*100-10% / Critical=1/#*100 +#iowait_careful=30 +#iowait_warning=40 +#iowait_critical=50 +# +# Total % is 100 - idle +total_careful=65 +total_warning=75 +total_critical=85 +total_log=True +# # Default values if not defined: 50/70/90 (except for iowait) user_careful=50 user_warning=70 user_critical=90 -#user_log=False +user_log=False #user_critical_action=echo {{user}} {{value}} {{max}} > /tmp/cpu.alert +# system_careful=50 system_warning=70 system_critical=90 +system_log=False +# steal_careful=50 steal_warning=70 steal_critical=90 #steal_log=True -# I/O wait percentage should be lower than 1/# (Logical CPU cores) -# Leave commented to just use the default config (1/#-20% / 1/#-10% / 1/#) -#iowait_careful=30 -#iowait_warning=40 -#iowait_critical=50 +# # Context switch limit (core / second) # Leave commented to just use the default config (critical is 50000*# (Logical CPU cores) #ctx_switches_careful=10000 @@ -133,7 +159,7 @@ tx_critical=90 # Define the list of hidden network interfaces (comma-separated regexp) #hide=docker.*,lo # WLAN 0 alias -#wlan0_alias=Wireless IF +#wlan0_alias=Wireless # It is possible to overwrite the bitrate thresholds per interface # WLAN 0 Default limits (in bits per second aka bps) for interface bitrate #wlan0_rx_careful=4000000 @@ -155,7 +181,7 @@ nf_conntrack_percent_warning=80 nf_conntrack_percent_critical=90 [wifi] -disable=False +disable=True # Define the list of hidden wireless network interfaces (comma-separated regexp) hide=lo,docker.* # Define SIGNAL thresholds in db (lower is better...) @@ -187,12 +213,12 @@ critical=90 #allow=shm [irq] -# Documentation: https://glances.readthedocs.io/en/stable/aoa/irq.html +# Documentation: https://glances.readthedocs.io/en/stable/aoa/irq.html # This plugin is disabled by default -disable=False +disable=True [folders] -# Documentation: https://glances.readthedocs.io/en/stable/aoa/folders.html +# Documentation: https://glances.readthedocs.io/en/stable/aoa/folders.html disable=False # Define a folder list to monitor # The list is composed of items (list_#nb <= 10) @@ -214,12 +240,12 @@ disable=False #folder_4_path=/root [raid] -# Documentation: https://glances.readthedocs.io/en/stable/aoa/raid.html +# Documentation: https://glances.readthedocs.io/en/stable/aoa/raid.html # This plugin is disabled by default disable=True [smart] -# Documentation: https://glances.readthedocs.io/en/stable/aoa/smart.html +# Documentation: https://glances.readthedocs.io/en/stable/aoa/smart.html # This plugin is disabled by default disable=True @@ -230,14 +256,17 @@ host=127.0.0.1 port=7634 [sensors] -# This plugin is disable by default because on some system, the PsUtil -# consume a lot of CPU to grab the stats... -disable=True +# Documentation: https://glances.readthedocs.io/en/latest/aoa/sensors.html +disable=False +# By default refresh every refresh time * 2 +#refresh=6 +# Hide some sensors +#hide=ambient # Sensors core thresholds (in Celsius...) -# Default values if not defined: 60/70/80 -temperature_core_careful=60 -temperature_core_warning=70 -temperature_core_critical=80 +# Default values are grabbed from the system +#temperature_core_careful=60 +#temperature_core_warning=70 +#temperature_core_critical=80 # Temperatures threshold in °C for hddtemp # Default values if not defined: 45/52/60 temperature_hdd_careful=45 @@ -253,6 +282,11 @@ battery_critical=95 #core 0_alias=CPU Core 0 #core 1_alias=CPU Core 1 +[processcount] +disable=False +# If you want to change the refresh rate of the processing list, please uncomment: +#refresh=10 + [processlist] disable=False # Sort key: if not defined, the sort is automatically done by Glances (recommended) @@ -352,6 +386,10 @@ max_name_size=20 # Set the following key to True to display all containers all=False +[amps] +# AMPs configuration are defined in the bottom of this file +disable=False + ############################################################################## # Client/server ############################################################################## @@ -368,8 +406,6 @@ all=False #server_3_port=61209 #server_4_name=pasbon #server_4_port=61237 -server_5_name=172.247.185.114 -server_5_port=10089 [passwords] # Define the passwords list @@ -400,6 +436,10 @@ height=600 style=DarkStyle [influxdb] +# !!! +# Will be DEPRECATED in future release. +# Please have a look on the new influxdb2 export module (compatible with InfluxDB 1.8.x and 2.x) +# !!! # Configuration for the --export influxdb option # https://influxdb.com/ host=localhost @@ -413,12 +453,31 @@ db=glances # => foo.cpu # => foo.mem # You can also use dynamic values -#prefix=`hostname` -prefix=localhost -# Tags will be added for all measurements -#tags=foo:bar,spam:eggs +#prefix=foo +# Followings tags will be added for all measurements +# You can also use dynamic values. +# Note: hostname is always added as a tag +#tags=foo:bar,spam:eggs,domain:`domainname` + +[influxdb2] +# Configuration for the --export influxdb2 option +# https://influxdb.com/ +host=localhost +port=8086 +protocol=http +org=nicolargo +bucket=glances +token=EjFUTWe8U-MIseEAkaVIgVnej_TrnbdvEcRkaB1imstW7gapSqy6_6-8XD-yd51V0zUUpDy-kAdVD1purDLuxA== +# Prefix will be added for all measurement name +# Ex: prefix=foo +# => foo.cpu +# => foo.mem # You can also use dynamic values -#tags=system:`uname -s` +#prefix=foo +# Followings tags will be added for all measurements +# You can also use dynamic values. +# Note: hostname is always added as a tag +#tags=foo:bar,spam:eggs,domain:`domainname` [cassandra] # Configuration for the --export cassandra option @@ -452,7 +511,7 @@ port=8125 [elasticsearch] # Configuration for the --export elasticsearch option -# Data are available via the ES RESTful API. ex: URL/<index>/cpu/system +# Data are available via the ES RESTful API. ex: URL/<index>/cpu # https://www.elastic.co host=localhost port=9200 @@ -477,10 +536,11 @@ queue=glances_queue # Configuration for the --export mqtt option host=localhost port=8883 +tls=true user=guest password=guest topic=glances -tls=true +topic_structure=per-metric [couchdb] # Configuration for the --export couchdb option @@ -547,6 +607,17 @@ port=6789 protocol=http path=/ +[graphite] +# Configuration for the --export graphite option +# https://graphiteapp.org/ +host=localhost +port=2003 +# Prefix will be added for all measurement name +prefix=glances +# System name added between the prefix and the stats +# By default, system_name = FQDN +#system_name=mycomputer + ############################################################################## # AMPS # * enable: Enable (true) or disable (false) the AMP diff --git a/docs/man/glances.1 b/docs/man/glances.1 index 1fd6bf68..0245058a 100644 --- a/docs/man/glances.1 +++ b/docs/man/glances.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "GLANCES" "1" "Jul 04, 2021" "3.2.1_beta1" "Glances" +.TH "GLANCES" "1" "Jul 10, 2021" "3.2.1" "Glances" .SH NAME glances \- An eye on your system . diff --git a/glances/__init__.py b/glances/__init__.py index 7b8ae0bc..103b1259 100644 --- a/glances/__init__.py +++ b/glances/__init__.py @@ -29,7 +29,7 @@ import sys # Global name # Version should start and end with a numerical char # See https://packaging.python.org/specifications/core-metadata/#version -__version__ = '3.2.1_beta1' +__version__ = '3.2.1' __author__ = 'Nicolas Hennion <nicolas@nicolargo.com>' __license__ = 'LGPLv3' |