Merge pull request #8 from himpich/master

Support hiera_hash for custom checks

README.md

@@ -30,6 +30,10 @@ In addition to Monit configuration options, this class accepts other parameters:
 
  * `checks`, useful to pass in Monit checks declared in Hiera.
 
+If your hiera setup supports a hierarchy structure, you can set
+'monit::hiera_merge_strategy' to 'hiera_hash' in order use the hiera_hash function for
+config merging.
+
 Lastly, this class also configures a `system` check with sane defaults. It can
 be disabled or tweaked to fit your needs. This check includes loadavg, cpu,
 memory, swap and filesytem tests.

manifests/config.pp

@@ -80,8 +80,13 @@
   }
 
   # Additional checks.
-  validate_hash($monit::checks)
-  create_resources('monit::check', $monit::checks)
-
+  if ($monit::hiera_merge_strategy == 'hiera_hash') {
+    $mychecks = hiera_hash('monit::checks', {})
+  }
+  else {
+    $mychecks = $monit::checks
+  }
+  validate_hash($mychecks)
+  create_resources('monit::check', $mychecks)
 }
 

manifests/init.pp

@@ -60,6 +60,8 @@
   $system_fs_inode_usage   = '80%',
   # Additional checks.
   $checks                  = {},
+  # set to hiera_hash in order to merge your hierarchy
+  $hiera_merge_strategy    = undef,
 ) inherits monit::params {
 
   class{'monit::install': } ->