foreman_maintain 1.4.1 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a742f6c45bf5c57c814ba78f83ff3fb72863de35005f0e8f34a6f823de766ba5
-  data.tar.gz: be8eb54fe3eb4d9a05d59f64ad34fc314ae97fc4be47c1aeaf4cde3b0d46b979
+  metadata.gz: 2d9b46e0f2566916075ef7ec1972734f31919fafaa10ce814a2e5006ece9ab62
+  data.tar.gz: 989952ede4062aaba32b380a5226b63e9aaa0c22ffbf34b79bc80a153a0b0920
 SHA512:
-  metadata.gz: 4cb48844ead00af99f66d37ee2a215fe9c397f14b544774580ad5df3dc09598231f5a8a7978fbc2111bb104daa951f1d3c6a1dc2426c2f635e319ded93117e6f
-  data.tar.gz: 7c0cea08c66ea928e2fa6659dd051d55c4ab0e9afabba61c18ad9934b1a21fd1b177d7f765e58a2885927103daf92ba8d05513d2fc0f386ec2900e546afa3cbc
+  metadata.gz: a9a380eb151bfadbbba33824d438dc69fe47732cf3219af14b8e78ebcb2bb8dd5ba590fc9887d936aa1eb662e644f8e085a39c2023a71e5d3d975075d37a57bb
+  data.tar.gz: 7725d0d13f08191822fbda79b828498d8b064a984ca8d38a841d1e400768ec6c530ea8d99c94ea35f6a62ac547455de32a9d4048d06a3d4a953fd065908385d1

data/definitions/checks/katello_agent.rb

@@ -0,0 +1,41 @@
+require 'yaml'
+
+class Checks::CheckKatelloAgentEnabled < ForemanMaintain::Check
+  metadata do
+    label :check_katello_agent_enabled
+    description 'Check whether the katello-agent feature is enabled before upgrading'
+    tags :pre_upgrade
+
+    confine do
+      !feature(:capsule)
+    end
+  end
+
+  def run
+    instance_name = feature(:instance).downstream ? "Satellite" : "Katello"
+    instance_version = feature(:instance).downstream ? "6.15" : "4.10"
+    installer_command = feature(:instance).downstream ? "satellite-installer" : "foreman-installer"
+    maintain_command = feature(:instance).downstream ? "satellite-maintain" : "foreman-maintain"
+
+    assert(
+      !katello_agent_enabled?,
+      "The katello-agent feature is enabled on this system. As of #{instance_name}"\
+      " #{instance_version}, katello-agent is removed and will no longer function."\
+      " Before proceeding with the upgrade, you should ensure that you have deployed"\
+      " and configured an alternative tool for remote package management and patching"\
+      " for content hosts, such as Remote Execution (REX) with pull-based transport."\
+      " See the Managing Hosts guide in the #{instance_name} documentation for more info."\
+      " Disable katello-agent with the command"\
+      " `#{installer_command} --foreman-proxy-content-enable-katello-agent false`"\
+      " before proceeding with the upgrade. Alternatively, you may skip this check and proceed by"\
+      " running #{maintain_command} again with the `--whitelist` option, which will automatically"\
+      " uninstall katello-agent."
+    )
+  end
+
+  private
+
+  def katello_agent_enabled?
+    feature(:installer).answers['foreman_proxy_content']['enable_katello_agent']
+  end
+end

data/definitions/procedures/backup/snapshot/snapshot_deprecation_message.rb

@@ -0,0 +1,14 @@
+module Procedures::Backup
+  module Snapshot
+    class SnapshotDeprecationMessage < ForemanMaintain::Procedure
+      metadata do
+        description 'Snapshot backups are deprecated'
+        tags :backup
+      end
+
+      def run
+        set_warn('Snapshot backups are deprecated and will be removed in a future version.')
+      end
+    end
+  end
+end

data/definitions/procedures/packages/check_for_reboot.rb

@@ -0,0 +1,16 @@
+module Procedures::Packages
+  class CheckForReboot < ForemanMaintain::Procedure
+    metadata do
+      description 'Check if system needs reboot'
+    end
+
+    def run
+      status, output = execute_with_status('dnf needs-restarting --reboothint')
+      if status == 1
+        set_status(:warning, output)
+      else
+        set_status(:success, output)
+      end
+    end
+  end
+end

data/definitions/scenarios/backup.rb

@@ -20,7 +20,8 @@ module ForemanMaintain::Scenarios
     end
 
     def compose
-      check_valid_startegy
+      check_valid_strategy
+      snapshot_deprecation_warning
       safety_confirmation
       accessibility_confirmation
       prepare_directory
