From 3cf7838401c53690a86eb4a0cc5e4eb7b53d89ef Mon Sep 17 00:00:00 2001
From: Gabriel Filion <lelutin@gmail.com>
Date: Thu, 8 Dec 2011 20:13:48 -0500
Subject: Provide default config files for nagios.cfg and cgi.cfg

The current code tries to get the content of those two files in a bunch
of places and defines a fallback to a generic file in the module's
files/configs directory.

The problem is that there is no such generic config file present.

Link to Debian's config files as a generic version of those
configuration files.

This bug was found by taggart.
---
 files/configs/cgi.cfg    | 1 +
 files/configs/nagios.cfg | 1 +
 2 files changed, 2 insertions(+)
 create mode 120000 files/configs/cgi.cfg
 create mode 120000 files/configs/nagios.cfg

(limited to 'files')

diff --git a/files/configs/cgi.cfg b/files/configs/cgi.cfg
new file mode 120000
index 0000000..db9667b
--- /dev/null
+++ b/files/configs/cgi.cfg
@@ -0,0 +1 @@
+Debian/cgi.cfg
\ No newline at end of file
diff --git a/files/configs/nagios.cfg b/files/configs/nagios.cfg
new file mode 120000
index 0000000..1409b9e
--- /dev/null
+++ b/files/configs/nagios.cfg
@@ -0,0 +1 @@
+Debian/nagios.cfg
\ No newline at end of file
-- 
cgit v1.2.3


From 550d098f8e9b4ac28800c8bb5db0611eb5f3fa34 Mon Sep 17 00:00:00 2001
From: Gabriel Filion <lelutin@gmail.com>
Date: Mon, 9 Apr 2012 02:36:25 -0400
Subject: Import fresh nsca.cfg file

The default nsca.cfg is currently using the "non-normal" port for nsca.
Let's import a freshly installed nsca.cfg file with default values.

Signed-off-by: Gabriel Filion <lelutin@gmail.com>
---
 files/nsca/nsca.cfg | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'files')

diff --git a/files/nsca/nsca.cfg b/files/nsca/nsca.cfg
index 238869f..0b019ea 100644
--- a/files/nsca/nsca.cfg
+++ b/files/nsca/nsca.cfg
@@ -21,7 +21,7 @@ pid_file=/var/run/nsca.pid
 # Port number we should wait for connections on.
 # This must be a non-priveledged port (i.e. > 1024).
 
-server_port=5677
+server_port=5667
 
 
 
@@ -79,10 +79,15 @@ debug=0
 # COMMAND FILE
 # This is the location of the Nagios command file that the daemon
 # should write all service check results that it receives.
-
+# Note to debian users: nagios 1.x and nagios 2.x have
+# different default locations for this file.  this is the
+# default location for nagios 1.x:
+#command_file=/var/run/nagios/nagios.cmd
+# and this is the default location for nagios2:
+#command_file=/var/lib/nagios2/rw/nagios.cmd
+# and this is the default location for nagios3:
 command_file=/var/lib/nagios3/rw/nagios.cmd
 
-
 # ALTERNATE DUMP FILE
 # This is used to specify an alternate file the daemon should
 # write service check results to in the event the command file
@@ -96,7 +101,6 @@ command_file=/var/lib/nagios3/rw/nagios.cmd
 alternate_dump_file=/var/run/nagios/nsca.dump
 
 
-
 # AGGREGATED WRITES OPTION
 # This option determines whether or not the nsca daemon will
 # aggregate writes to the external command file for client
-- 
cgit v1.2.3


From f722765369b3900f57d845e5c9e2e170a560302c Mon Sep 17 00:00:00 2001
From: nadir <nadir-technik@nadir.org>
Date: Mon, 4 Oct 2010 18:25:25 +0200
Subject: Basic NRPE Support

amended (lelutin): removed trailing spaces and commented out code.
---
 files/nrpe/nrpe_commands.cfg | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 files/nrpe/nrpe_commands.cfg

(limited to 'files')

diff --git a/files/nrpe/nrpe_commands.cfg b/files/nrpe/nrpe_commands.cfg
new file mode 100644
index 0000000..1a26cc3
--- /dev/null
+++ b/files/nrpe/nrpe_commands.cfg
@@ -0,0 +1,6 @@
+# default plugins
+command[check_users]=/usr/lib/nagios/plugins/check_users $ARG1$ 
+command[check_load]=/usr/lib/nagios/plugins/check_load $ARG1$
+command[check_disk]=/usr/lib/nagios/plugins/check_disk $ARG1$ -x "/dev" -x "/dev/shm" -x "/lib/init/rw" 
+command[check_apt]=sudo /usr/lib/nagios/plugins/check_apt -u $ARG1$
+command[check_swap]=/usr/lib/nagios/plugins/check_swap $ARG1$ 
-- 
cgit v1.2.3


From 7fb80fbecfa5a186846a2909bd1d6ada32ba21e1 Mon Sep 17 00:00:00 2001
From: Gabriel Filion <gabriel@koumbit.org>
Date: Wed, 27 Apr 2011 15:46:58 -0400
Subject: Define check_load as a function of the nb of cpus

The "check_load" nagios check should not be hardcoded to some arbitrary
value. The thresholds should rather be adjusted in function of how many
CPUs are present in the server.

The factors were chosen by prior experience but could be adjusted if
needed.

Factors for warning thresholds (where N is the nb of cpus):
 * 1min : 5 * N
 * 5mins : 4 * N
 * 15mins : 3 * N

Factors for critical thresholds:
 * 1min : 10 * N
 * 5mins : 9 * N
 * 15mins : 8 * N
---
 files/nrpe/nrpe_commands.cfg | 1 -
 1 file changed, 1 deletion(-)

(limited to 'files')

diff --git a/files/nrpe/nrpe_commands.cfg b/files/nrpe/nrpe_commands.cfg
index 1a26cc3..b725a36 100644
--- a/files/nrpe/nrpe_commands.cfg
+++ b/files/nrpe/nrpe_commands.cfg
@@ -1,6 +1,5 @@
 # default plugins
 command[check_users]=/usr/lib/nagios/plugins/check_users $ARG1$ 
-command[check_load]=/usr/lib/nagios/plugins/check_load $ARG1$
 command[check_disk]=/usr/lib/nagios/plugins/check_disk $ARG1$ -x "/dev" -x "/dev/shm" -x "/lib/init/rw" 
 command[check_apt]=sudo /usr/lib/nagios/plugins/check_apt -u $ARG1$
 command[check_swap]=/usr/lib/nagios/plugins/check_swap $ARG1$ 
-- 
cgit v1.2.3