Use same threshold for mem, swap and cpu metrics: low, medium, stress

Author: samoshkin

scripts/cpu.sh

@@ -11,17 +11,17 @@ refresh_interval=$(get_tmux_option "status-interval" "5")
 cpu_view_tmpl=$(get_tmux_option "@sysstat_cpu_view_tmpl" '#[fg=#{cpu.color}]#{cpu.pused}#[default]')
 
 cpu_medium_threshold=$(get_tmux_option "@sysstat_cpu_medium_threshold" "30")
-cpu_high_threshold=$(get_tmux_option "@sysstat_cpu_high_threshold" "80")
+cpu_stress_threshold=$(get_tmux_option "@sysstat_cpu_stress_threshold" "80")
 
 cpu_color_low=$(get_tmux_option "@sysstat_cpu_color_low" "green")
 cpu_color_medium=$(get_tmux_option "@sysstat_cpu_color_medium" "yellow")
-cpu_color_high=$(get_tmux_option "@sysstat_cpu_color_high" "red")
+cpu_color_stress=$(get_tmux_option "@sysstat_cpu_color_stress" "red")
 
 get_cpu_color(){
   local cpu_used=$1
 
-  if fcomp "$cpu_high_threshold" "$cpu_used"; then
-    echo "$cpu_color_high";
+  if fcomp "$cpu_stress_threshold" "$cpu_used"; then
+    echo "$cpu_color_stress";
   elif fcomp "$cpu_medium_threshold" "$cpu_used"; then
     echo "$cpu_color_medium";
   else

scripts/mem.sh

@@ -8,33 +8,43 @@ source "$CURRENT_DIR/helpers.sh"
 
 mem_view_tmpl=$(get_tmux_option "@sysstat_mem_view_tmpl" '#[fg=#{mem.color}]#{mem.pused}#[default]')
 
-mem_stress_threshold=$(get_tmux_option "@sysstat_mem_stress_threshold" "80")
-swap_stress_threshold=$(get_tmux_option "@sysstat_swap_stress_threshold" "80")
+mem_medium_threshold=$(get_tmux_option "@sysstat_mem_medium_threshold" "75")
+mem_stress_threshold=$(get_tmux_option "@sysstat_mem_stress_threshold" "90")
 
-mem_color_ok=$(get_tmux_option "@sysstat_mem_color_ok" "green")
-mem_color_stress=$(get_tmux_option "@sysstat_mem_color_stress" "yellow")
-swap_color_ok=$(get_tmux_option "@sysstat_swap_color_ok" "green")
-swap_color_stress=$(get_tmux_option "@sysstat_swap_color_stress" "yellow")
+swap_medium_threshold=$(get_tmux_option "@sysstat_swap_medium_threshold" "25")
+swap_stress_threshold=$(get_tmux_option "@sysstat_swap_stress_threshold" "75")
 
-size_unit=$(get_tmux_option "@sysstat_mem_size_unit" "M")
+mem_color_low=$(get_tmux_option "@sysstat_mem_color_low" "green")
+mem_color_medium=$(get_tmux_option "@sysstat_mem_color_medium" "yellow")
+mem_color_stress=$(get_tmux_option "@sysstat_mem_color_stress" "red")
+
+swap_color_low=$(get_tmux_option "@sysstat_swap_color_low" "green")
+swap_color_medium=$(get_tmux_option "@sysstat_swap_color_medium" "yellow")
+swap_color_stress=$(get_tmux_option "@sysstat_swap_color_stress" "red")
+
+size_unit=$(get_tmux_option "@sysstat_mem_size_unit" "G")
 
 get_mem_color() {
   local mem_pused=$1
 
   if fcomp "$mem_stress_threshold" "$mem_pused"; then
     echo "$mem_color_stress";
-  else 
-    echo "$mem_color_ok";
+  elif fcomp "$mem_medium_threshold" "$mem_pused"; then
+    echo "$mem_color_medium";
+  else
+    echo "$mem_color_low";
   fi
 }
 
-get_swap_color(){
+get_swap_color() {
   local swap_pused=$1
 
   if fcomp "$swap_stress_threshold" "$swap_pused"; then
     echo "$swap_color_stress";
-  else 
-    echo "$swap_color_ok";
+  elif fcomp "$swap_medium_threshold" "$swap_pused"; then
+    echo "$swap_color_medium";
+  else
+    echo "$swap_color_low";
   fi
 }