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

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

1 files changed, 20 insertions, 0 deletions

diff --git a/god/Monitoring/nagios/conf/krebsnet.cfg b/god/Monitoring/nagios/conf/krebsnet.cfg
new file mode 100644
index 00000000..ae5b898e
--- /dev/null
+++ b/god/Monitoring/nagios/conf/krebsnet.cfg
@@ -0,0 +1,20 @@
+## extended infos for krebsnet
+define hostgroup {
+        hostgroup_name   krebs-machines
+        alias            Krebs Machines
+        }
+define hostextinfo{
+        hostgroup_name   krebs-machines
+        notes            Deployed Krebse
+#       notes_url        http://webserver.localhost.localdomain/hostinfo.pl?host=netware1
+        icon_image       krebs/krebs.png
+        icon_image_alt   Krebs
+        vrml_image       krebs.png
+        statusmap_image  krebs/krebs.gd2
+        }
+#define host{
+#        use             generic-host
+#        register        0
+#        name            tinc-only-host
+#        check_command   check_internal_tinc_up!100.0,20%!500.0,60%
+#        }