GitLab

this was removed in 7fb80fbe because it was redefined in nrpe/base.pp to use a template. I'm not quite sure how it snuck back it, it looks like a double commit of the "Basic NRPE Support" commit.

Merge remote-tracking branch 'shared/master'

Conflicts:
	manifests/defaults/commands.pp

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.

merging with shared

Conflicts:
	README
	README.pnp4nagios
	files/pnp4nagios/apache.conf
	manifests/defaults/commands.pp
	manifests/init.pp
	manifests/pnp4nagios.pp
	manifests/pnp4nagios/popup.pp
	manifests/service.pp
	templates/nrpe/nrpe_command.erb

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.

require package before config files

In the current state of the module, almost 100% of the time nagios
doesn't install correctly since ordering of the resources is not
enforced.

This is a major issue since the module is currently not usable in its current state because of the problem it creates.

See merge request !5

In the current state of the module, almost 100% of the time nagios
doesn't install correctly since ordering of the resources is not
enforced.

stop defining an alias by default for hosts

Since the "alias" attribute is special for puppet in that it needs to be
a string that's unique throughout all of the resources on a given host's
catalogue, we shouldn't always define an alias unless users really want
them.

This alias might (and did for some ppl) create a conflict when using a
class that is named the same as $::hostname.

We've just hit hit limitation on a Koumbit node. The alias attribute is legitimate in terms of nagios host attributes, but the name of the attribute clashes with the special-purpose attribute for puppet. So one might argue that the native puppet types are flawed, and they would be correct! but getting those types fixed would be a pain in the ass since they haven't been maintained for quite some time.

See merge request !10

added templates/nrpe/nrpe_command.erb

commit:7fb80fbe uses nagios::nrpe::command { "check_load": ...}, but the
template for it is missing.

amended by LeLutin: use @ prefix on variables in template

This is a followup of: https://labs.riseup.net/code/issues/4100

See merge request !8

Plugin path

Avoid using lib64 in the path for x86_64 architecture when using debian. this path is not available anymore starting with debian wheezy.
Then lint the file to make it easier to read / maintain.

This is a followup of https://labs.riseup.net/code/issues/4237

See merge request !7

Ordering in example

The usage example in the readme has a couple of small and bigger problems. This branch makes the example more accurate.

See merge request !6

Only use the private directory on CentOS

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).

This is a followup to issue https://labs.riseup.net/code/issues/4240

See merge request !4

Since the "alias" attribute is special for puppet in that it needs to be
a string that's unique throughout all of the resources on a given host's
catalogue, we shouldn't always define an alias unless users really want
them.

This alias might (and did for some ppl) create a conflict when using a
class that is named the same as $::hostname.

Unquote booleans

Some variables and if blocks use quoted booleans when we should be using the native boolean type.

Also, when working on this, I saw an issue with a mistyped variable in nagios::service so I fixed it.

This is a followup of: https://labs.riseup.net/code/issues/4093

See merge request !9

This invalidates the point of that if block since it will probably never
be true that some undefined (read mis-typed) variable is set to
'absent'.

commit:7fb80fbe uses nagios::nrpe::command { "check_load": ...}, but the
template for it is missing.

amended by LeLutin: use @ prefix on variables in template

This should make it easier to read the code.

The example doesn't set any ordering on the classes and this leads to
errors at first install since all of the configuration files that the
nagios::defaults class installs need the nagios package to be installed
first in order for the config dirs to exist.

Example uses weird spacing in the beginning of the lines.

Also the example usage of nagios::command is broken: it lacks the
closing curly brace.