foreman_maintain 1.1.9 → 1.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69158577583d9944fc51caf91b42171deb3d44a286fcbca2bced55bf667d80e1
-  data.tar.gz: b30ed55b5b891f6b4e894ca532a14b8543a68a0270f272869230d911655ae478
+  metadata.gz: 05e00cf48a6dfb5684ac74e789ba933225d4c380a2b83d3e8df8cd607d537c8c
+  data.tar.gz: c639bf3716c44df18b63125880f6521558ee754992e21eac73021e14e3ebfd5c
 SHA512:
-  metadata.gz: a4763f9ee14216abab95da46d04ebe87b2cf8a11ac874204e6a2f0771f97c3a49b0f1a42e88959faf023ea08536e08d0fe4d263625af1329e542697b7f194033
-  data.tar.gz: ffe603fe952c1d1eb010cb9a5c22329b257a0fbb33aed897dc4871cb683e99b8c6fb38e2e1462aa4c16ec5c32943a6f70ecb88b6177c2e420eac7231634a80fa
+  metadata.gz: 1899bd4d44b5ab634dfdd516c9db1e0cf4c45ced30b3de818bcbaa0b45bdedafe690a6e42eff5643e2b2e986c8289c792db34f3609161e33c9c773c27414cb93
+  data.tar.gz: 68ee21c7b7e59cbc9a8d944fdebba54e82b72a5b67c4fbf5284f36caab4926f1223d0c5168d6303e624f4ed49b87c5167bbec6c222dc8d874a8b8fdb4d5af9ef

data/definitions/features/foreman_proxy.rb

@@ -144,7 +144,7 @@ class Features::ForemanProxy < ForemanMaintain::Feature
 
     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 += " https://#{hostname}:#{proxy_settings[:https_port]}"
     cmd
   end
 

data/definitions/features/foreman_tasks.rb

@@ -17,6 +17,7 @@ class Features::ForemanTasks < ForemanMaintain::Feature
     Actions::Candlepin::ListenOnCandlepinEvents
     Actions::Katello::EventQueue::Monitor
     Actions::Insights::EmailPoller
+    ForemanInventoryUpload::Async::GenerateAllReportsJob
     ForemanInventoryUpload::Async::GenerateReportJob
     ForemanInventoryUpload::Async::QueueForUploadJob
     ForemanInventoryUpload::Async::UploadReportJob
@@ -24,6 +25,7 @@ class Features::ForemanTasks < ForemanMaintain::Feature
     InsightsCloud::Async::InsightsFullSync
     InsightsCloud::Async::InsightsResolutionsSync
     InsightsCloud::Async::InsightsRulesSync
+    InsightsCloud::Async::InsightsScheduledSync
     InventorySync::Async::InventoryFullSync
     InventorySync::Async::InventoryHostsSync
     InventorySync::Async::InventoryScheduledSync

data/definitions/features/sync_plans.rb

@@ -33,12 +33,22 @@ class Features::SyncPlans < ForemanMaintain::Feature
     feature(:foreman_database).query(query).map { |r| r['id'].to_i }
   end
 
+  def validate_sync_plan_ids(ids)
+    ids_condition = ids.map { |id| "'#{id}'" }.join(',')
+    query = <<-SQL
+      SELECT id FROM katello_sync_plans WHERE id IN (#{ids_condition})
+    SQL
+    feature(:foreman_database).query(query).map { |r| r['id'].to_i }
+  end
+
   def make_disable(ids)
     update_records(ids, false)
   end
 
   def make_enable
-    update_records(data[:disabled], true)
+    # remove ids of sync plans which no longer exist in DB
+    @data[:disabled] = validate_sync_plan_ids(@data[:disabled])
+    update_records(@data[:disabled], true)
   end
 
   def load_from_storage(storage)

data/definitions/procedures/restore/reindex_databases.rb

@@ -0,0 +1,22 @@
+module Procedures::Restore
+  class ReindexDatabases < ForemanMaintain::Procedure
+    include ForemanMaintain::Concerns::SystemService
+
+    metadata do
+      description 'REINDEX databases'
+
+      confine do
+        feature(:instance).postgresql_local?
+      end
+    end
+
+    def run
+      with_spinner('Reindexing the databases') do |spinner|
+        feature(:service).handle_services(spinner, 'start', :only => ['postgresql'])
+
+        spinner.update('Reindexing the databases')
+        execute!('runuser - postgres -c "reindexdb -a"')
+      end
+    end
+  end
+end

data/definitions/scenarios/restore.rb

@@ -45,6 +45,11 @@ module ForemanMaintain::Scenarios
         add_step(Procedures::Service::Stop.new(:only => ['postgresql']))
       end
       restore_mongo_dump(backup)
+
+      if feature(:instance).postgresql_local? && !backup.online_backup?
+        add_step_with_context(Procedures::Restore::ReindexDatabases)
+      end
+
       add_steps_with_context(Procedures::Pulp::Migrate,
                              Procedures::Pulpcore::Migrate,
                              Procedures::Restore::CandlepinResetMigrations)

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '1.1.9'.freeze
+  VERSION = '1.1.11'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 1.1.9
+  version: 1.1.11
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-06 00:00:00.000000000 Z
+date: 2023-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -322,6 +322,7 @@ files:
 - definitions/procedures/restore/postgres_owner.rb
 - definitions/procedures/restore/pulpcore_dump.rb
 - definitions/procedures/restore/regenerate_queues.rb
+- definitions/procedures/restore/reindex_databases.rb
 - definitions/procedures/selinux/set_file_security.rb
 - definitions/procedures/service/base.rb
 - definitions/procedures/service/daemon_reload.rb
@@ -484,7 +485,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: Foreman maintenance tool belt