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.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
manifests/defaults/commands.pp
|
|
|
|
be unhappy, so lets only put them in when we have arguments to pass
|
|
the command specifier
|
|
|
|
|
|
|
|
|
|
. 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
|
|
creation of the check_mysql_health mysql nagios plugin. See the mysql module for the installation of this plugin, and example usage"
This reverts commit 45edca107c3fd158fc9b00aa90f9f3f6d730185a.
reverted because this is much easier to handle within the mysql module itself.
|
|
check_mysql_health mysql nagios plugin. See the mysql module for the installation of this plugin, and example usage
|
|
|
|
parameter to specify socket
|
|
nagios_service type, but should not appear for service descriptions in nagios
|
|
|
|
|
|
|
|
|
|
factored out classes and defines in their own files
|