Refactor limits for process list

2 files changed, 25 insertions, 73 deletions

diff --git a/conf/glances-monitor.conf b/conf/glances-monitor.conf
index 59a88a07..377a5a13 100644
--- a/conf/glances-monitor.conf
+++ b/conf/glances-monitor.conf
@@ -65,11 +65,6 @@ critical=60
 [processlist]
 # Limit values for CPU/MEM per process in %
 # Default values if not defined: 50/70/90
-#careful=50
-#warning=70
-#critical=90
-# Limit values for MEM per process in %
-# Default values if not defined: 50/70/90
 cpu_careful=50
 cpu_warning=70
 cpu_critical=90
diff --git a/conf/glances.conf b/conf/glances.conf
index c7b80d22..23551d58 100644
--- a/conf/glances.conf
+++ b/conf/glances.conf
@@ -1,32 +1,14 @@
 [cpu]
+# Default values if not defined: 50/70/90
 careful=50
 warning=70
 critical=90
-# Limit values for CPU user in %
-# Default values if not defined: 50/70/90
-user_careful=50
-user_warning=70
-user_critical=90
-# Limit values for CPU system in %
+
+[percpu]
 # Default values if not defined: 50/70/90
-system_careful=50
-system_warning=70
-system_critical=90
-# Limit values for CPU iowait in %
-# Default values if not defined: 40/60/80
-# Not easy to tweak...
-# Source: http://blog.scoutapp.com/articles/2011/02/10/understanding-disk-i-o-when-should-you-be-worried
-#         http://blog.logicmonitor.com/2011/04/20/troubleshooting-server-performance-and-application-monitoring-a-real-example/
-#         http://blog.developpeur-neurasthenique.fr/auto-hebergement-iowait-ma-tuer-1-2-vmstat-mpstat-atop-pidstat.html (FR)
-iowait_careful=40
-iowait_warning=60
-iowait_critical=80
-# Limit values for CPU steal in %
-# Default values if not defined: 10/15/20
-# Source: http://blog.scoutapp.com/articles/2013/07/25/understanding-cpu-steal-time-when-should-you-be-worried
-steal_careful=10
-steal_warning=15
-steal_critical=20
+careful=50
+warning=70
+critical=90
 
 [load]
 # Value * number of cores
@@ -37,20 +19,35 @@ careful=0.7
 warning=1.0
 critical=5.0
 
-[memory]
+[mem]
 # Default limits for free RAM memory in %
 # Default values if not defined: 50/70/90
 careful=50
 warning=70
 critical=90
 
-[swap]
+[memswap]
 # Default limits for free swap memory in %
 # Default values if not defined: 50/70/90
 careful=50
 warning=70
 critical=90
 
+[network]
+# Define the list of hidden network interfaces (comma separeted)
+#hide=lo
+
+[diskio]
+# Define the list of hidden disks (comma separeted)
+#hide=sda2,sda5
+
+[fs]
+# Default limits for free filesytem space in %
+# Default values if not defined: 50/70/90
+careful=50
+warning=70
+critical=90
+
 [temperature]
 # Temperatures in °C for sensors
 # Default values if not defined: 60/70/80
@@ -65,52 +62,12 @@ careful=45
 warning=52
 critical=60
 
-[filesystem]
-# Default limits for free filesytem space in %
-# Default values if not defined: 50/70/90
-careful=50
-warning=70
-critical=90
-
-[process]
-# Limit values for CPU per process in %
+[processlist]
+# Limit values for CPU/MEM per process in %
 # Default values if not defined: 50/70/90
 cpu_careful=50
 cpu_warning=70
 cpu_critical=90
-# Limit values for MEM per process in %
-# Default values if not defined: 50/70/90
 mem_careful=50
 mem_warning=70
 mem_critical=90
-
-[iodisk]
-# Define the list of hidden disks (comma separated)
-#hide=sda2,sda5
-
-[network]
-# Define the list of hidden network interfaces (comma separated)
-#hide=lo
-
-[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.
-# * 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=Redis server
-#list_1_regex=.*redis-server.*
-#list_1_command=echo "Additional stats"
-#list_2_description=Python programs
-#list_2_regex=.*python.*
-#list_2_countmin=1
-#list_2_countmax=8
-#list_3_description=Famous Xeyes
-#list_3_regex=.*xeyes.*