Age | Commit message (Collapse) | Author |
|
resources
On masterless setups, this module would otherwise complain
|
|
Nrpe params
The nagios::nrpe class is currently completely unusable with puppet 3.x+
This is because it's still relying on global variables. When one tries to setup an nrpe client with nagios::nrpe with puppet 3.x, the following error occurs:
~~~
==> jessiepuppet: Error: Failed to parse template nagios/nrpe/nrpe.cfg:
==> jessiepuppet: Filepath: /usr/lib/ruby/vendor_ruby/puppet/parser/templatewrapper.rb
==> jessiepuppet: Line: 81
==> jessiepuppet: Detail: Could not find value for 'nagios_nrpe_pid_file' at /etc/puppet/modules/nagios/templates/nrpe/nrpe.cfg:19
==> jessiepuppet: at /etc/puppet/modules/nagios/manifests/nrpe/base.pp:22 on node jessie.vagrantup.com
==> jessiepuppet: Error: Failed to parse template nagios/nrpe/nrpe.cfg:
==> jessiepuppet: Filepath: /usr/lib/ruby/vendor_ruby/puppet/parser/templatewrapper.rb
==> jessiepuppet: Line: 81
==> jessiepuppet: Detail: Could not find value for 'nagios_nrpe_pid_file' at /etc/puppet/modules/nagios/templates/nrpe/nrpe.cfg:19
==> jessiepuppet: at /etc/puppet/modules/nagios/manifests/nrpe/base.pp:22 on node jessie.vagrantup.com
~~~
This is because the values of variables defined within nagios::nrpe are not propagated into other classes anymore.
This series also changes a default behaviour for creating saner configurations by default: the dont_blame_nrpe option is changed to disable command arguments by default.
It also adds some documentation for the nagios::nrpe class since it had no explanation whatsoever of how it should be used in the README.
See merge request !18
|
|
We missed this module reference. Starting with puppet 3.x, modules with
a dash in them are not recognized by puppet anymore, so only the file
from the "nagios" module is found.
|
|
|
|
setting dont_blame_nrpe is useful for some, but it's generally dangerous
and should be disabled if it's not used.
In this sense, it's a better idea to disable this by default.
|
|
This value is used in order to enable or disable arguments to nrpe
commands. Since some ppl might need to enable it, we should parametrize
it.
|
|
the current code for configuring NRPE is still relying on global
variables. This is not working at all with puppet 3.x and forward, so in
order to make this code functional, we need to parametrize values that
are used.
|
|
Merge in immerda changes - purging of resources and lots of nice additional checks
Sorry for the big amount of changes, but I think I merged everything nicely with what we have been working. Ok, so what do you get here:
* Purging of unmanaged resources, for that I had to move everything to the default paths of the puppet types, BUT now as soon as a node won't export anymore a resource it will get purged from nagios. No more cleaning up of decomissioned nodes, just remove them from puppet (puppet node clean oldnode.example.com) and they will also disappear from nagios.
* slight changes to the http checks.
** naming the checks consistently, so it's easier to change what they are looking for.
** Also accept 301 & 302 as a good value per default.
** make it possible to define accepted return codes per http & https
* add gpgkey checks, so you won't miss any expiring gpg keys anymore
* add imap login checks, so you can check whether ppl can actually login to your mailserver
* add horde login checks, so you can check whether login to horde still works
* linting wherever I touched something.
See merge request !15
|
|
|
|
|
|
|
|
|
|
|
|
[bug] Install pnp4nagios-web-config-nagios3 .deb
On jessie hosts, pnp4nagios-web defaults now to
pnp4nagios-web-config-icinga, so we install
pnp4nagios-web-config-nagios3 manually.
See merge request !16
|
|
|
|
On jessie hosts, pnp4nagios-web defaults now to
pnp4nagios-web-config-icinga, so we install
pnp4nagios-web-config-nagios3 manually.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
This reverts commit ffca95a6b0281ab49f4a626a1ee6a68257769388.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
update the apache2.conf file
updating to the debian 3.5.1.dfsg-2+b1 version of the file. mostly
whitespace changes, one 2.2 vs 2.4 change and a change for docs.
See merge request !14
|
|
Add --sni to check_http --ssl commands
Makes sure correct SSL certificate is selected on hosts which use SNI for SSL, and also avoids some sites returning a `HTTP CRITICAL - Error on receive` error. Does not seem to affect non-SNI hosts.
See merge request !13
|
|
updating to the debian 3.5.1.dfsg-2+b1 version of the file. mostly
whitespace changes, one 2.2 vs 2.4 change and a change for docs.
|
|
|
|
Fix apache
the main class is currently unusable with apache, which is the default case.
we need to move management of files necessary for nagios+apache+debian into the "nagios" class to fix this.
This partly responds to #4
See merge request !12
|
|
one line is too long, break the code block into multiple lines to fix
this issue. it also creates more breathing space and makes the code
easier to read.
|
|
Currently the nagios::apache class manages some files for debian. This
means that when using the main class for setting up nagios with apache
(which is the default!) lacks those files and the setup doesn't work.
Split out management of those files into another class to avoid making
the code in the main class too encumbered and make the main class
include that (instead of nagios::apache). nagios::apache will include
the main class anyway.
Adjust README file so that all cases of http management are done through
the "nagios" class.
|
|
remove non-ascii char in comment
puppet 3.x refuses to run when there are non-ASCII chars in comments
(wth!). so replace that char with an ASCII representation of it.
See merge request !11
|
|
puppet 3.x refuses to run when there are non-ASCII chars in comments
(wth!). so replace that char with an ASCII representation of it.
|