plugin: update cpu for collectd 5.8

manifests/plugin/cpu.pp

@@ -5,14 +5,16 @@
   Boolean $reportbycpu              = true,
   Boolean $valuespercentage         = false,
   Boolean $reportnumcpu             = false,
+  Boolean $reportgueststate         = false,
+  Boolean $subtractgueststate       = true,
   Optional[Integer[1]] $interval    = undef,
 ) {
 
   include ::collectd
 
   collectd::plugin { 'cpu':
     ensure   => $ensure,
-    content  => template('collectd/plugin/cpu.conf.erb'),
+    content  => epp('collectd/plugin/cpu.conf.epp'),
     interval => $interval,
   }
 }

spec/classes/collectd_plugin_cpu_spec.rb

@@ -33,6 +33,13 @@
           it "Will not include ValuesPercentage in #{options[:plugin_conf_dir]}d/10-cpu.conf" do
             is_expected.not_to contain_file('cpu.load').with_content(%r{ValuesPercentage})
           end
+
+          it "Will not include ReportGuestState in #{options[:plugin_conf_dir]}d/10-cpu.conf" do
+            is_expected.not_to contain_file('cpu.load').with_content(%r{ReportGuestState})
+          end
+          it "Will not include SubtractGuestState in #{options[:plugin_conf_dir]}d/10-cpu.conf" do
+            is_expected.not_to contain_file('cpu.load').with_content(%r{SubtractGuestState})
+          end
         end
 
         context 'cpu options should be set with collectd 5.5' do
@@ -58,6 +65,13 @@
           it "Will include ValuesPercentage in #{options[:plugin_conf_dir]}/10-cpu.conf" do
             is_expected.to contain_file('cpu.load').with_content(%r{ValuesPercentage true})
           end
+
+          it "Will not include ReportGuestState in #{options[:plugin_conf_dir]}d/10-cpu.conf" do
+            is_expected.not_to contain_file('cpu.load').with_content(%r{ReportGuestState})
+          end
+          it "Will not include SubtractGuestState in #{options[:plugin_conf_dir]}d/10-cpu.conf" do
+            is_expected.not_to contain_file('cpu.load').with_content(%r{SubtractGuestState})
+          end
         end
 
         context 'cpu options should be set with collectd 5.6' do
@@ -73,6 +87,32 @@
           it "Will include ValuesPercentage in #{options[:plugin_conf_dir]}/10-cpu.conf" do
             is_expected.to contain_file('cpu.load').with_content(%r{ReportNumCpu true})
           end
+
+          it "Will not include ReportGuestState in #{options[:plugin_conf_dir]}d/10-cpu.conf" do
+            is_expected.not_to contain_file('cpu.load').with_content(%r{ReportGuestState})
+          end
+          it "Will not include SubtractGuestState in #{options[:plugin_conf_dir]}d/10-cpu.conf" do
+            is_expected.not_to contain_file('cpu.load').with_content(%r{SubtractGuestState})
+          end
+        end
+
+        context 'cpu options should be set with collectd 5.8' do
+          let :facts do
+            facts.merge(collectd_version: '5.8')
+          end
+          let :params do
+            {
+              reportgueststate: true,
+              subtractgueststate: false
+            }
+          end
+
+          it "Will include ReportGuestState in #{options[:plugin_conf_dir]}d/10-cpu.conf" do
+            is_expected.to contain_file('cpu.load').with_content(%r{ReportGuestState true})
+          end
+          it "Will include SubtractGuestState in #{options[:plugin_conf_dir]}d/10-cpu.conf" do
+            is_expected.to contain_file('cpu.load').with_content(%r{SubtractGuestState false})
+          end
         end
       end
 

templates/plugin/cpu.conf.epp

@@ -0,0 +1,14 @@
+<% if versioncmp($::collectd::collectd_version_real, '5.5') >= 0 { -%>
+<Plugin cpu>
+  ReportByState <%= $::collectd::plugin::cpu::reportbystate %>
+  ReportByCpu <%= $::collectd::plugin::cpu::reportbycpu %>
+  ValuesPercentage <%= $::collectd::plugin::cpu::valuespercentage %>
+<% if versioncmp($::collectd::collectd_version_real, '5.6') >= 0 { -%>
+  ReportNumCpu <%= $::collectd::plugin::cpu::reportnumcpu %>
+<% } -%>
+<% if versioncmp($::collectd::collectd_version_real, '5.8') >= 0 { -%>
+  ReportGuestState <%= $::collectd::plugin::cpu::reportgueststate %>
+  SubtractGuestState <%= $::collectd::plugin::cpu::subtractgueststate %>
+<% } -%>
+</Plugin>
+<% } -%>