| 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.
|
|
|
|
|
|
|
|
|
|
|
|
The file commands.cfg was introduced at 61aab91919b2e6d9cb5d7afe3befe40de67ac132.
This change make sure the file exists so nagios doesn't stop running.
|
|
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.
|
|
|
|
|
|
|
|
|
|
|
|
* the type nagios_type have been removed and puppet fails to collect
unknown types. This has already been removed once, but reintroduced
with 4e35b0bce0f2dd00d52e0de7488ab322867dd012 -> reremove it again
* To better compare existing types and what we have in the module,
I arranged the collection alphabetically to ease comparision.
|
|
Some Nagios resource types are currently not being managed. This has the
result that exported resources for those types are not collected by
nagios servers, and also that configuration files for those resources
are put in their default path which is wrong for some OSes and with
possibly wrong permissions.
Add the missing resources to base.pp
Signed-off-by: Gabriel Filion <lelutin@gmail.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
this also adds a site-nagios possibility to one file resource where it was missing (nagios_private_resource.cfg)
although this module was updated for this purpose some time ago, it was still complaining:
Apr 12 15:13:10 puppetmaster puppetmasterd[11189]: DEPRECATION NOTICE: Files found in modules without specifying 'modules' in file path will be deprecated in the next major release. Please fix module 'nagios' when no 0.24.x clients are present
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
nagios::default resource; add support for lighttpd and headless httpd configurations; move common commands definitions into nagios::commands
|
|
|
|
|
|
|
|
|
|
|
|
|
