From bf315c15f64d677ee879a6225d5985f6b8e25610 Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Tue, 27 Apr 2021 20:42:42 +0200 Subject: [PATCH] check-health: use $SendNotification2 --- check-health | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/check-health b/check-health index 761a72f..dba24d8 100644 --- a/check-health +++ b/check-health @@ -18,7 +18,7 @@ :global Identity; :global LogPrintExit2; -:global SendNotification; +:global SendNotification2; :global SymbolForNotification; :local FormatVoltage do={ @@ -42,10 +42,10 @@ [ :typeof $Voltage ] = "num") do={ :if ($CheckHealthLast->$Name * (100 + $CheckHealthVoltagePercent) < $Voltage * 100 || \ $CheckHealthLast->$Name * 100 > $Voltage * (100 + $CheckHealthVoltagePercent)) do={ - $SendNotification ([ $SymbolForNotification "high-voltage-sign" ] . "Health warning: " . $Name) \ - ("The " . $Name . " on " . $Identity . " jumped more than " . $CheckHealthVoltagePercent . "%.\n\n" . \ + $SendNotification2 ({ subject=([ $SymbolForNotification "high-voltage-sign" ] . "Health warning: " . $Name); \ + message=("The " . $Name . " on " . $Identity . " jumped more than " . $CheckHealthVoltagePercent . "%.\n\n" . \ "old value: " . [ $FormatVoltage ($CheckHealthLast->$Name) ] . "\n" . \ - "new value: " . [ $FormatVoltage $Voltage ]); + "new value: " . [ $FormatVoltage $Voltage ]) }); } } } @@ -56,13 +56,13 @@ [ :typeof $PSU ] = "str") do={ :if ($CheckHealthLast->$Name = "ok" && \ $PSU != "ok") do={ - $SendNotification ([ $SymbolForNotification "cross-mark" ] . "Health warning: " . $Name) \ - ("The power supply unit '" . $Name . "' on " . $Identity . " failed!"); + $SendNotification2 ({ subject=([ $SymbolForNotification "cross-mark" ] . "Health warning: " . $Name); \ + message=("The power supply unit '" . $Name . "' on " . $Identity . " failed!") }); } :if ($CheckHealthLast->$Name != "ok" && \ $PSU = "ok") do={ - $SendNotification ([ $SymbolForNotification "white-heavy-check-mark" ] . "Health recovery: " . $Name) \ - ("The power supply unit '" . $Name . "' on " . $Identity . " recovered!"); + $SendNotification2 ({ subject=([ $SymbolForNotification "white-heavy-check-mark" ] . "Health recovery: " . $Name); \ + message=("The power supply unit '" . $Name . "' on " . $Identity . " recovered!") }); } } } @@ -81,16 +81,16 @@ } :if ($Temperature > $CheckHealthTemperature->$Name && \ $CheckHealthTemperatureNotified->$Name != true) do={ - $SendNotification ([ $SymbolForNotification "fire" ] . "Health warning: " . $Name) \ - ("The " . $Name . " on " . $Identity . " is above threshold: " . \ - $Temperature . "\C2\B0" . "C"); + $SendNotification2 ({ subject=([ $SymbolForNotification "fire" ] . "Health warning: " . $Name); \ + message=("The " . $Name . " on " . $Identity . " is above threshold: " . \ + $Temperature . "\C2\B0" . "C") }); :set ($CheckHealthTemperatureNotified->$Name) true; } :if ($Temperature <= ($CheckHealthTemperature->$Name - $CheckHealthTemperatureDeviation) && \ $CheckHealthTemperatureNotified->$Name = true) do={ - $SendNotification ([ $SymbolForNotification "white-heavy-check-mark" ] . "Health recovery: " . $Name) \ - ("The " . $Name . " on " . $Identity . " dropped below threshold: " . \ - $Temperature . "\C2\B0" . "C"); + $SendNotification2 ({ subject=([ $SymbolForNotification "white-heavy-check-mark" ] . "Health recovery: " . $Name); \ + message=("The " . $Name . " on " . $Identity . " dropped below threshold: " . \ + $Temperature . "\C2\B0" . "C") }); :set ($CheckHealthTemperatureNotified->$Name) false; } }