Age | Commit message (Collapse) | Author |
|
Conflicts:
manifests/apache.pp
manifests/irc_bot.pp
manifests/service/mysql.pp
templates/irc_bot/nsa.cfg.erb
Conflict resolutions:
apache.pp: just cosmetics
mysql.pp: The shared modules provides more variables to fine tune the mysql health
check so we went for this version.
The irc bot conflicts were a result of immerda's branch not being
up-to-date with the shared branch. The shared branch had
factored out the irc_bot.pp into a directory, and added a few
additional variables. Immerda changed the variables from having
the prefix $nagios_ to not having it and did not have that
refactor. The variable renames were good ones for the 2.7
refactoring work, and future hiera integration, so we want those.
So to resolve this, we took the shared version of the refactor,
and then took the immerda version of the variable renames. This
requires an UPGRADE NOTICE in the README as people may have been
using the previous variable names.
|
|
|
|
|
|
|
|
|
|
|
|
Add the port arg to check_http_url_regex. Default 80.
|
|
|
|
|
|
|
|
Plugins are found under another directory.
The pid file must be changed to /var/spool/nagios/nrpe2.pid, since this
place is writable by the daemon, and the rc script expects the pid file
to be found there.
Use a pattern instead of the rc script status command.
|
|
|
|
|
|
|
|
We don't really manage everything with this class (e.g. not the config
for running NRPE under xinetd). We ensure that the nrpe service is not
running since xinetd is the one that's supposed to spawn nrpe.
This way we can manage the NRPE config and commands, but it does not
conflict with xinetd.
|
|
The CPU checks were fireing way too often. Bump up the multipliers to
reduce the number of alerts.
|
|
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
|
|
This package doesn't exist on lenny.
|
|
Make some changes to ensure compatibility of the nrpe resources with
FreeBSD.
* Use group 0 instead of 'root'
* capitalize values for testing $operatingsystem
* override arguments for the nrpe service so that FreeBSD can find the
init script
|
|
The 'command' resource defines files under the root group. Since the
'root' group does not exist by default on FreeBSD, make an exception for
FreeBSD to use the 'wheel' group instead.
|
|
Configuration needs to be placed in a different directory in FreeBSD.
Some packages are not named the same under FreeBSD.
Some packages are not available under FreeBSD. Migrate those to a new
nagios::nrpe::linux class so that FreeBSD does not take them into
account.
|
|
We need to be able to configure what NRPE commands are defined on
clients.
This new method accepts inline contents or a puppet source argument.
Signed-off-by: Gabriel Filion <lelutin@gmail.com>
|
|
amended (lelutin): took out some trailing whitespaces and a commented
out (useless) line
|
|
|
|
|
|
|
|
|
|
amended (lelutin): removed trailing spaces and commented out code.
|
|
Without this link, puppet sometimes attempts to start the service before
the package is installed, wich triggers an error.
Signed-off-by: Gabriel Filion <lelutin@gmail.com>
|
|
|
|
|
|
|
|
|
|
|
|
This reverts commit fb75fcec220f9e2943d2e7af292ff884fd237f6d.
Reverted due to LeLutin's comments in #3310 and the fix implemented in #3298 in
preparation of merging those
|
|
|
|
|
|
Conflicts:
manifests/irc_bot.pp
Had to merge in the use_notices change that we had in our branch
|
|
|
|
This gives us the possibility of using the nagios::irc_bot::disable
class without having any config variable set. When using
nagios::irc_bot, we still get yelled at when we didn't define the
appropriate variables.
While we're moving the code around, change the group applied on the
different files from 'root' to '0' for better portability.
|
|
All classes serving the same purpose as this one are called 'disable',
so let's follow this standard.
|
|
Since the service "disable" bug was fixed in the debian service provider
[1] in the puppet 2.6.2-5 package in squeeze, let's switch from the
manual calls to the "enable" feature.
[1]: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=573551
Also add a requirement between service[nagios-nsa] and
file[/etc/init.d/nagios-nsa]. This was ensured in Debian with the exec
that we're now replacing but didn't find its way through the
centosification.
|
|
For when you need to ensure that the bot doesn't start on a server.
|
|
When we modify the config file, we'd like for the service to restart in
order for it to use the new configuration.
|
|
To give a little more info/meaning on what the number $SERVICEATTEMPT$ is,
change the current notification from "... n.$SERVICEATTEMPT$" to "...
$SERVICEATTEMPT$/$MAXSERVICEATTEMPTS$".
|
|
|
|
|
|
|
|
This plugin is already defined at nagios-plugins, so removing it
for the same reason as e7f85f647e6f641bd85fbdfdb26982350f782370.
This commit has more readable implementation than the previous.
|
|
This plugin is already defined at nagios-plugins, so removing it
for the same reason as e7f85f647e6f641bd85fbdfdb26982350f782370.
|