Merge pull request #721 from juniorsysadmin/filter-match-data-types

plugin::filter::match - Use data types
voxpupuli · Nov 12, 2017 · 377bad0 · 377bad0
2 parents 5d0e70d + f11ddcf
commit 377bad0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/manifests/plugin/filter/match.pp b/manifests/plugin/filter/match.pp
@@ -1,18 +1,14 @@
 # https://collectd.org/wiki/index.php/Chains
 define collectd::plugin::filter::match (
-  $chain,
-  $rule,
-  $plugin,
-  $options = undef,
+  String $chain,
+  String $rule,
+  Collectd::Filter::Match $plugin,
+  Optional[Hash] $options = undef,
 ) {
 
   include ::collectd
   include ::collectd::plugin::filter
 
-  unless $plugin in $collectd::plugin::filter::plugin_matches {
-    fail("Unknown match plugin '${plugin}' provided")
-  }
-
   ensure_resource('collectd::plugin', "match_${plugin}", { 'order' => '02'} )
 
   $fragment_order = "10_${rule}_1_${title}"

diff --git a/types/filter/match.pp b/types/filter/match.pp
@@ -0,0 +1,2 @@
+# https://collectd.org/wiki/index.php/Table_of_Matches
+type Collectd::Filter::Match = Enum['empty_counter', 'hashed', 'regex', 'timediff', 'value']
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# https://collectd.org/wiki/index.php/Table_of_Matches
		type Collectd::Filter::Match = Enum['empty_counter', 'hashed', 'regex', 'timediff', 'value']