Merge pull request #782 from juniorsysadmin/cgroup-datatypes

collectd::plugin::cgroups - Add more data types
voxpupuli · Apr 8, 2018 · 6ea8adc · 6ea8adc
2 parents cb7bbd6 + da51e75
commit 6ea8adc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/manifests/plugin/cgroups.pp b/manifests/plugin/cgroups.pp
@@ -1,15 +1,13 @@
 # https://collectd.org/wiki/index.php/Plugin:cgroups
 class collectd::plugin::cgroups (
-  Optional[Array] $cgroups = undef,
-  $ensure                  = 'present',
-  Boolean $ignore_selected = false,
-  $interval                = undef,
+  Array $cgroups                    = [],
+  Enum['present', 'absent'] $ensure = 'present',
+  Boolean $ignore_selected          = false,
+  Optional[Integer[1]] $interval    = undef,
 ) {
 
   include ::collectd
 
-  $cgroups_real = pick($cgroups, [])
-
   collectd::plugin { 'cgroups':
     ensure   => $ensure,
     content  => template('collectd/plugin/cgroups.conf.erb'),

diff --git a/spec/classes/collectd_plugin_cgroups_spec.rb b/spec/classes/collectd_plugin_cgroups_spec.rb
@@ -7,6 +7,10 @@
         facts
       end
 
+      let :pre_condition do
+        'include collectd'
+      end
+
       options = os_specific_options(facts)
 
       context ':ensure => present, default params' do

diff --git a/templates/plugin/cgroups.conf.erb b/templates/plugin/cgroups.conf.erb
@@ -1,5 +1,5 @@
 <Plugin cgroups>
-<% @cgroups_real.each do |cgroup| -%>
+<% @cgroups.each do |cgroup| -%>
   CGroup "<%= cgroup %>"
 <% end -%>
   IgnoreSelected <%= @ignore_selected %>