Merge pull request redhat-openstack#297 from ChrisHeerschap/master

adding ValuesAbsolute and ValuesPercentage to memory and swap

manifests/plugin/memory.pp

@@ -1,10 +1,19 @@
 # https://collectd.org/wiki/index.php/Plugin:Memory
 class collectd::plugin::memory (
-  $ensure   = present,
-  $interval = undef,
+  $ensure           = present,
+  $valuesabsolute   = true,
+  $valuespercentage = false,
+  $interval         = undef,
 ) {
+
+  validate_bool(
+    $valuesabsolute,
+    $valuespercentage,
+  )
+
   collectd::plugin {'memory':
     ensure   => $ensure,
+    content  => template('collectd/plugin/memory.conf.erb'),
     interval => $interval,
   }
 }

manifests/plugin/swap.pp

@@ -1,13 +1,17 @@
 # https://collectd.org/wiki/index.php/Plugin:Swap
 class collectd::plugin::swap (
-  $ensure         = present,
-  $interval       = undef,
-  $reportbydevice = false,
-  $reportbytes    = true,
+  $ensure           = present,
+  $interval         = undef,
+  $reportbydevice   = false,
+  $reportbytes      = true,
+  $valuesabsolute   = true,
+  $valuespercentage = false,
 ) {
   validate_bool(
     $reportbydevice,
-    $reportbytes
+    $reportbytes,
+    $valuesabsolute,
+    $valuespercentage
   )
 
   collectd::plugin {'swap':

spec/classes/collectd_plugin_memory_spec.rb

@@ -0,0 +1,70 @@
+require 'spec_helper'
+
+describe 'collectd::plugin::memory', :type => :class do
+
+  context ':ensure => present, default params' do
+    let :facts do
+      {:osfamily => 'RedHat'}
+    end
+    it 'Will create /etc/collectd.d/10-memory.conf' do
+      should contain_file('memory.load').with({
+        :ensure  => 'present',
+        :path    => '/etc/collectd.d/10-memory.conf',
+        :content => /LoadPlugin memory/,
+      })
+    end
+  end
+
+  context ':ensure => present, specific params, collectd version 5.4.2' do
+    let :facts do
+      { :osfamily         => 'Redhat',
+        :collectd_version => '5.4.2'
+      }
+    end
+
+    it 'Will create /etc/collectd.d/10-memory.conf for collectd < 5.5' do
+      should contain_file('memory.load').with({
+        :ensure  => 'present',
+        :path    => '/etc/collectd.d/10-memory.conf',
+        :content => /LoadPlugin memory/,
+      })
+    end
+
+    it 'Will not include ValuesPercentage in /etc/collectd.d/10-memory.conf' do
+      should_not contain_file('memory.load').with_content(/ValuesPercentage/)
+    end
+  end
+
+  context ':ensure => present, specific params, collectd version 5.5.0' do
+    let :facts do
+      { :osfamily         => 'Redhat',
+        :collectd_version => '5.5.0'
+      }
+    end
+
+    it 'Will create /etc/collectd.d/10-memory.conf for collectd >= 5.5' do
+      should contain_file('memory.load').with({
+        :ensure  => 'present',
+        :path    => '/etc/collectd.d/10-memory.conf',
+        :content => "# Generated by Puppet\n<LoadPlugin memory>\n  Globals false\n</LoadPlugin>\n\n<Plugin memory>\n  ValuesAbsolute = true\n  ValuesPercentage = false\n</Plugin>\n\n",
+      })
+    end
+  end
+
+  context ':ensure => absent' do
+    let :facts do
+      {:osfamily => 'RedHat'}
+    end
+    let :params do
+      {:ensure => 'absent'}
+    end
+
+    it 'Will not create /etc/collectd.d/10-memory.conf' do
+      should contain_file('memory.load').with({
+        :ensure => 'absent',
+        :path   => '/etc/collectd.d/10-memory.conf',
+      })
+    end
+  end
+end
+

spec/classes/collectd_plugin_swap_spec.rb

@@ -47,6 +47,22 @@
     end
   end
 
+  context ':ensure => present, specific params, collectd version 5.5.0' do
+    let :facts do
+      { :osfamily         => 'Redhat',
+        :collectd_version => '5.5.0'
+      }
+    end
+
+    it 'Will create /etc/collectd.d/10-swap.conf for collectd >= 5.5' do
+      should contain_file('swap.load').with({
+        :ensure  => 'present',
+        :path    => '/etc/collectd.d/10-swap.conf',
+        :content => "# Generated by Puppet\n<LoadPlugin swap>\n  Globals false\n</LoadPlugin>\n\n<Plugin swap>\n  ReportByDevice false\n  ReportBytes true\n  ValuesAbsolute = true\n  ValuesPercentage = false\n</Plugin>\n\n",
+      })
+    end
+  end
+
   context ':ensure => absent' do
     let :facts do
       {:osfamily => 'RedHat'}

templates/plugin/memory.conf.erb

@@ -0,0 +1,6 @@
+<% if @collectd_version and (scope.function_versioncmp([@collectd_version, '5.5']) >= 0) -%>
+<Plugin memory>
+  ValuesAbsolute = <%= @valuesabsolute %>
+  ValuesPercentage = <%= @valuespercentage %>
+</Plugin>
+<% end -%>

templates/plugin/swap.conf.erb

@@ -3,4 +3,8 @@
 <% if @collectd_version and scope.function_versioncmp([@collectd_version, '5.2']) > 0 -%>
   ReportBytes <%= @reportbytes %>
 <% end -%>
+<% if @collectd_version and scope.function_versioncmp([@collectd_version, '5.5']) > 0 -%>
+  ValuesAbsolute = <%= @valuesabsolute %>
+  ValuesPercentage = <%= @valuespercentage %>
+<% end -%>
 </Plugin>