@@ -110,6 +111,12 @@ module ForemanMaintain::Scenarios
       end
     end
 
+    def snapshot_deprecation_warning
+      if strategy == :snapshot
+        add_step_with_context(Procedures::Backup::Snapshot::SnapshotDeprecationMessage)
+      end
+    end
+
     def accessibility_confirmation
       if [:offline, :snapshot].include?(strategy)
         add_step_with_context(Procedures::Backup::AccessibilityConfirmation)
@@ -122,7 +129,7 @@ module ForemanMaintain::Scenarios
       end
     end
 
-    def check_valid_startegy
+    def check_valid_strategy
       unless [:online, :offline, :snapshot].include? strategy
         raise ArgumentError, "Unsupported strategy '#{strategy}'"
       end

data/definitions/scenarios/puppet.rb

@@ -15,9 +15,6 @@ module ForemanMaintain::Scenarios
           add_step(Procedures::Puppet::RemovePuppet)
           add_step(Procedures::Puppet::RemovePuppetData) if context.get(:remove_data)
           add_step(Procedures::Service::Restart)
-          if server?
-            add_step(Procedures::Foreman::ApipieCache)
-          end
         end
       end
     end

data/definitions/scenarios/upgrade_to_capsule_6_15.rb

@@ -87,6 +87,7 @@ module Scenarios::Capsule_6_15
     def compose
       add_steps(find_checks(:default))
       add_steps(find_checks(:post_upgrade))
+      add_step(Procedures::Packages::CheckForReboot)
     end
   end
 end

data/definitions/scenarios/upgrade_to_capsule_6_15_z.rb

@@ -87,6 +87,7 @@ module Scenarios::Capsule_6_15_z
     def compose
       add_steps(find_checks(:default))
       add_steps(find_checks(:post_upgrade))
+      add_step(Procedures::Packages::CheckForReboot)
     end
   end
 end

data/definitions/scenarios/upgrade_to_satellite_6_15.rb

@@ -89,6 +89,7 @@ module Scenarios::Satellite_6_15
     def compose
       add_steps(find_checks(:default))
       add_steps(find_checks(:post_upgrade))
+      add_step(Procedures::Packages::CheckForReboot)
     end
   end
 end

data/definitions/scenarios/upgrade_to_satellite_6_15_z.rb

@@ -88,6 +88,7 @@ module Scenarios::Satellite_6_15_z
     def compose
       add_steps(find_checks(:default))
       add_steps(find_checks(:post_upgrade))
+      add_step(Procedures::Packages::CheckForReboot)
     end
   end
 end

data/extras/foreman_protector/foreman-protector.whitelist

@@ -39,5 +39,21 @@ python3-firewall
 python3-nftables
 python3-slip
 python3-slip-dbus
+# pcp
+pcp
+pcp-conf
+pcp-libs
+pcp-pmda-apache
+pcp-pmda-openmetrics
+pcp-pmda-postgresql
+pcp-pmda-redis
+pcp-system-tools
+python3-pcp
+grafana
+grafana-pcp
 # foreman-maintain
 rubygem-foreman_maintain
+# fapolicyd
+fapolicyd
+foreman-fapolicyd
+foreman-proxy-fapolicyd

data/lib/foreman_maintain/cli/backup_command.rb

@@ -155,7 +155,7 @@ module ForemanMaintain
     class BackupCommand < Base
       subcommand 'online', 'Keep services online during backup', OnlineBackupCommand
       subcommand 'offline', 'Shut down services to preserve consistent backup', OfflineBackupCommand
-      subcommand 'snapshot', 'Use snapshots of the databases to create backup', SnapshotBackupCommand
+      subcommand 'snapshot', 'Use snapshots of the databases to create backup (DEPRECATED)', SnapshotBackupCommand
     end
     # rubocop:enable Metrics/LineLength
   end

data/lib/foreman_maintain/concerns/primary_checks.rb

@@ -2,7 +2,8 @@ module ForemanMaintain
   module Concerns
     module PrimaryChecks
       def validate_downstream_packages
-        return unless detector.feature(:installer)&.with_scenarios?
+        return unless detector.feature(:installer)
+
         if (package = package_name) && !package_manager.installed?(package)
           raise ForemanMaintain::Error::Fail,
             "Error: Important rpm package #{package} is not installed!"\

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '1.4.1'.freeze
+  VERSION = '1.4.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.3
 platform: ruby
 authors:
 - Ivan Nečas
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-06 00:00:00.000000000 Z
+date: 2023-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -159,7 +159,6 @@ files:
 - config/hammer.yml.example
 - definitions/checks/backup/certs_tar_exist.rb
 - definitions/checks/candlepin/db_up.rb
