Merge pull request #776 from juniorsysadmin/datatype-oracle

collectd::plugin::oracle - Use data types
voxpupuli · Apr 4, 2018 · add56c9 · add56c9
2 parents 3e19fed + 4aead24
commit add56c9
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 9 deletions.
diff --git a/manifests/plugin/oracle.pp b/manifests/plugin/oracle.pp
@@ -1,13 +1,14 @@
 # Oracle plugin
 # https://collectd.org/wiki/index.php/Plugin:Oracle
 class collectd::plugin::oracle (
-  $ensure           = 'present',
-  $manage_package   = undef,
-  $interval         = undef,
+  Enum['present', 'absent'] $ensure = 'present',
+  Boolean $manage_package           = false,
+  Optional[Integer[1]] $interval    = undef,
 ) {
+
   include ::collectd
 
-  $config_file = "${collectd::plugin_conf_dir}/15-oracle.conf"
+  $conf_dir = $collectd::plugin_conf_dir
 
   if $manage_package {
     package { 'collectd-oracle':
@@ -20,7 +21,7 @@
     interval => $interval,
   }
 
-  concat { $config_file:
+  concat { "${conf_dir}/15-oracle.conf":
     ensure         => $ensure,
     mode           => $collectd::config_mode,
     owner          => $collectd::config_owner,
@@ -33,10 +34,13 @@
     'collectd_plugin_oracle_conf_header':
       order   => '00',
       content => '<Plugin oracle>',
-      target  => $config_file;
+      target  => "${conf_dir}/15-oracle.conf",
+  }
+
+  concat::fragment {
     'collectd_plugin_oracle_conf_footer':
       order   => '99',
       content => '</Plugin>',
-      target  => $config_file;
+      target  => "${conf_dir}/15-oracle.conf",
   }
 }
diff --git a/manifests/plugin/oracle/database.pp b/manifests/plugin/oracle/database.pp
@@ -10,9 +10,11 @@
   include ::collectd
   include ::collectd::plugin::oracle
 
+  $conf_dir = $collectd::plugin_conf_dir
+
   concat::fragment { "collectd_plugin_oracle_database_${name}":
     order   => '20',
     content => template('collectd/plugin/oracle/database.conf.erb'),
-    target  => $collectd::plugin::oracle::config_file,
+    target  => "${conf_dir}/15-oracle.conf",
   }
 }
diff --git a/manifests/plugin/oracle/query.pp b/manifests/plugin/oracle/query.pp
@@ -8,9 +8,11 @@
   include ::collectd
   include ::collectd::plugin::oracle
 
+  $conf_dir = $collectd::plugin_conf_dir
+
   concat::fragment { "collectd_plugin_oracle_query_${name}":
     order   => '10',
     content => template('collectd/plugin/oracle/query.conf.erb'),
-    target  => $collectd::plugin::oracle::config_file,
+    target  => "${conf_dir}/15-oracle.conf",
   }
 }