foreman_maintain 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '078ab0c0f9b3bfe3b4a6a798aaa181bb0ecba87e'
-  data.tar.gz: 898a5faf68654553aafaa03c8afe026e33ddc8e2
+  metadata.gz: '0308a81ffbe17ee43deef021d8a3c43864fb886c'
+  data.tar.gz: 6c9b6d939187e1461b991760d507364500046da1
 SHA512:
-  metadata.gz: c512de5ef767ec004443beb7f32386ea113899b626ebe195ac69aeba6d2ec21cb66fcb4d93b8423fbbb8e3ee56bf54f95d11d59bc6fc892fa412b28b532f9e3b
-  data.tar.gz: 3be8f1aad6584b3565841633d3b6f6ef99c2fbf7eb7b986e34e58b7dce60fd775bde2a3dbed6ce3a11cbddaff0490ae82d31f126ae92cfa36f40807b77836491
+  metadata.gz: 7c75df5e43ecd4f33e2be2bc8b09a809c2931bf7d71657df4964f2d6ffe1ee6c5eb184800f9aa864f3effb524f3ca353dc974323f621c1c1112bd4b174e4697a
+  data.tar.gz: 99795da6683e38730a50c1ba4a286473bd2af075da7ee33a12f4ad045c68d5bc11cbac74fde3056604d3df373a73007e43f20593cfc3911c70f939cc8ea707b3

data/README.md

@@ -257,11 +257,11 @@ end
 class Checks::DiskIO < ForemanMaintain::Check
   metadata do
     description 'check foreman service is running'
-    preparation_steps { Procedures::InstallPackage.new(:packages => %w[hdparm]) }
+    preparation_steps { Procedures::InstallPackage.new(:packages => %w[fio]) }
   end
 
   def run
