Fix rubocop and spec errors

This commit fixes some spec and rubocop errors due to a rebase with the
main branch.

Author: Jarret Lavallee

files/psql_metrics

@@ -514,7 +514,7 @@ EOS
                    ['--output_dir DIR',
                     'Write metrics to a timestamped file under DIR instead of',
                     'printing to STDOUT'],
-                  ['-p', '--[no-]print', 'Always print to STDOUT']].freeze
+                   ['-p', '--[no-]print', 'Always print to STDOUT']].freeze
 
       def initialize(argv = [])
         @action = :collect_data

files/system_metrics

@@ -399,9 +399,7 @@ module SystemMetrics
 
       metrics_json = metrics_to_json(metrics_data)
 
-      if @print_output != false then
-        STDOUT.puts(metrics_json)
-      end
+      STDOUT.puts(metrics_json) if @print_output
       write_metrics_to_file(metrics_json)
     end
   end
@@ -437,7 +435,7 @@ if $PROGRAM_NAME == __FILE__
   options = {}
 
   OptionParser.new { |opts|
-    opts.banner = "Usage: system_metrics [options]"
+    opts.banner = 'Usage: system_metrics [options]'
 
     opts.on('-h', '--help', 'Display the help text') do
       puts DESCRIPTION
@@ -466,7 +464,7 @@ if $PROGRAM_NAME == __FILE__
             'The puppet_metrics_collector output directory') do |metrics_dir|
       options[:metrics_dir] = metrics_dir
     end
-    opts.on("-v", "--verbose", String, "Enable Verbose output") { options[:verbose] = true }
+    opts.on('-v', '--verbose', String, 'Enable Verbose output') { options[:verbose] = true }
     opts.on('--[no-]print', 'Print to STDOUT') { |p| options[:print] = p }
   }.parse!
 

manifests/service/bolt.pp

