Merge pull request redhat-openstack#200 from txaj/loadplugin-options2

Uses the LoadPlugin syntax with bracket when supported

Author: blkperl

manifests/plugin.pp

@@ -1,9 +1,11 @@
 #
 define collectd::plugin (
-  $ensure  = 'present',
-  $content = undef,
-  $order   = '10',
-  $plugin  = $name
+  $ensure   = 'present',
+  $content  = undef,
+  $order    = '10',
+  $globals  = false,
+  $interval = undef,
+  $plugin   = $name
 ) {
 
   include collectd::params
@@ -16,7 +18,7 @@
     owner   => root,
     group   => $root_group,
     mode    => '0640',
-    content => "# Generated by Puppet\nLoadPlugin ${plugin}\n\n${content}",
+    content => template('collectd/loadplugin.conf.erb'),
     notify  => Service['collectd'],
   }
 

manifests/plugin/perl.pp

@@ -9,6 +9,7 @@
 
   collectd::plugin { 'perl':
     ensure  => $ensure,
+    globals => true,
     order   => $order,
     content => template('collectd/plugin/perl.conf.erb')
   }

spec/classes/collectd_plugin_swap_spec.rb

@@ -26,7 +26,7 @@
       should contain_file('swap.load').with({
         :ensure  => 'present',
         :path    => '/etc/collectd.d/10-swap.conf',
-        :content => "# Generated by Puppet\nLoadPlugin swap\n\n<Plugin swap>\n  ReportByDevice false\n</Plugin>\n",
+        :content => "# Generated by Puppet\n<LoadPlugin swap>\n  Globals false\n</LoadPlugin>\n\n<Plugin swap>\n  ReportByDevice false\n</Plugin>\n\n",
       })
     end
   end
@@ -42,7 +42,7 @@
       should contain_file('swap.load').with({
         :ensure  => 'present',
         :path    => '/etc/collectd.d/10-swap.conf',
-        :content => "# Generated by Puppet\nLoadPlugin swap\n\n<Plugin swap>\n  ReportByDevice false\n  ReportBytes true\n</Plugin>\n",
+        :content => "# Generated by Puppet\n<LoadPlugin swap>\n  Globals false\n</LoadPlugin>\n\n<Plugin swap>\n  ReportByDevice false\n  ReportBytes true\n</Plugin>\n\n",
       })
     end
   end

spec/defines/collectd_plugin_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe 'collectd::plugin', :type => :define do
+
+  context 'loading a plugin on collectd <= 4.9.4' do
+    let(:title) { 'test' }
+    let :facts do
+      {
+          :collectd_version => '5.3',
+          :osfamily         => 'Debian',
+      }
+    end
+
+    it 'Will create /etc/collectd/conf.d/10-test.conf with the LoadPlugin syntax with brackets' do
+      should contain_file('test.load').with_content(/<LoadPlugin/)
+    end
+  end
+
+
+  context 'loading a plugin on collectd => 4.9.3' do
+    let(:title) { 'test' }
+    let :facts do
+      {
+          :collectd_version => '4.9.3',
+          :osfamily         => 'Debian',
+      }
+    end
+
+    it 'Will create /etc/collectd/conf.d/10-test.conf with the LoadPlugin syntax without brackets' do
+      should contain_file('test.load').without_content(/<LoadPlugin/)
+    end
+  end
+
+end

templates/loadplugin.conf.erb

@@ -0,0 +1,13 @@
+# Generated by Puppet
+<% if @collectd_version and (scope.function_versioncmp([@collectd_version, '4.9.4']) >= 0) -%>
+<LoadPlugin <%= @plugin %>>
+  Globals <%= @globals %>
+<% if @interval and @collectd_version and (scope.function_versioncmp([@collectd_version, '5.2']) >= 0) -%>
+  Interval <%= @interval %>
+<% end -%>
+</LoadPlugin>
+<% else -%>
+LoadPlugin <%= @plugin %>
+<% end -%>
+
+<%= @content %>

templates/plugin/perl.conf.erb

@@ -1,7 +1,2 @@
-#
-<LoadPlugin perl>
-  Globals true
-</LoadPlugin>
-
 Include "<%= @conf_dir %>/perl/*.conf"