| 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.
|
|
|
|
|
|
|
|
This reverts commit fb75fcec220f9e2943d2e7af292ff884fd237f6d.
Reverted due to LeLutin's comments in #3310 and the fix implemented in #3298 in
preparation of merging those
|
|
|
|
|
|
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
|
|
|
|
|
|
|
|
|
|
the command specifier
|
|
|
|
|
|
|
|
|
|
|
|
|
|
check_dns had some problems with down nameservers. This one properly
checks the right nameserver.
|
|
|
|
|
|
. add an additional nagios::defaults::plugins class that is included in the nagios::defaults, this can be used to install other nagios plugins that aren't distributed in the nagios-plugins package
. use the nagios::defaults::plugins to setup the check_mysql_health plugin
. add a check_mysql_health command to defaults/commands.pp in the section for commands for services defined by other modules
. change the nagios::service::mysql to use the more advanced check_mysql_health plugin, instead of the basic check_mysql plugin
|
|
|
|
|
|
|
|
|
|
|
|
number of the check_commands that were being defined by this module,
this caused duplicate definition issues, so to solve this we don't define
the subset of commands on debian/ubuntu systems that are handled by the
package, but let other operatingsystems define them (as they were before)
|
|
|
|
parameter to specify socket
|
|
|
|
|
|
commands and commands required by some services defined in other modules
|
|
using native types, see issue #1180
|
|
include plugins
|
|
|
