| Age | Commit message (Collapse) | Author |
|---|
|
|
|
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.
|
|
The file commands.cfg was introduced at 61aab91919b2e6d9cb5d7afe3befe40de67ac132.
This change make sure the file exists so nagios doesn't stop running.
|
|
which can be turned on by the puppet variable $nagios_nsa_usenotices
|
|
|
|
|
|
|
|
|
|
|
|
|
|
On Debian, the nagios-plugins packages install
/etc/nagios-plugins/config/mail.cfg which contains the check_smtp/check_imap
commands, and these commands cannot be duplicated. The addition of these
commands in this module in c9c4f5bb895e98e31d84c751a7fcbdae9bf57008 and
1c4de48baf4ffcf5f39894a101a3c59479959b47 now cause Debian nagios servers to
fail to start with this message:
Warning: Duplicate definition found for command 'check_smtp' (config file '/etc/starting on line 9)
The versions of these check commands that were added in the above commits are
actually more full-featured than the ones that Debian ships, most notably
because they allow for the port to be passed as an option. In most cases their
names are the same, although the imap and pop ssl commands are different. This
leads to a somewhat unfortunate situation where the module defines duplicated
commands, which are better, but in some cases are differently named than the
ones shipped in the package. Ideally, those names would converge, and the
debian package commands would add the port options by default, and we'd case
out debian/ubuntu to not ship these in this module.
However, due to the added benefit of the options provided in the commands
shipped in this module, along with the benefits that come with the module
being able to automatically configure these, I've elected to simply remove
the debian package file (which is a config file, so it will be honored
by the packaging system).
|
|
Conflicts:
manifests/defaults/commands.pp
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
an irc server
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* the type nagios_type have been removed and puppet fails to collect
unknown types. This has already been removed once, but reintroduced
with 4e35b0bce0f2dd00d52e0de7488ab322867dd012 -> reremove it again
* To better compare existing types and what we have in the module,
I arranged the collection alphabetically to ease comparision.
|
|
The contact_groups argument to nagios::service is currently not passed
on to the exported nagios_service resource. Pass this value on so that
services can notify the right people.
Signed-off-by: Gabriel Filion <lelutin@gmail.com>
|
|
Some Nagios resource types are currently not being managed. This has the
result that exported resources for those types are not collected by
nagios servers, and also that configuration files for those resources
are put in their default path which is wrong for some OSes and with
possibly wrong permissions.
Add the missing resources to base.pp
Signed-off-by: Gabriel Filion <lelutin@gmail.com>
|
|
be unhappy, so lets only put them in when we have arguments to pass
|
|
the command specifier
|
|
|
|
|