-    execute!('hdparam ...')
+    execute!('fio ...')
   end
 end
 ```

data/definitions/checks/disk/performance.rb

@@ -5,7 +5,7 @@ module Checks
         label :disk_performance
         description 'Check for recommended disk speed of pulp, mongodb, pgsql dir.'
         tags :pre_upgrade
-        preparation_steps { Procedures::Packages::Install.new(:packages => %w[hdparm fio]) }
+        preparation_steps { Procedures::Packages::Install.new(:packages => %w[fio]) }
 
         confine do
           feature(:pulp)

data/definitions/checks/foreman_openscap/invalid_report_associations.rb

@@ -0,0 +1,27 @@
+module Checks
+  module ForemanOpenscap
+    class InvalidReportAssociations < ForemanMaintain::Check
+      metadata do
+        label :openscap_report_associations
+        for_feature :foreman_openscap
+        description 'Check whether reports have correct associations'
+        tags :pre_upgrade, :foreman_openscap, :openscap_report_associations
+      end
+
+      def run
+        ids_to_remove = to_remove
+        assert(ids_to_remove.empty?,
+               "There are #{ids_to_remove.count} reports with issues that will be removed",
+               :next_steps => Procedures::ForemanOpenscap::InvalidReportAssociations.new(
+                 :ids_to_remove => ids_to_remove
+               ))
+      end
+
+      def to_remove
+        (feature(:foreman_openscap).report_ids_without_policy +
+         feature(:foreman_openscap).report_ids_without_proxy +
+         feature(:foreman_openscap).report_ids_without_host).uniq
+      end
+    end
+  end
+end

data/definitions/checks/foreman_proxy/verify_dhcp_config_syntax.rb

@@ -1,17 +1,24 @@
 module Checks::ForemanProxy
   class VerifyDhcpConfigSyntax < ForemanMaintain::Check
     metadata do
-      for_feature :foreman_proxy
       description 'Check for verifying syntax for ISP DHCP configurations'
       tags :default
       confine do
-        file_exists?('/etc/dhcp/dhcpd.conf')
+        feature(:foreman_proxy)
       end
     end
 
     def run
-      success = feature(:foreman_proxy).valid_dhcp_configs?
-      assert(success, 'Please check and verify DHCP configurations.')
+      if feature(:foreman_proxy).features.include?('dhcp')
+        if feature(:foreman_proxy).dhcpd_conf_exist?
+          success = feature(:foreman_proxy).valid_dhcp_configs?
+          assert(success, 'Please check and verify DHCP configurations.')
+        else
+          fail! "Couldn't find configuration file at #{feature(:foreman_proxy).dhcpd_config_file}"
+        end
+      else
+        skip 'DHCP feature is not enabled'
+      end
     end
   end
 end

data/definitions/checks/puppet/provide_upgrade_guide.rb

@@ -0,0 +1,35 @@
+module Checks::Puppet
+  class ProvideUpgradeGuide < ForemanMaintain::Check
+    metadata do
+      description 'Verify puppet and provide upgrade guide for it'
+      tags :puppet_upgrade_guide
+      confine do
+        feature(:downstream) &&
+          feature(:downstream).current_minor_version == '6.3' &&
+          find_package('puppet')
+      end
+      manual_detection
+    end
+
+    def run
+      with_spinner('Verifying puppet version before upgrade') do |spinner|
+        puppet_package = find_package('puppet')
+        spinner.update "current puppet version: #{puppet_package}"
+        curr_sat_version = feature(:downstream).current_minor_version
+        assert(
+          (puppet_package !~ /puppet-3/),
+          'Before continuing with upgrade, please make sure you finish puppet upgrade.',
+          :next_steps => [
+            Procedures::KnowledgeBaseArticle.new(:doc => doc_ids_by_sat_versions[curr_sat_version])
+          ]
+        )
+      end
+    end
+
+    private
+
+    def doc_ids_by_sat_versions
+      { '6.3' => 'upgrade_puppet_guide_for_sat63' }
+    end
+  end
+end

data/definitions/checks/repositories/validate.rb

@@ -2,6 +2,9 @@ module Checks::Repositories
   class Validate < ForemanMaintain::Check
     metadata do
       description 'Validate availability of repositories'
+      preparation_steps do
+        Procedures::Packages::Install.new(:packages => [ForemanMaintain::Utils::Facter.package])
+      end
 
       confine do
         feature(:downstream)

data/definitions/features/downstream.rb

@@ -54,23 +54,40 @@ class Features::Downstream < ForemanMaintain::Feature
 
   def rh_repos(sat_version)
     sat_version = version(sat_version)
-    rh_version_major = execute!('facter operatingsystemmajrelease')
-    sat_version_full = "#{sat_version.major}.#{sat_version.minor}"
+    rh_version_major = ForemanMaintain::Utils::Facter.os_major_release
+
+    rh_repos = main_rh_repos(rh_version_major)
+
+    rh_repos.concat(sat_and_tools_repos(rh_version_major, sat_version))
+
+    rh_repos << 'rhel-7-server-ansible-2-rpms' if sat_version.to_s == '6.4'
+
+    if current_minor_version == '6.3' && sat_version.to_s != '6.4' && (
+      feature(:puppet_server) && feature(:puppet_server).puppet_version.major == 4)
+      rh_repos << "rhel-#{rh_version_major}-server-satellite-tools-6.3-puppet4-rpms"
+    end
+
+    rh_repos
+  end
 
+  def sat_and_tools_repos(rh_version_major, sat_version)
+    sat_version_full = "#{sat_version.major}.#{sat_version.minor}"
     sat_repo_id = "rhel-#{rh_version_major}-server-satellite-#{sat_version_full}-rpms"
     sat_tools_repo_id = "rhel-#{rh_version_major}-server-satellite-tools-#{sat_version_full}-rpms"
-    # Override to use Beta repositories for 6.4 until GA
+
+    # Override to use Beta repositories for sat version until GA
     if sat_version.to_s == '6.4'
       sat_repo_id = "rhel-server-#{rh_version_major}-satellite-6-beta-rpms"
+      sat_tools_repo_id = "rhel-#{rh_version_major}-server-satellite-tools-6-beta-rpms"
     end
 
-    rh_repos = ["rhel-#{rh_version_major}-server-rpms",
-                "rhel-server-rhscl-#{rh_version_major}-rpms",
-                "rhel-#{rh_version_major}-server-satellite-maintenance-6-rpms",
-                sat_tools_repo_id,
-                sat_repo_id]
-    rh_repos << 'rhel-7-server-ansible-2-rpms' if sat_version.to_s == '6.4'
-    rh_repos
+    [sat_repo_id, sat_tools_repo_id]
+  end
+
+  def main_rh_repos(rh_version_major)
+    ["rhel-#{rh_version_major}-server-rpms",
+     "rhel-server-rhscl-#{rh_version_major}-rpms",
+     "rhel-#{rh_version_major}-server-satellite-maintenance-6-rpms"]
   end
 
   def version_from_source

data/definitions/features/foreman_openscap.rb

@@ -0,0 +1,57 @@
+class Features::ForemanOpenscap < ForemanMaintain::Feature
+  metadata do
+    label :foreman_openscap
+
+    confine do
+      check_min_version('tfm-rubygem-foreman_openscap', '0.5.3')
+    end
+  end
+
+  def report_ids_without_host
+    reports_without_attribute('host_id')
+  end
+
+  def report_ids_without_proxy
+    reports_without_attribute('openscap_proxy_id')
+  end
+
+  def report_ids_without_policy
+    sql = <<-SQL
+      SELECT id
+      FROM reports
+      WHERE id
+        NOT IN (
+          SELECT reports.id
+          FROM reports INNER JOIN foreman_openscap_policy_arf_reports
+                       ON reports.id = foreman_openscap_policy_arf_reports.arf_report_id
+          WHERE reports.type = 'ForemanOpenscap::ArfReport'
+        )
+        AND type = 'ForemanOpenscap::ArfReport'
+    SQL
+    execute_ids_query sql
+  end
+
+  def delete_reports(ids)
+    feature(:foreman_database).psql(<<-SQL)
+      BEGIN;
+        DELETE FROM reports WHERE id IN (#{ids.join(', ')});
+        DELETE FROM foreman_openscap_policy_arf_reports WHERE arf_report_id IN (#{ids.join(', ')});
+      COMMIT;
+    SQL
+  end
+
+  private
+
+  def reports_without_attribute(attr)
+    sql = <<-SQL
+      SELECT id
+      FROM reports
+      WHERE type = 'ForemanOpenscap::ArfReport' AND #{attr} IS NULL
+    SQL
+    execute_ids_query sql
+  end
+
+  def execute_ids_query(sql)
+    feature(:foreman_database).query(sql).map { |item| item['id'].to_i } || []
+  end
+end

data/definitions/features/foreman_proxy.rb

@@ -6,12 +6,11 @@ class Features::ForemanProxy < ForemanMaintain::Feature
     end
   end
 
-  attr_reader :dhcpd_conf_file, :cert_path
+  FOREMAN_PROXY_SETTINGS_PATHS = ['/etc/foreman-proxy/settings.yml',
+                                  '/usr/local/etc/foreman-proxy/settings.yml'].freeze
 
-  def initialize
-    @dhcpd_conf_file = '/etc/dhcp/dhcpd.conf'
-    @cert_path = ForemanMaintain.config.foreman_proxy_cert_path
-  end
+  FOREMAN_PROXY_DHCP_YML_PATHS = ['/etc/foreman-proxy/settings.d/dhcp.yml',
+                                  '/usr/local/etc/foreman-proxy/settings.d/dhcp.yml'].freeze
 
   def valid_dhcp_configs?
     dhcp_req_pass? && !syntax_error_exists?
@@ -21,6 +20,10 @@ class Features::ForemanProxy < ForemanMaintain::Feature
     !!feature(:pulp)
   end
 
+  def dhcpd_conf_exist?
+    file_exists?(dhcpd_config_file)
+  end
+
   def services
     {
       'foreman-proxy'            => 20,
@@ -37,21 +40,28 @@ class Features::ForemanProxy < ForemanMaintain::Feature
     !!feature(:foreman_server)
   end
 
-  def config_files(for_features = ['all'])
-    configs = [
+  def default_config_files
+    [
       '/etc/foreman-proxy',
       '/usr/share/foreman-proxy/.ssh',
       '/var/lib/foreman-proxy/ssh',
       '/etc/smart_proxy_dynflow_core/settings.yml',
-      '/etc/sudoers.d/foreman-proxy'
+      '/etc/sudoers.d/foreman-proxy',
+      settings_file
     ]
+  end
+
+  def config_files(for_features = ['all'])
+    configs = default_config_files
     backup_features = backup_features(for_features)
 
     configs.push(certs_tar) if certs_tar
 
     configs.push('/var/lib/tftpboot') if backup_features.include?('tftp')
     configs += ['/var/named/', '/etc/named*'] if backup_features.include?('dns')
-    configs += ['/var/lib/dhcpd', '/etc/dhcp'] if backup_features.include?('dhcp')
+    if backup_features.include?('dhcp')
+      configs += ['/var/lib/dhcpd', File.dirname(dhcpd_config_file)]
+    end
     configs.push('/usr/share/xml/scap') if backup_features.include?('openscap')
     configs
   end
@@ -71,6 +81,18 @@ class Features::ForemanProxy < ForemanMaintain::Feature
     feature(:installer).answers[content_module]['certs_tar'] if content_module
   end
 
+  def settings_file
+    @settings_file ||= lookup_into(FOREMAN_PROXY_SETTINGS_PATHS)
+  end
+
+  def proxy_settings
+    @proxy_settings ||= load_proxy_settings
+  end
+
+  def dhcpd_config_file
+    @dhcpd_config_file ||= lookup_dhcpd_config_file
+  end
+
   private
 
   def backup_features(for_features)
@@ -82,9 +104,14 @@ class Features::ForemanProxy < ForemanMaintain::Feature
   end
 
   def curl_cmd
-    "curl -w '\n%{http_code}' --silent -ks --cert #{cert_path}/client_cert.pem \
-      --key #{cert_path}/client_key.pem \
-      --cacert #{cert_path}/proxy_ca.pem https://$(hostname):9090"
+    ssl_cert = proxy_settings[:foreman_ssl_cert] || proxy_settings[:ssl_certificate]
+    ssl_key = proxy_settings[:foreman_ssl_key] || proxy_settings[:ssl_private_key]
+    ssl_ca = proxy_settings[:foreman_ssl_ca] || proxy_settings[:ssl_ca_file]
+
+    cmd = "curl -w '\n%{http_code}' -s "
+    cmd += format_shell_args('--cert' => ssl_cert, '--key' => ssl_key, '--cacert' => ssl_ca)
+    cmd += " https://$(hostname):#{proxy_settings[:https_port]}"
+    cmd
   end
 
   def dhcp_curl_cmd
@@ -136,13 +163,52 @@ class Features::ForemanProxy < ForemanMaintain::Feature
   end
 
   def syntax_error_exists?
-    cmd = "dhcpd -t -cf #{dhcpd_conf_file}"
+    cmd = "dhcpd -t -cf #{dhcpd_config_file}"
     output = execute(cmd)
     is_error = output.include?('Configuration file errors encountered')
     if is_error
-      puts "\nFound syntax error in file #{dhcpd_conf_file}:"
+      puts "\nFound syntax error in file #{dhcpd_config_file}:"
       puts output
     end
     is_error
   end
+
+  def load_proxy_settings
+    if settings_file
+      @proxy_settings = yaml_load(settings_file)
+    else
+      raise "Couldn't find settings file at #{FOREMAN_PROXY_SETTINGS_PATHS.join(', ')}"
+    end
+  end
+
+  def lookup_dhcpd_config_file
+    dhcpd_config_file = lookup_using_dhcp_yml
+    raise "Couldn't find DHCP Configuration file" if dhcpd_config_file.nil?
+    dhcpd_config_file
+  end
+
+  def lookup_using_dhcp_yml
+    dhcp_yml_path = lookup_into(FOREMAN_PROXY_DHCP_YML_PATHS)
+    raise "Couldn't find dhcp.yml file under foreman-proxy" unless dhcp_yml_path
+
+    configs_from_dhcp_yml = yaml_load(dhcp_yml_path)
+    if configs_from_dhcp_yml.key?(:dhcp_config)
+      return configs_from_dhcp_yml[:dhcp_config]
+    elsif configs_from_dhcp_yml.key?(:use_provider)
+      settings_d_dir = File.dirname(dhcp_yml_path)
+      dhcp_provider_fpath = File.join(settings_d_dir, "#{configs_from_dhcp_yml[:use_provider]}.yml")
+      dhcp_provider_configs = yaml_load(dhcp_provider_fpath)
+      return dhcp_provider_configs[:config] if dhcp_provider_configs.key?(:config)
+    else
+      raise "Couldn't find DHCP Configurations in #{dhcp_yml_path}"
+    end
+  end
+
+  def yaml_load(path)
+    YAML.load_file(path) || {}
+  end
+
+  def lookup_into(file_paths)
+    file_paths.find { |file_path| file_exists?(file_path) }
+  end
 end

data/definitions/features/puppet_server.rb

@@ -6,11 +6,15 @@ class Features::PuppetServer < ForemanMaintain::Feature
     # is a part of httpd and relies on httpd service to restart, therefore
     # not requiring a separate service to restart
     confine do
-      find_package('puppetserver')
+      find_package('puppetserver') || find_package('puppet')
     end
   end
 
   def services
-    { 'puppetserver' => 30 }
+    find_package('puppetserver') ? { 'puppetserver' => 30 } : {}
+  end
+
+  def puppet_version
+    version(execute!('puppet --version'))
   end
 end

data/definitions/procedures/foreman_openscap/invalid_report_associations.rb

@@ -0,0 +1,15 @@
+module Procedures::ForemanOpenscap
+  class InvalidReportAssociations < ForemanMaintain::Procedure
+    metadata do
+      param :ids_to_remove, 'Ids of reports to remove', :required => true
+      for_feature :foreman_openscap
+      tags :pre_migration, :foreman_openscap, :openscap_report_associations
+      advanced_run false
+      description 'Delete reports with association issues'
+    end
+
+    def run
+      feature(:foreman_openscap).delete_reports(@ids_to_remove)
+    end
+  end
+end

data/definitions/procedures/knowledge_base_article.rb

@@ -23,7 +23,8 @@ class Procedures::KnowledgeBaseArticle < ForemanMaintain::Procedure
 
   def kcs_documents
     {
-      'fix_cpdb_validate_failure' => 'https://access.redhat.com/solutions/3362821'
+      'fix_cpdb_validate_failure' => 'https://access.redhat.com/solutions/3362821',
+      'upgrade_puppet_guide_for_sat63' => 'https://access.redhat.com/documentation/en-us/red_hat_satellite/6.3/html/upgrading_and_updating_red_hat_satellite/upgrading_puppet-1'
     }
   end
 end

data/definitions/procedures/remote_execution/remove_existing_settingsd.rb

@@ -11,7 +11,12 @@ module Procedures::RemoteExecution
 
     def run
       with_spinner("Removing existing #{@dirpath} directory") do |_spinner|
-        execute!("rm -rf #{@dirpath}")
+        if Dir.pwd.strip.eql?(@dirpath)
+          fail! "Failed: You are trying to delete the current directory '#{@dirpath}' "\
+                'which is not possible'
+        else
+          execute!("rm -rf #{@dirpath}")
+        end
       end
     end
   end

data/definitions/procedures/repositories/setup.rb

@@ -2,6 +2,10 @@ module Procedures::Repositories
   class Setup < ForemanMaintain::Procedure
     metadata do
       description 'Setup repositories'
+      preparation_steps do
+        Procedures::Packages::Install.new(:packages => [ForemanMaintain::Utils::Facter.package])
+      end
+
       confine do
         feature(:downstream) || feature(:upstream)
       end

data/definitions/scenarios/upgrade_to_satellite_6_4.rb

@@ -22,6 +22,7 @@ module Scenarios::Satellite_6_4
       add_steps(find_checks(:default))
       add_steps(find_checks(:pre_upgrade))
       add_step(Checks::Repositories::Validate.new(:version => '6.4'))
+      add_step(Checks::Puppet::ProvideUpgradeGuide.new)
     end
   end
 

data/definitions/scenarios/upgrade_to_satellite_6_4_z.rb

@@ -22,6 +22,7 @@ module Scenarios::Satellite_6_4_z
       add_steps(find_checks(:default))
       add_steps(find_checks(:pre_upgrade))
       add_step(Checks::Repositories::Validate.new(:version => '6.4'))
+      add_step(Checks::Puppet::ProvideUpgradeGuide.new)
     end
   end
 

data/lib/foreman_maintain/utils/disk/device.rb

@@ -17,7 +17,8 @@ module ForemanMaintain
         def initialize(dir)
           @dir = dir
           @name = find_device
-          @io_device = init_io_device
+          logger.info "#{dir} is externally mounted" if externally_mounted?
+          @io_device = IODevice.new(dir)
         end
 
         def slow_disk_error_msg
@@ -32,14 +33,6 @@ module ForemanMaintain
 
         private
 
-        def init_io_device
-          if externally_mounted?
-            IO::FileSystem
-          else
-            IO::BlockDevice
-          end.new(dir, name)
-        end
-
         def externally_mounted?
           device_type = execute("stat -f -c %T #{dir}")
           EXTERNAL_MOUNT_TYPE.include?(device_type)

data/lib/foreman_maintain/utils/disk/io_device.rb

@@ -0,0 +1,38 @@
+module ForemanMaintain
+  module Utils
+    module Disk
+      class IODevice
+        include ForemanMaintain::Concerns::SystemHelpers
+
+        attr_accessor :dir
+
+        def initialize(dir)
+          @dir = dir
+        end
+
+        def read_speed
+          @read_speed ||= convert_kb_to_mb(fio)
+        end
+
+        def unit
+          @unit ||= 'MB/sec'
+        end
+
+        private
+
+        # In fio command, --direct option bypass the cache page
+        def fio
+          cmd = "fio --name=job1 --rw=read --size=1g --output-format=json\
+                  --directory=#{dir} --direct=1"
+          stdout = execute(cmd)
+          output = JSON.parse(stdout)
+          @fio ||= output['jobs'].first['read']['bw'].to_i
+        end
+
+        def convert_kb_to_mb(val)
+          val / 1024
+        end
+      end
+    end
+  end
+end

data/lib/foreman_maintain/utils/disk.rb

@@ -1,4 +1,4 @@
-require 'foreman_maintain/utils/disk/io'
+require 'foreman_maintain/utils/disk/io_device'
 require 'foreman_maintain/utils/disk/device'
 require 'foreman_maintain/utils/disk/stats'
 require 'foreman_maintain/utils/disk/nil_device'

data/lib/foreman_maintain/utils/facter.rb

@@ -0,0 +1,21 @@
+module ForemanMaintain::Utils
+  module Facter
+    include ForemanMaintain::Concerns::SystemHelpers
+
+    FACTER_FILES = %w[/usr/bin/facter /opt/puppetlabs/bin/facter].freeze
+
+    def self.package
+      puppet_version = version(execute!('puppet --version'))
+
+      puppet_version.major >= 4 ? 'puppet-agent' : 'facter'
+    end
+
+    def self.path
+      FACTER_FILES.find { |path| File.exist?(path) }
+    end
+
+    def self.os_major_release
+      execute!("#{path} operatingsystemmajrelease")
+    end
+  end
+end

data/lib/foreman_maintain/utils.rb

@@ -3,3 +3,4 @@ require 'foreman_maintain/utils/disk'
 require 'foreman_maintain/utils/hash_tools'
 require 'foreman_maintain/utils/curl_response'
 require 'foreman_maintain/utils/mongo_core'
+require 'foreman_maintain/utils/facter'

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '0.2.2'.freeze
+  VERSION = '0.2.3'.freeze
 end

data/lib/foreman_maintain.rb

@@ -53,6 +53,18 @@ module ForemanMaintain
       self.config = Config.new(options)
       load_definitions
       init_logger
+      update_path
+    end
+
+    # Appending PATH with expected paths needed for commands we run
+    def update_path
+      paths = ['/sbin']
+      existing_paths = ENV['PATH'].split(':')
+      paths -= existing_paths
+      if paths.any?
+        paths = paths.join(':').chomp(':')
+        ENV['PATH'] = "#{ENV['PATH']}:#{paths}"
+      end
     end
 
     def config_file

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-18 00:00:00.000000000 Z
+date: 2018-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -120,6 +120,7 @@ files:
 - definitions/checks/check_epel_repository.rb
 - definitions/checks/disk/performance.rb
 - definitions/checks/foreman/db_up.rb
+- definitions/checks/foreman_openscap/invalid_report_associations.rb
 - definitions/checks/foreman_proxy/verify_dhcp_config_syntax.rb
 - definitions/checks/foreman_tasks/invalid/check_old.rb
 - definitions/checks/foreman_tasks/invalid/check_pending_state.rb
@@ -129,6 +130,7 @@ files:
 - definitions/checks/hammer_ping.rb
 - definitions/checks/mongo/db_up.rb
 - definitions/checks/mongo/tools_installed.rb
+- definitions/checks/puppet/provide_upgrade_guide.rb
 - definitions/checks/remote_execution/verify_settings_file_already_exists.rb
 - definitions/checks/repositories/validate.rb
 - definitions/checks/restore/validate_backup.rb
@@ -141,6 +143,7 @@ files:
 - definitions/features/foreman_1_11_x.rb
 - definitions/features/foreman_1_7_x.rb
 - definitions/features/foreman_database.rb
+- definitions/features/foreman_openscap.rb
 - definitions/features/foreman_proxy.rb
 - definitions/features/foreman_server.rb
 - definitions/features/foreman_tasks.rb
@@ -180,6 +183,7 @@ files:
 - definitions/procedures/backup/snapshot/mount_pulp.rb
 - definitions/procedures/backup/snapshot/prepare_mount.rb
 - definitions/procedures/candlepin/delete_orphaned_records_from_env_content.rb
+- definitions/procedures/foreman_openscap/invalid_report_associations.rb
 - definitions/procedures/foreman_tasks/delete.rb
 - definitions/procedures/foreman_tasks/fetch_tasks_status.rb
 - definitions/procedures/foreman_tasks/resume.rb
@@ -275,11 +279,10 @@ files:
 - lib/foreman_maintain/utils/curl_response.rb
 - lib/foreman_maintain/utils/disk.rb
 - lib/foreman_maintain/utils/disk/device.rb
-- lib/foreman_maintain/utils/disk/io.rb
-- lib/foreman_maintain/utils/disk/io/block_device.rb
-- lib/foreman_maintain/utils/disk/io/file_system.rb
+- lib/foreman_maintain/utils/disk/io_device.rb
 - lib/foreman_maintain/utils/disk/nil_device.rb
 - lib/foreman_maintain/utils/disk/stats.rb
+- lib/foreman_maintain/utils/facter.rb
 - lib/foreman_maintain/utils/hash_tools.rb
 - lib/foreman_maintain/utils/mongo_core.rb
 - lib/foreman_maintain/version.rb

data/lib/foreman_maintain/utils/disk/io/block_device.rb

@@ -1,40 +0,0 @@
-module ForemanMaintain
-  module Utils
-    module Disk
-      module IO
-        class BlockDevice
-          include ForemanMaintain::Concerns::SystemHelpers
-
-          attr_accessor :dir, :name
-
-          def initialize(dir, name = Disk::Device.new('/var').name)
-            @dir = dir
-            @name = name
-          end
-
-          def read_speed
-            @read_speed ||= extract_speed(hdparm)
-          end
-
-          def unit
-            @unit ||= extract_unit(hdparm)
-          end
-
-          private
-
-          def hdparm
-            @stdout ||= execute("hdparm -t #{name} | awk 'NF'")
-          end
-
-          def extract_unit(stdout)
-            stdout.split(' ').last
-          end
-
-          def extract_speed(stdout)
-            stdout.split(' ').reverse[1].to_i
-          end
-        end
-      end
-    end
-  end
-end

data/lib/foreman_maintain/utils/disk/io/file_system.rb

@@ -1,41 +0,0 @@
-module ForemanMaintain
-  module Utils
-    module Disk
-      module IO
-        class FileSystem
-          include ForemanMaintain::Concerns::SystemHelpers
-
-          attr_accessor :dir, :name
-
-          def initialize(dir, name = '')
-            @dir = dir
-            @name = name
-          end
-
-          def read_speed
-            @read_speed ||= convert_kb_to_mb(fio)
-          end
-
-          def unit
-            @unit ||= 'MB/sec'
-          end
-
-          private
-
-          # In fio command, --direct option bypass the cache page
-          def fio
-            cmd = "fio --name=job1 --rw=read --size=1g --output-format=json\
-                    --directory=#{dir} --direct=1"
-            stdout = execute(cmd)
-            output = JSON.parse(stdout)
-            @fio ||= output['jobs'].first['read']['bw'].to_i
-          end
-
-          def convert_kb_to_mb(val)
-            val / 1024
-          end
-        end
-      end
-    end
-  end
-end

data/lib/foreman_maintain/utils/disk/io.rb

@@ -1,2 +0,0 @@
-require 'foreman_maintain/utils/disk/io/block_device'
-require 'foreman_maintain/utils/disk/io/file_system'