Updated vhost(1|2).in (updated the temperature texting script).

diff --git a/sources/vhost1.in/root/temperature.cfg b/sources/vhost1.in/root/temperature.cfg
index ffbc8b028584a2d3735ed10a7ae369c25dd70deb..8cabc21978f6d6c100c865e62c67209d66fea3cf 100644 (file)
--- a/sources/vhost1.in/root/temperature.cfg
+++ b/sources/vhost1.in/root/temperature.cfg
@@ -1,20 +1,29 @@
 MODEM_IP="192.168.8.1"
 
-#                  zfelleg        csgulyas       fschnell       rrendek        mszabo
-HEARTBEAT_PHONES=("+36209541513" "+36303744065" "+36309502529" "+36309775888" "+36704581234")
-NUMBER_OF_HEARTBEAT_PHONES=5
+ZFELLEG_NUM="+36209541513"
+CSGULYAS_NUM="+36303744065"
+FSCHNELL_NUM="+36309502529"
+RRENDEK_NUM="+36309775888"
+MSZABO_NUM="+36704581234"
 
-#        zfelleg        fschnell       rrendek        mszabo
-PHONES=("+36209541513" "+36309502529" "+36309775888" "+36704581234")
-NUMBER_OF_PHONES=4
+AKOSZTOLANYI_NUM="+36205837539"
+TLEVAI_NUM="+36302976481"
+
+ZSSZALAI_NUM="+36309406111"
+
+
+HEARTBEAT_NUMS="$ZFELLEG_NUM $CSGULYAS_NUM $FSCHNELL_NUM $RRENDEK_NUM $MSZABO_NUM"
+
+TEST_NUMS="$ZFELLEG_NUM"
+
+#TEXT_NUMS="$ZFELLEG_NUM $FSCHNELL_NUM $RRENDEK_NUM $MSZABO_NUM"
+#TEXT_NUMS="$ZSSZALAI_NUM $ZFELLEG_NUM $FSCHNELL_NUM $RRENDEK_NUM $MSZABO_NUM"
+TEXT_NUMS="$AKOSZTOLANYI_NUM $TLEVAI_NUM $ZSSZALAI_NUM $ZFELLEG_NUM $FSCHNELL_NUM $RRENDEK_NUM $MSZABO_NUM"
 
-#             zfelleg
-TEST_PHONES=("+36209541513")
-NUMBER_OF_TEST_PHONES=1
 
 WARNING_THRESHOLD=25
 ERROR_THRESHOLD=30
 CRITICAL_THRESHOLD=35
 
 HOST_SERIAL=$(hostname | cut -c 6)
-IMM_FQDN="vhost${HOST_SERIAL}imm.usr.user.hu"
+IMM_FQDN="vhost${HOST_SERIAL}imm.in.useribm.hu"

