| Age | Commit message (Collapse) | Author |
|---|
|
|
|
|
|
|
|
|
|
Apt installs recommended packages by default.
When pnp4nagios is installed before nagios is
installed, it will install icinga or nagios as
recommended package, and choses icinga for unknown
reasons (alphabetical ?).
So we ensure pnp4nagios* packages are installed after
nagios.
This resolves: https://leap.se/code/issues/7976
|
|
|
|
Improve notification mails
The mail subject line is too long for some mail clients,
so i removed the $NOTIFICATIONTYPE$ variable from it,
because it is not needed to understand the problem/recovery.
This is an example of a mail send out using this change:
Subject: WARNING - aardwolf: APT
***** Nagios *****
Notification Type: PROBLEM
Host: aardwolf.unstable.bitmask.i (aardwolf)
Address: 199.119.112.205
Service: APT
State: WARNING
Duration: 0d 0h 13m 5s
Date/Time: Fri Jan 15 10:04:55 UTC 2016
Output: WARN - APT WARNING: 20 packages available for upgrade (0 critical updates).
Before it looked like this:
Subject: ** PROBLEM Service Alert: aardwolf/APT is WARNING **
***** Nagios *****
Notification Type: PROBLEM
Service: APT
Host: aardwolf
Address: 199.119.112.205
State: WARNING
Date/Time: Thu Mar 10 21:57:23 UTC 2016
Additional Info:
WARN - APT WARNING: 1 packages available for upgrade (0 critical updates).
See merge request !22
|
|
|
|
Without a relationship, `pnp4nagios` will pull
`pnp4nagios-web-config-icinga` because the package
provider installs the recommends by default.
This package itself will pull in icinga as dependency then.
So we install `pnp4nagios-web-config-nagios3` before.
Patch was sent to the leap-discuss ml on March 17th.
|
|
The mail subject line is too long for some mail clients,
so i removed the $NOTIFICATIONTYPE$ variable from it,
because it is not needed to understand the problem/recovery.
This is an example of a mail send out using this change:
Subject: WARNING - aardwolf: APT
***** Nagios *****
Notification Type: PROBLEM
Host: aardwolf.unstable.bitmask.i (aardwolf)
Address: 199.119.112.205
Service: APT
State: WARNING
Duration: 0d 0h 13m 5s
Date/Time: Fri Jan 15 10:04:55 UTC 2016
Output: WARN - APT WARNING: 20 packages available for upgrade (0 critical updates).
Before it looked like this:
Subject: ** PROBLEM Service Alert: aardwolf/APT is WARNING **
***** Nagios *****
Notification Type: PROBLEM
Service: APT
Host: aardwolf
Address: 199.119.112.205
State: WARNING
Date/Time: Thu Mar 10 21:57:23 UTC 2016
Additional Info:
WARN - APT WARNING: 1 packages available for upgrade (0 critical updates).
|
|
|
|
Improve resource ordering
See merge request !21
|
|
|
|
|
|
|
|
|
|
With this you can disable collection of exported 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.
|
|
|
|
|
