From 2c1ae33ee471d96139998968c6a44300cb0f26f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A1ll=20Gu=C3=B0j=C3=B3n=20Sigur=C3=B0sson?=
 <palli@opensource.is>
Date: Sun, 7 Nov 2010 17:59:13 +0000
Subject: [PATCH]

---
 misc/check_ports         | 28 ++++++----------------------
 misc/nagios_autodiscover | 28 ++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 22 deletions(-)
 mode change 100755 => 100644 misc/check_ports
 create mode 100755 misc/nagios_autodiscover

diff --git a/misc/check_ports b/misc/check_ports
old mode 100755
new mode 100644
index 0e51bfa..a6ac97f
--- a/misc/check_ports
+++ b/misc/check_ports
@@ -1,28 +1,12 @@
 #!/bin/sh
 
-
-IPS=`fping -a -g $1 2>/dev/nul`
-if [ $? -gt 2 ]; then
-	echo failed to run fping
-	exit 1
-fi
+HOST=$1
 
 
-#addgroup --group misc --alias "Misc hosts"
+PORTS="3389 22 80 445 5666 1433";
 
-for ip in $IPS; do
-	# Check if this host already exists
-	grep -qw $ip /var/log/nagios/objects.cache
-	if [ $? -eq 0 ]; then
-		continue
-	fi
-	RES=`host $ip`
-	if [ $? -gt 0 ]; then
-		HOSTN=$ip
-	else
-		HOSTN=`echo $RES | head -n 1 | sed 's/.*name pointer //'`
-	fi
-	echo $ip = $HOSTN
-	addhost --host $HOSTN --ip $ip --group misc
+for i in $PORTS; do
+	check_tcp -H $HOST -p $i >/dev/null 2>&1 && echo Port $i=yes || echo Port $i=no
 done
-
+echo -n "Checking NRPE Connectivity: "
+check_nrpe -H $HOST 
diff --git a/misc/nagios_autodiscover b/misc/nagios_autodiscover
new file mode 100755
index 0000000..0e51bfa
--- /dev/null
+++ b/misc/nagios_autodiscover
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+
+IPS=`fping -a -g $1 2>/dev/nul`
+if [ $? -gt 2 ]; then
+	echo failed to run fping
+	exit 1
+fi
+
+
+#addgroup --group misc --alias "Misc hosts"
+
+for ip in $IPS; do
+	# Check if this host already exists
+	grep -qw $ip /var/log/nagios/objects.cache
+	if [ $? -eq 0 ]; then
+		continue
+	fi
+	RES=`host $ip`
+	if [ $? -gt 0 ]; then
+		HOSTN=$ip
+	else
+		HOSTN=`echo $RES | head -n 1 | sed 's/.*name pointer //'`
+	fi
+	echo $ip = $HOSTN
+	addhost --host $HOSTN --ip $ip --group misc
+done
+