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

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

1 files changed, 17 insertions, 0 deletions

diff --git a/god/Monitoring/nagios/shinken/hostgroups.cfg b/god/Monitoring/nagios/shinken/hostgroups.cfg
new file mode 100644
index 00000000..fb8713b7
--- /dev/null
+++ b/god/Monitoring/nagios/shinken/hostgroups.cfg
@@ -0,0 +1,17 @@
+
+
+
+#A little host group. Host groups are important if you want to keep managable your conf ;)
+#define hostgroup{
+#        hostgroup_name  linux-servers ; The name of the hostgroup
+#        alias           Linux Servers ; Long name of the group
+#        members         localhost,dc01     ; Comma separated list of hosts that belong to this group
+#	realm Europe
+#        }
+
+
+#define hostgroup{
+#        hostgroup_name  mysql-servers
+#	alias           mysql-servers
+#        members         databasehost1,databasehost-us
+#        }