diff options
| author | Micah <micah@riseup.net> | 2015-12-09 19:32:51 +0000 |
|---|---|---|
| committer | Micah <micah@riseup.net> | 2015-12-09 19:32:51 +0000 |
| commit | d1321c39001ebd445b37fd551fbfd324b6ab6ae0 (patch) | |
| tree | 6c3a56aac66bf1cdce128d89550151a11cdb21c2 /manifests/pnp4nagios.pp | |
| parent | 993b624bd14dc5ef88847b11abc06d2b708c23b6 (diff) | |
| parent | 6cd3270ccfd806bcc8097be4f6982c6dccc6a4aa (diff) | |
Merge branch 'immerda_changes' into 'master'
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
Diffstat (limited to 'manifests/pnp4nagios.pp')
| -rw-r--r-- | manifests/pnp4nagios.pp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/manifests/pnp4nagios.pp b/manifests/pnp4nagios.pp index bdeb9b4..a7e1c73 100644 --- a/manifests/pnp4nagios.pp +++ b/manifests/pnp4nagios.pp @@ -1,4 +1,4 @@ -# configure pnp4nagios +# manage pnp4nagios class nagios::pnp4nagios { include nagios::defaults::pnp4nagios @@ -11,7 +11,7 @@ class nagios::pnp4nagios { # see http://projects.reductivelabs.com/issues/1180 for this limitation file { 'pnp4nagios-templates.cfg': - path => "${nagios::defaults::vars::int_cfgdir}/conf.d/pnp4nagios-templates.cfg", + path => "${nagios::defaults::vars::int_cfgdir}/pnp4nagios-templates.cfg", source => [ 'puppet:///modules/site_nagios/pnp4nagios/pnp4nagios-templates.cfg', 'puppet:///modules/nagios/pnp4nagios/pnp4nagios-templates.cfg' ], mode => '0644', @@ -22,9 +22,8 @@ class nagios::pnp4nagios { file { 'apache.conf': path => '/etc/pnp4nagios/apache.conf', - source => [ - 'puppet:///modules/site_nagios/pnp4nagios/apache.conf', - 'puppet:///modules/nagios/pnp4nagios/apache.conf' ], + source => ['puppet:///modules/site_nagios/pnp4nagios/apache.conf', + 'puppet:///modules/nagios/pnp4nagios/apache.conf' ], mode => '0644', owner => root, group => root, |