diff --git a/checks/mis b/checks/BZFlag_Server similarity index 67% rename from checks/mis rename to checks/BZFlag_Server index 14c7e78..a8f4c2e 100755 --- a/checks/mis +++ b/checks/BZFlag_Server @@ -1,7 +1,7 @@ #!/bin/bash export SITE=$1 -ssh $SITE "bash -s" < ./plugins/check_proc mis > /dev/null +ssh $SITE "bash -s" < ./plugins/check_proc bzfs > /dev/null if [ $? -ne "0" ] then echo -e $SITE"\tDOWN" diff --git a/checks/sshd_alt b/checks/sshd_alt new file mode 100755 index 0000000..5c73697 --- /dev/null +++ b/checks/sshd_alt @@ -0,0 +1,10 @@ +#!/bin/bash +export SITE=$1 + +timeout 2 bash -c " /dev/null +if [ $? -ne "0" ] +then + exit 1 +else + exit 0 +fi diff --git a/checks/web_site b/checks/web_site index f7c7121..735688a 100755 --- a/checks/web_site +++ b/checks/web_site @@ -1,7 +1,7 @@ #!/bin/bash export SITE=$1 -wget --quiet -O /dev/null $SITE +wget --quiet -O /dev/null http://$SITE if [ $? -ne "0" ] then exit 1 diff --git a/checks/web_site_https b/checks/web_site_https new file mode 100755 index 0000000..ad440be --- /dev/null +++ b/checks/web_site_https @@ -0,0 +1,10 @@ +#!/bin/bash +export SITE=$1 + +wget --quiet -O /dev/null https://$SITE +if [ $? -ne "0" ] +then + exit 1 +else + exit 0 +fi diff --git a/checks/znc b/checks/znc new file mode 100755 index 0000000..f09045f --- /dev/null +++ b/checks/znc @@ -0,0 +1,10 @@ +#!/bin/bash +export SITE=$1 + +timeout 2 bash -c " /dev/null +if [ $? -ne "0" ] +then + exit 1 +else + exit 0 +fi diff --git a/hosts/example.com b/hosts/example.com deleted file mode 100644 index 1005daf..0000000 --- a/hosts/example.com +++ /dev/null @@ -1,2 +0,0 @@ -telnet -web_site diff --git a/hosts/root@thunix.cf b/hosts/root@thunix.cf new file mode 100644 index 0000000..1afa9e3 --- /dev/null +++ b/hosts/root@thunix.cf @@ -0,0 +1,2 @@ +sshd +BZFlag_server diff --git a/hosts/thunix.cf b/hosts/thunix.cf new file mode 100644 index 0000000..073611f --- /dev/null +++ b/hosts/thunix.cf @@ -0,0 +1,2 @@ +web_site +web_site_https diff --git a/hosts/ubuntu@10.0.3.128 b/hosts/ubuntu@10.0.3.128 deleted file mode 100644 index 479cf00..0000000 --- a/hosts/ubuntu@10.0.3.128 +++ /dev/null @@ -1,2 +0,0 @@ -mis -sshd diff --git a/monurbox b/monurbox index 368d7f4..e7ccd71 100755 --- a/monurbox +++ b/monurbox @@ -2,6 +2,7 @@ export DEBUG=1 export serv=$1 +export FILE=/var/www/thunix.cf/report if [ ! -z $serv ] then @@ -12,7 +13,7 @@ done else -echo -e "\n" >/tmp/report +echo -e "\n" >$FILE echo -e "Host\tService\tStatus" for i in `ls ./hosts/` do for x in `cat ./hosts/$i` @@ -20,14 +21,15 @@ for i in `ls ./hosts/` ./checks/$x $i > /dev/null if [ "$?" -ne 0 ]; then echo -e "$i\t$x\tFAILED" - echo "$i,$x,FAILED" >> /tmp/report + echo "$i,$x,FAILED" >> $FILE else echo -e "$i\t$x\tGOOD" - echo "$i,$x,GOOD" >> /tmp/report + echo "$i,$x,GOOD" >> $FILE fi done done fi | column -t -sed -i '/^\s*$/d' /tmp/report +sed -i '/^\s*$/d' $FILE +sed -i '/^root//' $FILE