| Age | Commit message (Collapse) | Author |
|---|
|
|
|
Conflicts:
README
manifests/irc_bot.pp
manifests/irc_bot/base.pp
templates/irc_bot/nsa.cfg.erb
|
|
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
|
|
|
|
errors are caused:
Operator or semicolon missing before %Nsa at /etc/nagios_nsa.cfg line 1.
Ambiguous use of % resolved as operator % at /etc/nagios_nsa.cfg line 1.
ERROR: Failure compiling '/etc/nagios_nsa.cfg' - syntax error at /etc/nagios_nsa.cfg line 1, near "%%Nsa "
|
|
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:
templates/irc_bot/nsa.cfg.erb
|
|
|
|
which can be turned on by the puppet variable $nagios_nsa_usenotices
|
|
Koumbit is using an IRC bot that Micah provided. It is a pair of perl
scripts that send Nagios notifications as messages in an IRC channel.
Add a class to make installing this IRC bot easy. It also defines
commands 'notify-by-irc' and 'host-notify-by-irc' that can be used with
checks to send notifications via the bot.
Signed-off-by: Gabriel Filion <lelutin@gmail.com>
|