@@ -13,21 +13,6 @@
   Optional[Integer]       $metrics_server_port      = $puppet_metrics_collector::metrics_server_port,
   Optional[String]        $metrics_server_db_name   = $puppet_metrics_collector::metrics_server_db_name,
   ) {
-<<<<<<< HEAD
-  puppet_metrics_collector::pe_metric { 'bolt' :
-    metric_ensure           => $metrics_ensure,
-    cron_minute             => "0/${collection_frequency}",
-    retention_days          => $retention_days,
-    hosts                   => $hosts,
-    metrics_port            => $port,
-    additional_metrics      => $extra_metrics,
-    metric_script_file      => 'puma_metrics',
-    metrics_server_type     => $metrics_server_type,
-    metrics_server_hostname => $metrics_server_hostname,
-    metrics_server_port     => $metrics_server_port,
-    metrics_server_db_name  => $metrics_server_db_name,
-    excludes                => $excludes,
-=======
   puppet_metrics_collector::pe_metric { 'bolt' :
     metric_ensure            => $metrics_ensure,
     cron_minute              => "0/${collection_frequency}",
@@ -42,6 +27,5 @@
     metrics_server_port      => $metrics_server_port,
     metrics_server_db_name   => $metrics_server_db_name,
     excludes                 => $excludes,
->>>>>>> 67e0950 ((SUP-1969) Reconcile pe_metric parameter differences)
   }
 }

spec/classes/puppet_metrics_collector_system_spec.rb

@@ -80,14 +80,16 @@
   end
 
   context 'when metrics shipping is enabled' do
-    let(:params) { {
-      metrics_server_type: "influxdb",
-      metrics_server_db_name: "puppet_metrics",
-      metrics_server_hostname: "influxdb.example"
+    let(:params) do
+      {
+        metrics_server_type: 'influxdb',
+        metrics_server_db_name: 'puppet_metrics',
+        metrics_server_hostname: 'influxdb.example'
       }
-    }
+    end
+    let(:facts) { { puppet_metrics_collector: { have_sysstat: true, have_systemd: true } } }
 
-    it { is_expected.to contain_cron('system_cpu_metrics_collection').with_command(/--influx-db\s+puppet_metrics/) }
+    it { is_expected.to contain_puppet_metrics_collector__collect('system_cpu').with_metrics_command(%r{--influx-db\s+puppet_metrics}) }
   end
 
   context 'when metrics shipping is enabled in puppet_metrics_collector' do
@@ -96,21 +98,24 @@
       class {'puppet_metrics_collector':
         metrics_server_type => "influxdb",
         metrics_server_db_name => "puppet_metrics",
-        metrics_server_hostname => "influxdb.example"
+        metrics_server_hostname => "influxdb.example",
       }
       PRE_COND
     end
+    let(:facts) { { puppet_metrics_collector: { have_sysstat: true, have_systemd: true } } }
 
-    it { is_expected.to contain_cron('system_cpu_metrics_collection').with_command(/--influx-db\s+puppet_metrics/) }
+    it { is_expected.to contain_puppet_metrics_collector__collect('system_cpu').with_metrics_command(%r{--influx-db\s+puppet_metrics}) }
   end
 
   context 'when metrics shipping is not enabled' do
-    let(:params) { {
-      metrics_server_db_name: "puppet_metrics",
-      metrics_server_hostname: "influxdb.example"
+    let(:params) do
+      {
+        metrics_server_db_name: 'puppet_metrics',
+        metrics_server_hostname: 'influxdb.example'
       }
-    }
+    end
+    let(:facts) { { puppet_metrics_collector: { have_sysstat: true, have_systemd: true } } }
 
-    it { is_expected.not_to contain_cron('system_cpu_metrics_collection').with_command(/--influx-db\s+puppet_metrics/) }
+    it { is_expected.not_to contain_puppet_metrics_collector__collect('system_cpu').with_metrics_command(%r{--influx-db\s+puppet_metrics}) }
   end
 end

spec/functions/generate_metrics_server_command_spec.rb

@@ -1,49 +1,51 @@
 require 'spec_helper'
 
 describe 'puppet_metrics_collector::generate_metrics_server_command' do
-  context "when the metrics parameters are undef" do
+  context 'when the metrics parameters are undef' do
     it { is_expected.to run.with_params('scripts_dir').and_return('') }
   end
 
-  context "when the metrics type is influxdb" do
-
-    context "without the port" do
+  context 'when the metrics type is influxdb' do
+    context 'without the port' do
       it {
         is_expected.to run.with_params(
           'scripts_dir',
           'influxdb',
           'metrics_server_hostname',
-          'metrics_server_db_name'
+          'metrics_server_db_name',
         ).and_return(
-          "--print | scripts_dir/json2timeseriesdb --netcat metrics_server_hostname --convert-to influxdb --influx-db metrics_server_db_name -"
-        ) 
+          '--print | scripts_dir/json2timeseriesdb --netcat metrics_server_hostname --convert-to influxdb --influx-db metrics_server_db_name -',
+        )
       }
     end
 
-    context "with the port" do
+    context 'with the port' do
       it {
         is_expected.to run.with_params(
           'scripts_dir',
           'influxdb',
           'metrics_server_hostname',
           'metrics_server_db_name',
-          8080
+          8080,
         ).and_return(
-          "--print | scripts_dir/json2timeseriesdb --netcat metrics_server_hostname --convert-to influxdb --influx-db metrics_server_db_name --port 8080 -"
+          '--print | scripts_dir/json2timeseriesdb --netcat metrics_server_hostname --convert-to influxdb --influx-db metrics_server_db_name --port 8080 -',
         )
       }
     end
 
-    context "without the database name" do
+    context 'without the database name' do
       it { is_expected.to run.with_params('scripts_dir', 'influxdb').and_raise_error(Puppet::ParseError) }
     end
   end
 
-  context "when metrics type is graphite" do
-    it { is_expected.to run.with_params('scripts_dir', 'graphite', 'metrics_server_hostname').and_return('--print | scripts_dir/json2timeseriesdb --netcat metrics_server_hostname --convert-to graphite -') }
+  context 'when metrics type is graphite' do
+    it {
+      is_expected.to run.with_params('scripts_dir', 'graphite',
+'metrics_server_hostname').and_return('--print | scripts_dir/json2timeseriesdb --netcat metrics_server_hostname --convert-to graphite -')
+    }
   end
 
-  context "when metrics type is splunk_hec" do
+  context 'when metrics type is splunk_hec' do
     it { is_expected.to run.with_params('scripts_dir', 'splunk_hec').and_return('--print | /opt/puppetlabs/bin/puppet splunk_hec --sourcetype puppet:metrics --pe_metrics') }
   end
 end