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

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

1 files changed, 16 insertions, 0 deletions

diff --git a/god/Monitoring/nagios/shinken/objects/groups/root_contact.cfg b/god/Monitoring/nagios/shinken/objects/groups/root_contact.cfg
new file mode 100644
index 00000000..a2c4180a
--- /dev/null
+++ b/god/Monitoring/nagios/shinken/objects/groups/root_contact.cfg
@@ -0,0 +1,16 @@
+define contact{
+    contact_name                    root
+    alias                           root
+    service_notification_period     24x7
+    host_notification_period        24x7
+    service_notification_options    w,u,c,r
+    host_notification_options       d,u,r
+    service_notification_commands   notify-service-by-email
+    host_notification_commands      notify-host-by-email
+    email                           root@krebsco.de
+    }
+define contactgroup{
+    contactgroup_name                 root-infrastructure
+    alias                             root-infrastructure
+    members                           root
+    }