-- definitions/checks/check_for_newer_packages.rb
 - definitions/checks/check_hotfix_installed.rb
 - definitions/checks/check_tmout.rb
 - definitions/checks/disk/available_space.rb
@@ -182,6 +181,7 @@ files:
 - definitions/checks/foreman_tasks/invalid/check_planning_state.rb
 - definitions/checks/foreman_tasks/not_paused.rb
 - definitions/checks/foreman_tasks/not_running.rb
+- definitions/checks/katello_agent.rb
 - definitions/checks/maintenance_mode/check_consistency.rb
 - definitions/checks/non_rh_packages.rb
 - definitions/checks/package_manager/dnf/validate_dnf_config.rb
@@ -251,6 +251,7 @@ files:
 - definitions/procedures/backup/snapshot/mount_pulp.rb
 - definitions/procedures/backup/snapshot/mount_pulpcore_db.rb
 - definitions/procedures/backup/snapshot/prepare_mount.rb
+- definitions/procedures/backup/snapshot/snapshot_deprecation_message.rb
 - definitions/procedures/crond/start.rb
 - definitions/procedures/crond/stop.rb
 - definitions/procedures/files/remove.rb
@@ -273,6 +274,7 @@ files:
 - definitions/procedures/maintenance_mode/disable_maintenance_mode.rb
 - definitions/procedures/maintenance_mode/enable_maintenance_mode.rb
 - definitions/procedures/maintenance_mode/is_enabled.rb
+- definitions/procedures/packages/check_for_reboot.rb
 - definitions/procedures/packages/check_update.rb
 - definitions/procedures/packages/enable_modules.rb
 - definitions/procedures/packages/install.rb
@@ -424,7 +426,7 @@ homepage: https://github.com/theforeman/foreman_maintain
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -442,8 +444,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key:
+rubygems_version: 3.3.26
+signing_key: 
 specification_version: 4
 summary: Foreman maintenance tool belt
 test_files: []

data/definitions/checks/check_for_newer_packages.rb

@@ -1,67 +0,0 @@
-class Checks::CheckForNewerPackages < ForemanMaintain::Check
-  metadata do
-    label :check_for_newer_packages
-    description 'Check for newer packages and optionally ask for confirmation if not found.'
-
-    param :packages,
-      'package names to validate',
-      :required => true
-    param :manual_confirmation_version,
-      'Version of satellite to ask the user if they are on the latest minor release of.',
-      :required => false
-    manual_detection
-  end
-
-  def run
-    check_for_package_update
-    if @manual_confirmation_version
-      question = 'Confirm that you are running the latest minor release of Satellite '\
-                "#{@manual_confirmation_version}"
-      answer = ask_decision(question, actions_msg: 'y(yes), q(quit)')
-      abort! if answer != :yes
-    end
-  end
-
-  def check_for_package_update
-    exit_status, output = ForemanMaintain.package_manager.check_update(packages: @packages,
-      with_status: true)
-    packages_with_updates = []
-    if exit_status == 100
-      packages_with_updates = compare_pkg_versions(output).select do |_, result|
-        result == -1
-      end.keys
-    end
-
-    unless packages_with_updates.empty?
-      command = ForemanMaintain.pkg_and_cmd_name[1]
-      fail! 'Required updates for some packages detected.'\
-        "\nPlease update to the latest #{@manual_confirmation_version}.z release "\
-        'before proceeding, using:'\
-        "\n# #{command} upgrade run --target-version #{@manual_confirmation_version}.z"
-    end
-  end
-
-  def packages_and_versions(output)
-    pkgs_versions = {}
-    pkg_details = output.split("\n\n")[1].split
-    @packages.each do |pkg|
-      pkg_details.each_with_index do |ele, index|
-        next unless ele.start_with?(pkg)
-        pkgs_versions[pkg] = version(pkg_details[index + 1].split('-').first)
-        break
-      end
-    end
-    pkgs_versions
-  end
-
-  def compare_pkg_versions(output)
-    compare_pkg_versions = {}
-    packages_and_versions = packages_and_versions(output)
-    pkg_versions610 = { 'python3-pulp-2to3-migration' => version('0.12'),
-                        'tfm-rubygem-katello' => version('4.1') }
-    packages_and_versions.each do |name, version|
-      compare_pkg_versions[name] = version.<=>(pkg_versions610[name])
-    end
-    compare_pkg_versions
-  end
-end