summaryrefslogtreecommitdiff
path: root/manifests/target.pp
diff options
context:
space:
mode:
authorMicah <micah@riseup.net>2015-12-09 19:32:51 +0000
committerMicah <micah@riseup.net>2015-12-09 19:32:51 +0000
commitd1321c39001ebd445b37fd551fbfd324b6ab6ae0 (patch)
tree6c3a56aac66bf1cdce128d89550151a11cdb21c2 /manifests/target.pp
parent993b624bd14dc5ef88847b11abc06d2b708c23b6 (diff)
parent6cd3270ccfd806bcc8097be4f6982c6dccc6a4aa (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/target.pp')
-rw-r--r--manifests/target.pp24
1 files changed, 14 insertions, 10 deletions
diff --git a/manifests/target.pp b/manifests/target.pp
index be6c40e..760d7d4 100644
--- a/manifests/target.pp
+++ b/manifests/target.pp
@@ -1,28 +1,32 @@
-# manifests/target.pp
-
+# a simple nagios target to monitor
class nagios::target(
- $parents = 'absent',
- $address = $::ipaddress,
+ $parents = 'absent',
+ $address = $::ipaddress,
$nagios_alias = false,
- $hostgroups = 'absent'
+ $hostgroups = 'absent',
+ $use = 'generic-host',
){
@@nagios_host { $::fqdn:
address => $address,
- use => 'generic-host',
+ use => $use,
}
# Watch out with using aliases: they need to be unique throughout *all*
# resources in a given host's catalogue.
if $nagios_alias {
- Nagios_host[$::fqdn] {
- alias => $nagios_alias,
+ Nagios_host[$::fqdn]{
+ alias => $nagios_alias
}
}
if ($parents != 'absent') {
- Nagios_host["${::fqdn}"] { parents => $parents }
+ Nagios_host[$::fqdn]{
+ parents => $parents
+ }
}
if ($hostgroups != 'absent') {
- Nagios_host["${::fqdn}"] { hostgroups => $hostgroups }
+ Nagios_host[$::fqdn]{
+ hostgroups => $hostgroups
+ }
}
}