| Age | Commit message (Collapse) | Author |
|---|
|
Conflicts:
README
manifests/base.pp
manifests/defaults/commands.pp
manifests/nrpe.pp
manifests/service.pp
manifests/target.pp
templates/nrpe/nrpe_command.erb
|
|
Debian and ubuntu have their resource.cfg file placed in /etc/nagios3/
and when it's absent it can cause issues with the package (because the
package is badly done).
|
|
Conflicts:
manifests/defaults/commands.pp
|
|
|
|
Conflicts:
README
README.pnp4nagios
manifests/defaults/pnp4nagios.pp
manifests/munin.pp
manifests/pnp4nagios.pp
manifests/pnp4nagios/popup.pp
|
|
the basic path for nagiosstats is wrong/hardcoded.
that binary comes in with the nagios3 package in Debian. set the default
value to the right path under Debian and make it possible to override
the path with an environment variable.
Signed-off-by: Gabriel Filion <lelutin@gmail.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
README
manifests/service.pp
|
|
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:
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.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
The "check_load" nagios check should not be hardcoded to some arbitrary
value. The thresholds should rather be adjusted in function of how many
CPUs are present in the server.
The factors were chosen by prior experience but could be adjusted if
needed.
Factors for warning thresholds (where N is the nb of cpus):
* 1min : 5 * N
* 5mins : 4 * N
* 15mins : 3 * N
Factors for critical thresholds:
* 1min : 10 * N
* 5mins : 9 * N
* 15mins : 8 * N
|
|
amended (lelutin): removed trailing spaces and commented out code.
|
|
The default nsca.cfg is currently using the "non-normal" port for nsca.
Let's import a freshly installed nsca.cfg file with default values.
Signed-off-by: Gabriel Filion <lelutin@gmail.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
templates/irc_bot/nsa.cfg.erb
|
|
|
|
|
|
The current code tries to get the content of those two files in a bunch
of places and defines a fallback to a generic file in the module's
files/configs directory.
The problem is that there is no such generic config file present.
Link to Debian's config files as a generic version of those
configuration files.
This bug was found by taggart.
|
|
|
|
|
|
which can be turned on by the puppet variable $nagios_nsa_usenotices
|
|
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.
|
|
|
|
|
|
|
|
|
|
|
