Merge branch 'issue780' into develop

1 files changed, 76 insertions, 36 deletions

diff --git a/conf/glances.conf b/conf/glances.conf
index 594d0138..d0b2893d 100644
--- a/conf/glances.conf
+++ b/conf/glances.conf
@@ -1,3 +1,7 @@
+##############################################################################
+# plugins
+##############################################################################
+
 [quicklook]
 # Define CPU, MEM and SWAP thresholds in %
 cpu_careful=50
@@ -11,16 +15,12 @@ swap_warning=70
 swap_critical=90
 
 [cpu]
-# Define CPU thresholds in %
-# Default values if not defined: 50/70/90
+# Default values if not defined: 50/70/90 (except for iowait)
 user_careful=50
 user_warning=70
 user_critical=90
 #user_log=False
-#user_critical_action=echo `date` - {{user}} > /tmp/cpu.alert
-iowait_careful=50
-iowait_warning=70
-iowait_critical=90
+#user_critical_action=echo {{user}} {{value}} {{max}} > /tmp/cpu.alert
 system_careful=50
 system_warning=70
 system_critical=90
@@ -28,8 +28,13 @@ steal_careful=50
 steal_warning=70
 steal_critical=90
 #steal_log=True
-# Context switch limit per core / second
-# For example, if you have 2 Core, critical limit will be 28000/sec
+# I/O wait percentage should be lower than 1/# (of CPU cores)
+# Let commented for default config (1/#-20% / 1/#-10% / 1/#)
+#iowait_careful=30
+#iowait_warning=40
+#iowait_critical=50
+# Context switch limit (core / second)
+# Let commented for default config (critical is 56000/# (of CPU core))
 ctx_switches_careful=10000
 ctx_switches_warning=12000
 ctx_switches_critical=14000
@@ -155,33 +160,11 @@ mem_careful=50
 mem_warning=70
 mem_critical=90
 
-#[monitor]
-# Define the list of processes to monitor
-# *** This section is optional ***
-# The list is composed of items (list_#nb <= 10)
-# An item is defined:
-# * description: Description of the processes (max 16 chars)
-# * regex: regular expression of the processes to monitor
-# * command: (optional) full path to shell command/script for extended stat
-#            Use with caution. Should return a single line string.
-#            Only execute when at least one process is running
-#            By default display CPU and MEM %
-#            Limitation: Do not use in client / server mode
-# * countmin: (optional) minimal number of processes
-#             A warning will be displayed if number of process < count
-# * countmax: (optional) maximum number of processes
-#             A warning will be displayed if number of process > count
-#list_1_description=Dropbox
-#list_1_regex=.*dropbox.*
-#list_1_countmin=1
-#list_1_command=dropbox status | head -1
-#list_2_description=Python programs
-#list_2_regex=.*python.*
-#list_3_description=Famous Xeyes
-#list_3_regex=.*xeyes.*
-#list_3_countmin=1
-
-#[serverlist]
+##############################################################################
+# Client/server
+##############################################################################
+
+[serverlist]
 # Define the static servers list
 #server_1_name=localhost
 #server_1_alias=My local PC
@@ -194,7 +177,7 @@ mem_critical=90
 #server_4_name=pasbon
 #server_4_port=61237
 
-#[passwords]
+[passwords]
 # Define the passwords list
 # Syntax: host=password
 # Where: host is the hostname
@@ -203,6 +186,10 @@ mem_critical=90
 #xps=abc
 #default=defaultpassword
 
+##############################################################################
+# Exports
+##############################################################################
+
 [influxdb]
 # Configuration for the --export-influxdb option
 # https://influxdb.com/
@@ -250,3 +237,56 @@ user=guest
 password=guest
 queue=glances_queue
 
+##############################################################################
+# AMPS
+# * enable: Enable (true) or disable (false) the AMP
+# * regex: Regular expression to filter the process(es)
+# * refresh: The AMP is executed every refresh seconds
+# * one_line: (optional) Force (if true) the AMP to be displayed in one line
+* * command: (optional) command to execute when the process is detected (thk to the regex)
+# * countmin: (optional) minimal number of processes
+#             A warning will be displayed if number of process < count
+# * countmax: (optional) maximum number of processes
+#             A warning will be displayed if number of process > count
+# * <foo>: Others variables can be defined and used in the AMP script
+##############################################################################
+
+[amp_dropbox]
+# Use the default AMP (no dedicated AMP Python script)
+enable=false
+regex=.*dropbox.*
+refresh=3
+one_line=false
+command=dropbox status
+countmin=1
+
+[amp_python]
+# Monitor all Python scripts
+enable=false
+regex=.*python.*
+refresh=3
+countmax=2
+
+[amp_nginx]
+# Nginx status page should be enable (https://easyengine.io/tutorials/nginx/status-page/)
+enable=true
+regex=\/usr\/sbin\/nginx
+refresh=60
+one_line=false
+status_url=http://localhost/nginx_status
+
+[amp_systemd]
+# Systemd
+enable=true
+regex=\/usr\/lib\/systemd\/systemd
+refresh=30
+one_line=true
+systemctl_cmd=/usr/bin/systemctl --plain
+
+[amp_systemv]
+# Systemv
+enable=true
+regex=\/sbin\/init
+refresh=30
+one_line=true
+service_cmd=/usr/bin/service --status-all