Merge branch 'master' of github.com:krebscode/painload

Conflicts:
	god/temper/Makefile
	god/temper/collectd-temper.sh

1 files changed, 22 insertions, 0 deletions

diff --git a/god/Monitoring/nagios/conf/other_hosts.cfg b/god/Monitoring/nagios/conf/other_hosts.cfg
new file mode 100644
index 00000000..bbdc676a
--- /dev/null
+++ b/god/Monitoring/nagios/conf/other_hosts.cfg
@@ -0,0 +1,22 @@
+define host{
+        use                     generic-host
+        host_name               google.de
+        alias                   Google Website
+        address                 google.de
+        parents                 shack-gw
+        hostgroups              http-servers
+        }
+
+define host{
+        use                     generic-host
+        host_name               google-dns
+        parents                 shack-gw
+        alias                   Google DNS Service (always reachable)
+        address                 8.8.8.8
+        }
+define service {
+        host_name               google-dns
+        service_description     DNS Service
+        use                     generic-service
+        check_command           check_dns
+        }