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

1 files changed, 28 insertions, 28 deletions

diff --git a/manifests/defaults/service_templates.pp b/manifests/defaults/service_templates.pp
index 84740af..e39441a 100644
--- a/manifests/defaults/service_templates.pp
+++ b/manifests/defaults/service_templates.pp
@@ -1,32 +1,32 @@
+# define the generic service template
 class nagios::defaults::service_templates {
 
-    # this inoperative for the moment, see :
-    # http://projects.reductivelabs.com/issues/1180
-
-    nagios_service {
-        'generic-service':
-            active_checks_enabled           => '1',
-            passive_checks_enabled          => '1',
-            parallelize_check               => '1',
-            obsess_over_service             => '1',
-            check_freshness                 => '0',
-            notifications_enabled           => '1',
-            event_handler_enabled           => '1',
-            flap_detection_enabled          => '1',
-            failure_prediction_enabled      => '1',
-            process_perf_data               => '1',
-            retain_status_information       => '1',
-            retain_nonstatus_information    => '1',
-            notification_interval           => '0',
-            is_volatile                     => '0',
-            check_period                    => '24x7',
-            normal_check_interval           => '5',
-            retry_check_interval            => '1',
-            max_check_attempts              => '4',
-            notification_period             => '24x7',
-            notification_options            => 'w,u,c,r',
-            contact_groups                  => 'admins',
-            register                        => '0',
-        }
+  # this inoperative for the moment, see :
+  # http://projects.reductivelabs.com/issues/1180
 
+  nagios_service {
+    'generic-service':
+      active_checks_enabled        => '1',
+      passive_checks_enabled       => '1',
+      parallelize_check            => '1',
+      obsess_over_service          => '1',
+      check_freshness              => '0',
+      notifications_enabled        => '1',
+      event_handler_enabled        => '1',
+      flap_detection_enabled       => '1',
+      failure_prediction_enabled   => '1',
+      process_perf_data            => '1',
+      retain_status_information    => '1',
+      retain_nonstatus_information => '1',
+      notification_interval        => '0',
+      is_volatile                  => '0',
+      check_period                 => '24x7',
+      check_interval               => '5',
+      retry_check_interval         => '1',
+      max_check_attempts           => '4',
+      notification_period          => '24x7',
+      notification_options         => 'w,u,c,r',
+      contact_groups               => 'admins',
+      register                     => '0',
+  }
 }