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

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

1 files changed, 25 insertions, 0 deletions

diff --git a/god/Monitoring/nagios/shinken/discovery.cfg b/god/Monitoring/nagios/shinken/discovery.cfg
new file mode 100644
index 00000000..d8e9fa9f
--- /dev/null
+++ b/god/Monitoring/nagios/shinken/discovery.cfg
@@ -0,0 +1,25 @@
+
+# Log file of the discovery command
+log_file=/tmp/discovery.log
+
+# Configuration files with common discovery objects
+# like discoveryrules or runners
+cfg_file=discovery_rules.cfg
+cfg_file=discovery_runs.cfg
+
+# Load all commands that will be used
+cfg_file=commands.cfg
+
+# Some important macros
+resource_file=resource.cfg
+
+# Lock file (with pid) for Arbiterd
+lock_file=discovery.pid
+
+# Strip FQDN of the name ID to keep only the
+# basename of the element
+strip_idname_fqdn=0
+
+# Change this value to increase the discovery
+# scripts timeout. Start with a quite huge value, one hour.
+runners_timeout=3600