Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
|
|
|
|
|
|
This reverts commit ffca95a6b0281ab49f4a626a1ee6a68257769388.
|
|
|
|
|
|
|
|
Conflicts:
manifests/apache.pp
manifests/base.pp
manifests/defaults/templates.pp
manifests/defaults/vars.pp
manifests/init.pp
manifests/irc_bot.pp
manifests/nsca/client.pp
manifests/nsca/server.pp
manifests/service.pp
manifests/service/mysql.pp
templates/irc_bot/nsa.cfg.erb
|
|
Conflicts:
manifests/apache.pp
this conflict was just a indentation difference.
|
|
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
|
|
We have a serious problem with the concept that we had up to now if
you start adding more than one nagios server. This is an attempt to
fix it, with certain drawbacks, such as that you have to list all
the nagios plugins in the nagios modules. This will be subject of
further discussion.
|
|
|
|
. fixed a division by zero bug in index-usage (Thanks Wiltmut Gerdes)
. fixed a severe bug when loading dynamic extensions (Thanks Ralph Schneider)
. added mode table-fragmentation
. fixed a bug in table-lock-contention (thanks mayukmok00)
. mode sql can now have a non-numerical output which is compared to a string/regexp
. new parameter –dbthresholds
. new mode report can be used to output only the bad news (short,long,html)
. added modes threads-created, threads-running, threads-cached
. added connects-aborted, clients-aborted
|
|
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
|
|
used in this module
|
|
nagios_service type, but should not appear for service descriptions in nagios
|
|
|