From fb9f1750923487e809239d0c91e18ed670444c60 Mon Sep 17 00:00:00 2001
From: tigerblue77 <37409593+tigerblue77@users.noreply.github.com>
Date: Tue, 12 Apr 2022 21:37:55 +0200
Subject: [PATCH] Docker logs display modified in table form to be more
 intuitive and synthetic

---
 Dell_iDRAC_fan_controller.sh | 74 ++++++++++++++++++++++--------------
 1 file changed, 46 insertions(+), 28 deletions(-)

diff --git a/Dell_iDRAC_fan_controller.sh b/Dell_iDRAC_fan_controller.sh
index b863a71..47ce001 100644
--- a/Dell_iDRAC_fan_controller.sh
+++ b/Dell_iDRAC_fan_controller.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+#readonly DELL_FRESH_AIR_COMPLIANCE=45
+
 if [[ $FAN_SPEED == 0x* ]]
 then
   DECIMAL_FAN_SPEED=$(printf '%d' $FAN_SPEED)
@@ -10,25 +12,23 @@ else
 fi
 
 echo "Idrac/IPMI host: $IDRAC_HOST"
-if [[ $IDRAC_HOST != "local" ]]
+if [[ $IDRAC_HOST == "local" ]]
 then
+  LOGIN_STRING='open'
+else
   echo "Idrac/IPMI username: $IDRAC_USERNAME"
   echo "Idrac/IPMI password: $IDRAC_PASSWORD"
+  LOGIN_STRING="lanplus -H $IDRAC_HOST -U $IDRAC_USERNAME -P $IDRAC_PASSWORD"
 fi
 echo "Fan speed objective: $DECIMAL_FAN_SPEED%"
 echo "CPU temperature treshold: $CPU_TEMPERATURE_TRESHOLD°C"
 echo "Check interval: ${CHECK_INTERVAL}s"
 
-readonly DELL_FRESH_AIR_COMPLIANCE=45
+readonly TABLE_HEADER_PRINT_INTERVAL=10
+i=$TABLE_HEADER_PRINT_INTERVAL
+IS_DELL_PROFILE_APPLIED=true
 
 while true; do
-  if [[ $IDRAC_HOST == "local" ]]
-  then
-    LOGIN_STRING='open'
-  else
-    LOGIN_STRING="lanplus -H $IDRAC_HOST -U $IDRAC_USERNAME -P $IDRAC_PASSWORD"
-  fi
-
   DATA=$(ipmitool -I $LOGIN_STRING sdr type temperature | grep degrees)
   INLET_TEMPERATURE=$(echo "$DATA" | grep Inlet | grep -Po '\d{2}' | tail -1)
   EXHAUST_TEMPERATURE=$(echo "$DATA" | grep Exhaust | grep -Po '\d{2}' | tail -1)
@@ -36,37 +36,55 @@ while true; do
   CPU1_TEMPERATURE=$(echo $CPU_DATA | awk '{print $1;}')
   CPU2_TEMPERATURE=$(echo $CPU_DATA | awk '{print $2;}')
 
-  RED='\033[0;31m'
-  GREEN='\033[0;32m'
-  NC='\033[0m' # No Color
-
-  echo "------------------------------------"
-  echo "Current"
-  echo "- inlet temperature is $INLET_TEMPERATURE°C"
-  echo "- CPU 1 temperature is $CPU1_TEMPERATURE°C"
-  echo "- CPU 2 temperature is $CPU2_TEMPERATURE°C"
-  echo "- Exhaust temperature is $EXHAUST_TEMPERATURE°C"
-
   CPU1_OVERHEAT () { [ $CPU1_TEMPERATURE -gt $CPU_TEMPERATURE_TRESHOLD ]; }
   CPU2_OVERHEAT () { [ $CPU2_TEMPERATURE -gt $CPU_TEMPERATURE_TRESHOLD ]; }
 
+  COMMENT=" -"
   if CPU1_OVERHEAT
   then
-    if CPU2_OVERHEAT
-    then
-      printf "CPU 1 and CPU 2 temperatures are ${RED}too high${NC}. Activating default dynamic fan control."
-    else
-      printf "CPU 1 temperature is ${RED}too high${NC}. Activating default dynamic fan control."
-    fi
     ipmitool -I $LOGIN_STRING raw 0x30 0x30 0x01 0x01
+    CURRENT_FAN_CONTROL_PROFILE="Dell default dynamic fan control profile"
+
+    if ! $IS_DELL_PROFILE_APPLIED
+    then
+      IS_DELL_PROFILE_APPLIED=true
+
+      if CPU2_OVERHEAT
+      then
+        COMMENT="CPU 1 and CPU 2 temperatures are too high. Dell default dynamic fan control profile applied."
+      else
+        COMMENT="CPU 1 temperature is too high. Dell default dynamic fan control profile applied."
+      fi
+    fi
   elif CPU2_OVERHEAT
   then
-    printf "CPU 2 temperature is ${RED}too high${NC}. Activating default dynamic fan control."
     ipmitool -I $LOGIN_STRING raw 0x30 0x30 0x01 0x01
+    CURRENT_FAN_CONTROL_PROFILE="Dell default dynamic fan control profile"
+    if ! $IS_DELL_PROFILE_APPLIED
+    then
+      IS_DELL_PROFILE_APPLIED=true
+      COMMENT="CPU 2 temperature is too high. Dell default dynamic fan control profile applied."
+    fi
   else
-    printf "CPUs temperatures are ${GREEN}OK${NC}. Using manual fan control with ${DECIMAL_FAN_SPEED}%% fan speed."
     ipmitool -I $LOGIN_STRING raw 0x30 0x30 0x01 0x00
     ipmitool -I $LOGIN_STRING raw 0x30 0x30 0x02 0xff $HEXADECIMAL_FAN_SPEED
+    CURRENT_FAN_CONTROL_PROFILE="User static fan control profile ($DECIMAL_FAN_SPEED%)"
+
+    if $IS_DELL_PROFILE_APPLIED
+    then
+      COMMENT="CPU temperature decreased and is now OK (<= $CPU_TEMPERATURE_TRESHOLD°C). User's fan control profile applied."
+      IS_DELL_PROFILE_APPLIED=false
+    fi
   fi
+
+  if [ $i -ge $TABLE_HEADER_PRINT_INTERVAL ]
+  then
+    echo "                   ------- Temperatures -------"
+    echo "   Date & time     Inlet  CPU 1  CPU 2  Exhaust          Active fan speed profile          Comment"
+    i=0
+  fi
+  printf "%12s  %3d°C  %3d°C  %3d°C  %5d°C  %40s  %s\n" "$(date +"%d-%m-%y %H:%M:%S")" $INLET_TEMPERATURE $CPU1_TEMPERATURE $CPU2_TEMPERATURE $EXHAUST_TEMPERATURE "$CURRENT_FAN_CONTROL_PROFILE" "$COMMENT"
+
+  ((i++))
   sleep $CHECK_INTERVAL
 done