remove nagios output from check-hosts, add nagios passive check

1 files changed, 1 insertions, 44 deletions

diff --git a/check-hosts b/check-hosts
index 8cbb28f..ac64741 100755
--- a/check-hosts
+++ b/check-hosts
@@ -32,44 +32,6 @@ get_count() {
     fi
 }
 
-get_nagios() {
-    if [ -z "$1" ]; then
-        clean=$(get_clean | wc -l)
-        bad=$(get_bad | wc -l)
-        stale=$(get_stale | wc -l)
-
-        status="OK"
-        exit=0
-        if [ "$bad" != "0" -o "$stale" != "0" ]; then
-            status="CRITICAL"
-            exit=2
-        fi
-
-        echo "$status | clean=$clean; bad=$bad; stale=$stale;"
-        exit $exit
-    else
-        if ! get_names -a | grep -q "^$1$"; then
-            echo "CRITICAL $1 not known to bcfg2"
-            exit 2
-        fi
-
-        if get_names --stale | grep -q "^$1$"; then
-            echo "CRITICAL $1 is stale"
-            exit 2
-        fi
-
-        bad=$(get_count -b "$1")
-        if [ "$bad" != "0" ]; then
-            echo "CRITICAL $bad bad entries"
-            exit 2
-        fi
-
-        extra=$(get_count -e "$1")
-        total=$(bcfg2-reports -t "$1" | sed "s/good: [0-9]*)/extra: $extra)/")
-        echo "OK $total"
-    fi
-}
-
 get_stale_once() {
     get_stale | while read host; do
 	STALE_FILE="${STALE_DIR}/${host}"
@@ -117,11 +79,10 @@ mode should be one of the following:
   -e|--extra	display hosts with extra entries
 
   -c|--cron	run in cron mode (report new stale hosts)
-  -n|--nagios	run in nagios mode (report count hosts in groups)
 EOU
 }
 
-ARGS="$(getopt -o 'absecn::' --long 'all,bad,stale,extra,cron,nagios::' -- "$@")"
+ARGS="$(getopt -o 'absec::' --long 'all,bad,stale,extra,cron::' -- "$@")"
 
 if [ $? -ne 0 ]; then
     show_usage
@@ -153,10 +114,6 @@ while true; do
             cron
             exit 0
             ;;
-        -n|--nagios)
-            get_nagios "$2"
-            exit 0
-            ;;
         *)
             show_usage
             exit 1