diff --git a/sources/vhost1.in/root/temperature.sh b/sources/vhost1.in/root/temperature.sh
index d25afe4770e9b5f1226bfc619e1413f373865e86..8df0c345ec5b13bbda2b949ad21d14964f9eb6fc 100755 (executable)
--- a/sources/vhost1.in/root/temperature.sh
+++ b/sources/vhost1.in/root/temperature.sh
@@ -185,13 +185,11 @@ send_heartbeat_sms() {
     else
         SEND_STATUS="DOES"
     fi
-    MESSAGE="Heartbeat ${MESSAGE_TYPE}: temperature is ${TEMPERATURE}, the system $SEND_STATUS send SMSs."
+    MESSAGE="$MESSAGE_PREFIX Heartbeat ${MESSAGE_TYPE}: temperature is ${TEMPERATURE}, the system $SEND_STATUS send SMSs."
     SMS_TARGETS=""
-    i=0
-    while [ $i -lt $NUMBER_OF_HEARTBEAT_PHONES ]
+    for NUM in $HEARTBEAT_NUMS
     do
-        SMS_TARGETS="${SMS_TARGETS}<Phone>${HEARTBEAT_PHONES[$i]}</Phone>"
-        i=$(( $i + 1 ))
+        SMS_TARGETS="${SMS_TARGETS}<Phone>${NUM}</Phone>"
     done
 
     curl --output /tmp/ses_tok.xml \
@@ -219,13 +217,11 @@ send_sms() {
     STR_DATE=$(LC_TIME=C.UTF-8 date)
 
 
-    MESSAGE="${MESSAGE_TYPE}: temperature is $TEMPERATURE"
+    MESSAGE="$MESSAGE_PREFIX ${MESSAGE_TYPE}: temperature is $TEMPERATURE"
     SMS_TARGETS=""
-    i=0
-    while [ $i -lt $NUMBER_OF_PHONES ]
+    for NUM in $TEXT_NUMS
     do
-        SMS_TARGETS="${SMS_TARGETS}<Phone>${PHONES[$i]}</Phone>"
-        i=$(( $i + 1 ))
+        SMS_TARGETS="${SMS_TARGETS}<Phone>${NUM}</Phone>"
     done
 
     curl --output /tmp/ses_tok.xml \
@@ -265,13 +261,11 @@ send_stop_sms() {
     fi
     STOP_NUMBER=$(grep '<Phone>' /tmp/received_smses.txt \
                       | sed 's/.*<Phone>\(.*\)<\/Phone>.*$/\1/')
-    MESSAGE="Stopped by ${STOP_NUMBER}, ${MESSAGE_TYPE}: temperature is ${TEMPERATURE}, the system does NOT send SMSs for the next 24 hours."
+    MESSAGE="$MESSAGE_PREFIX Stopped by ${STOP_NUMBER}, ${MESSAGE_TYPE}: temperature is ${TEMPERATURE}, the system does NOT send SMSs for the next 24 hours."
     SMS_TARGETS=""
-    i=0
-    while [ $i -lt $NUMBER_OF_PHONES ]
+    for NUM in $TEXT_NUMS
     do
-        SMS_TARGETS="${SMS_TARGETS}<Phone>${PHONES[$i]}</Phone>"
-        i=$(( $i + 1 ))
+        SMS_TARGETS="${SMS_TARGETS}<Phone>${NUM}</Phone>"
     done
 
     curl --output /tmp/ses_tok.xml \
@@ -305,13 +299,11 @@ send_test_sms() {
     else
         SEND_STATUS="DOES"
     fi
-    MESSAGE="Test ${MESSAGE_TYPE}: temperature is ${TEMPERATURE}, the system $SEND_STATUS send SMSs."
+    MESSAGE="$MESSAGE_PREFIX Test ${MESSAGE_TYPE}: temperature is ${TEMPERATURE}, the system $SEND_STATUS send SMSs."
     SMS_TARGETS=""
-    i=0
-    while [ $i -lt $NUMBER_OF_TEST_PHONES ]
+    for NUM in $TEST_NUMS
     do
-        SMS_TARGETS="${SMS_TARGETS}<Phone>${TEST_PHONES[$i]}</Phone>"
-        i=$(( $i + 1 ))
+        SMS_TARGETS="${SMS_TARGETS}<Phone>${NUM}</Phone>"
     done
 
     curl --output /tmp/ses_tok.xml \
@@ -367,6 +359,7 @@ TEMPERATURE=$(ipmitool -H $IMM_FQDN -I open -P pwd sensor get 'Ambient Temp' \
               | grep 'Sensor Reading' \
               | sed 's/^ Sensor Reading        : \([^ ]*\) (+\/- .) degrees C$/\1/')
 
+MESSAGE_PREFIX="[$(hostname --short)]"
 MESSAGE_TYPE="Info"
 SEVERITY=0
 

diff --git a/sources/vhost2.in/root/temperature.cfg b/sources/vhost2.in/root/temperature.cfg
index ffbc8b028584a2d3735ed10a7ae369c25dd70deb..8cabc21978f6d6c100c865e62c67209d66fea3cf 100644 (file)
--- a/sources/vhost2.in/root/temperature.cfg
+++ b/sources/vhost2.in/root/temperature.cfg
@@ -1,20 +1,29 @@
 MODEM_IP="192.168.8.1"
 
-#                  zfelleg        csgulyas       fschnell       rrendek        mszabo
-HEARTBEAT_PHONES=("+36209541513" "+36303744065" "+36309502529" "+36309775888" "+36704581234")
-NUMBER_OF_HEARTBEAT_PHONES=5
+ZFELLEG_NUM="+36209541513"
+CSGULYAS_NUM="+36303744065"
+FSCHNELL_NUM="+36309502529"
+RRENDEK_NUM="+36309775888"
+MSZABO_NUM="+36704581234"
 
-#        zfelleg        fschnell       rrendek        mszabo
-PHONES=("+36209541513" "+36309502529" "+36309775888" "+36704581234")
-NUMBER_OF_PHONES=4
+AKOSZTOLANYI_NUM="+36205837539"
+TLEVAI_NUM="+36302976481"
+
+ZSSZALAI_NUM="+36309406111"
+
+
+HEARTBEAT_NUMS="$ZFELLEG_NUM $CSGULYAS_NUM $FSCHNELL_NUM $RRENDEK_NUM $MSZABO_NUM"
+
+TEST_NUMS="$ZFELLEG_NUM"
+
+#TEXT_NUMS="$ZFELLEG_NUM $FSCHNELL_NUM $RRENDEK_NUM $MSZABO_NUM"
+#TEXT_NUMS="$ZSSZALAI_NUM $ZFELLEG_NUM $FSCHNELL_NUM $RRENDEK_NUM $MSZABO_NUM"
+TEXT_NUMS="$AKOSZTOLANYI_NUM $TLEVAI_NUM $ZSSZALAI_NUM $ZFELLEG_NUM $FSCHNELL_NUM $RRENDEK_NUM $MSZABO_NUM"
 
-#             zfelleg
-TEST_PHONES=("+36209541513")
-NUMBER_OF_TEST_PHONES=1
 
 WARNING_THRESHOLD=25
 ERROR_THRESHOLD=30
 CRITICAL_THRESHOLD=35
 
 HOST_SERIAL=$(hostname | cut -c 6)
-IMM_FQDN="vhost${HOST_SERIAL}imm.usr.user.hu"
+IMM_FQDN="vhost${HOST_SERIAL}imm.in.useribm.hu"

diff --git a/sources/vhost2.in/root/temperature.sh b/sources/vhost2.in/root/temperature.sh
index d25afe4770e9b5f1226bfc619e1413f373865e86..8df0c345ec5b13bbda2b949ad21d14964f9eb6fc 100755 (executable)
--- a/sources/vhost2.in/root/temperature.sh
+++ b/sources/vhost2.in/root/temperature.sh
@@ -185,13 +185,11 @@ send_heartbeat_sms() {
     else
         SEND_STATUS="DOES"
     fi
-    MESSAGE="Heartbeat ${MESSAGE_TYPE}: temperature is ${TEMPERATURE}, the system $SEND_STATUS send SMSs."
+    MESSAGE="$MESSAGE_PREFIX Heartbeat ${MESSAGE_TYPE}: temperature is ${TEMPERATURE}, the system $SEND_STATUS send SMSs."
     SMS_TARGETS=""
-    i=0
-    while [ $i -lt $NUMBER_OF_HEARTBEAT_PHONES ]
+    for NUM in $HEARTBEAT_NUMS
     do
-        SMS_TARGETS="${SMS_TARGETS}<Phone>${HEARTBEAT_PHONES[$i]}</Phone>"
-        i=$(( $i + 1 ))
+        SMS_TARGETS="${SMS_TARGETS}<Phone>${NUM}</Phone>"
     done
 
     curl --output /tmp/ses_tok.xml \
@@ -219,13 +217,11 @@ send_sms() {
     STR_DATE=$(LC_TIME=C.UTF-8 date)
 
 
-    MESSAGE="${MESSAGE_TYPE}: temperature is $TEMPERATURE"
+    MESSAGE="$MESSAGE_PREFIX ${MESSAGE_TYPE}: temperature is $TEMPERATURE"
     SMS_TARGETS=""
-    i=0
-    while [ $i -lt $NUMBER_OF_PHONES ]
+    for NUM in $TEXT_NUMS
     do
-        SMS_TARGETS="${SMS_TARGETS}<Phone>${PHONES[$i]}</Phone>"
-        i=$(( $i + 1 ))
+        SMS_TARGETS="${SMS_TARGETS}<Phone>${NUM}</Phone>"
     done
 
     curl --output /tmp/ses_tok.xml \
@@ -265,13 +261,11 @@ send_stop_sms() {
     fi
     STOP_NUMBER=$(grep '<Phone>' /tmp/received_smses.txt \
                       | sed 's/.*<Phone>\(.*\)<\/Phone>.*$/\1/')
-    MESSAGE="Stopped by ${STOP_NUMBER}, ${MESSAGE_TYPE}: temperature is ${TEMPERATURE}, the system does NOT send SMSs for the next 24 hours."
+    MESSAGE="$MESSAGE_PREFIX Stopped by ${STOP_NUMBER}, ${MESSAGE_TYPE}: temperature is ${TEMPERATURE}, the system does NOT send SMSs for the next 24 hours."
     SMS_TARGETS=""
-    i=0
-    while [ $i -lt $NUMBER_OF_PHONES ]
+    for NUM in $TEXT_NUMS
     do
-        SMS_TARGETS="${SMS_TARGETS}<Phone>${PHONES[$i]}</Phone>"
-        i=$(( $i + 1 ))
+        SMS_TARGETS="${SMS_TARGETS}<Phone>${NUM}</Phone>"
     done
 
     curl --output /tmp/ses_tok.xml \
@@ -305,13 +299,11 @@ send_test_sms() {
     else
         SEND_STATUS="DOES"
     fi
-    MESSAGE="Test ${MESSAGE_TYPE}: temperature is ${TEMPERATURE}, the system $SEND_STATUS send SMSs."
+    MESSAGE="$MESSAGE_PREFIX Test ${MESSAGE_TYPE}: temperature is ${TEMPERATURE}, the system $SEND_STATUS send SMSs."
     SMS_TARGETS=""
-    i=0
-    while [ $i -lt $NUMBER_OF_TEST_PHONES ]
+    for NUM in $TEST_NUMS
     do
-        SMS_TARGETS="${SMS_TARGETS}<Phone>${TEST_PHONES[$i]}</Phone>"
-        i=$(( $i + 1 ))
+        SMS_TARGETS="${SMS_TARGETS}<Phone>${NUM}</Phone>"
     done
 
     curl --output /tmp/ses_tok.xml \
@@ -367,6 +359,7 @@ TEMPERATURE=$(ipmitool -H $IMM_FQDN -I open -P pwd sensor get 'Ambient Temp' \
               | grep 'Sensor Reading' \
               | sed 's/^ Sensor Reading        : \([^ ]*\) (+\/- .) degrees C$/\1/')
 
+MESSAGE_PREFIX="[$(hostname --short)]"
 MESSAGE_TYPE="Info"
 SEVERITY=0