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

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

1 files changed, 31 insertions, 0 deletions

diff --git a/god/Monitoring/nagios/conf/tincnet.cfg b/god/Monitoring/nagios/conf/tincnet.cfg
new file mode 100644
index 00000000..f0b35b4e
--- /dev/null
+++ b/god/Monitoring/nagios/conf/tincnet.cfg
@@ -0,0 +1,31 @@
+define hostgroup {
+        hostgroup_name   tinc-nodes
+        alias            Tinc Nodes
+        }
+
+define hostextinfo{
+        hostgroup_name   tinc-nodes
+        notes            Tinc Nodes
+        icon_image       krebs/tinc.png
+        icon_image_alt   tinc
+        vrml_image       tinc.png
+        statusmap_image  krebs/tinc.gd2
+        }
+
+define command {
+        command_name check_internal_tinc_up
+        command_line $USER1$/check_ping -H $_HOSTTINC_ADDRESS$ -w $ARG1$ -c $ARG2$
+        }
+define command {
+        command_name check_ircd
+        command_line $USER1$/check_ircd $_HOSTTINC_ADDRESS$
+        }
+
+define service {
+        hostgroup_name                  tinc-nodes
+        service_description             tinc internal
+        check_command                   check_internal_tinc_up!100.0,20%!500.0,60%
+        use                             generic-service
+        notification_interval           0
+}
+