foreman_maintain 1.14.1 → 1.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a44c3749923c8c50ee979b2692286e568ad55fd213efb96b06c3f662ebebfb96
-  data.tar.gz: 5248121eceec015f2be5bc9e96c5b93a4042e34193f223781f87c6b26e306d96
+  metadata.gz: 33870bada1b5b0c7fcff16ceed118f84c50b9c12fccdc93927d1270ac3b4e308
+  data.tar.gz: a11c5de1e5089b77c0658b1b8db3b92bb49ca382f4c5788ece9bf9d458c72eb6
 SHA512:
-  metadata.gz: 3e54601d8b7f4a71f31c3190e6b5db6e3afa4bfa75d44a9f0a7b5c29a847b91da7f006cacbf6fb678688501bd62f8701287882ba32c87e0bccb6675b2f04bc23
-  data.tar.gz: 3da19df1167b93f7ea64b7925d7ca21b305a67badb20abbd7a8318b64d9a4187ffee7f985e817f71bd8f063432353e89fb9a75ab59abb89e0d171b8bb1d54b83
+  metadata.gz: a541ecc432dd71795db47e76306b62338ae9ef4961734860c72c3809ca7a34d4b30f70b53c59221f9a12962f162d24d7fe0ecaa3091372f1c58110e3001497cc
+  data.tar.gz: 6fffef2f94471ebb97c0e43e01e29d284885a28c66982c70d34785b0457dd544ff440ec1298d7d6533631b1b34e06b2ff869fbf30934956f367464a952ce2473

data/definitions/features/puppet_server.rb

@@ -3,7 +3,10 @@ class Features::PuppetServer < ForemanMaintain::Feature
     label :puppet_server
 
     confine do
-      find_package('puppet-server') || find_package('puppetserver') || find_package('puppet')
+      find_package('puppet-server') ||
+        find_package('openvox-server') ||
+        find_package('puppetserver') ||
+        find_package('puppet')
     end
   end
 
@@ -23,7 +26,13 @@ class Features::PuppetServer < ForemanMaintain::Feature
     # We only check puppetserver and not puppet-server, as puppet-server
     # is a part of httpd and relies on httpd service to restart, therefore
     # not requiring a separate service to restart
-    find_package('puppetserver') ? [system_service('puppetserver', 30)] : []
+    return [system_service('puppetserver', 30)] if find_package('puppetserver') ||
+                                                   find_package('openvox-server')
+    []
+  end
+
+  def openvox?
+    find_package('openvox-server')
   end
 
   def find_empty_cacert_request_files

data/definitions/features/rh_cloud.rb

@@ -0,0 +1,19 @@
+class Features::RhCloud < ForemanMaintain::Feature
+  include ForemanMaintain::Concerns::Versions
+
+  metadata do
+    label :rh_cloud
+
+    confine do
+      find_package(foreman_plugin_name('foreman_rh_cloud'))
+    end
+  end
+
+  def current_version
+    @current_version ||= package_version(package_name)
+  end
+
+  def package_name
+    foreman_plugin_name('foreman_rh_cloud')
+  end
+end

data/definitions/procedures/restore/required_packages.rb

@@ -12,6 +12,7 @@ module Procedures::Restore
       backup = ForemanMaintain::Utils::Backup.new(@backup_dir)
       required_packages = []
       required_packages << 'puppetserver' if backup.with_puppetserver?
+      required_packages << 'openvox-server' if backup.with_openvoxserver?
       if required_packages.any?
         with_spinner('Installing required packages') do
           ForemanMaintain.package_manager.install(required_packages, assumeyes: true)

data/definitions/reports/rh_cloud.rb

@@ -0,0 +1,104 @@
+module Reports
+  class Rhcloud < ForemanMaintain::Report
+    metadata do
+      description 'Check if rh_cloud is enabled and what features are in use'
+      confine do
+        feature(:rh_cloud)
+      end
+    end
+
+    # rubocop:disable Metrics/MethodLength
+    def run
+      data_field('rh_cloud_hosts_count') do
+        rh_cloud_hosts_count
+      end
+
+      data_field('rh_cloud_mismatched_hosts_count') do
+        rh_cloud_mismatched_hosts_count
+      end
+
+      data_field('rh_cloud_total_hits') do
+        rh_cloud_total_hits
+      end
+
+      data_field('rh_cloud_mismatched_auto_delete') do
+        rh_cloud_mismatched_auto_delete
+      end
+
+      data_field('rh_cloud_obfuscate_inventory_hostnames') do
+        obfuscate_inventory_hostnames_setting
+      end
+
+      data_field('rh_cloud_obfuscate_inventory_ips') do
+        obfuscate_inventory_ips_setting
+      end
+
+      data_field('rh_cloud_minimal_data_collection') do
+        minimal_data_collection
+      end
+
+      data_field('rh_cloud_exclude_host_package_info') do
+        exclude_host_package_info
+      end
+
+      data_field('rh_cloud_connector_enabled') do
+        cloud_connector_enabled
+      end
+
+      data_field('rh_cloud_inventory_upload_enabled') do
+        inventory_upload_enabled
+      end
+
+      data_field('rh_cloud_recommendations_sync_enabled') do
+        recommendations_sync_enabled
+      end
+    end
+    # rubocop:enable Metrics/MethodLength
+
+    private
+
+    def rh_cloud_hosts_count
+      sql_count('hosts INNER JOIN insights_facets ON hosts.id = insights_facets.host_id')
+    end
+
+    def rh_cloud_mismatched_hosts_count
+      sql_count('insights_missing_hosts')
+    end
+
+    def rh_cloud_total_hits
+      sql_count('hosts INNER JOIN insights_hits ON hosts.id = insights_hits.host_id')
+    end
+
+    def obfuscate_inventory_hostnames_setting
+      !!sql_setting('obfuscate_inventory_hostnames')
+    end
+
+    def obfuscate_inventory_ips_setting
+      !!sql_setting('obfuscate_inventory_ips')
+    end
+
+    def minimal_data_collection
+      !!sql_setting('insights_minimal_data_collection')
+    end
+
+    def exclude_host_package_info
+      !!sql_setting('exclude_installed_packages')
+    end
+
+    def rh_cloud_mismatched_auto_delete
+      !!sql_setting('allow_auto_insights_mismatch_delete')
+    end
+
+    def cloud_connector_enabled
+      !!sql_setting('rhc_instance_id')
+    end
+
+    def inventory_upload_enabled
+      !sql_setting('allow_auto_inventory_upload')
+    end
+
+    def recommendations_sync_enabled
+      !sql_setting('allow_auto_insights_sync')
+    end
+  end
+end

data/lib/foreman_maintain/utils/backup.rb

@@ -179,6 +179,10 @@ module ForemanMaintain
         installed_rpms.any? { |rpm| rpm.start_with?('puppetserver-') }
       end
 
+      def with_openvoxserver?
+        installed_rpms.any? { |rpm| rpm.start_with?('openvox-server-') }
+      end
+
       def source_os_version
         metadata.fetch('os_version', 'unknown')
       end

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '1.14.1'.freeze
+  VERSION = '1.14.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 1.14.1
+  version: 1.14.2
 platform: ruby
 authors:
 - Ivan Nečas
@@ -241,6 +241,7 @@ files:
 - definitions/features/pulpcore_database.rb
 - definitions/features/puppet_server.rb
 - definitions/features/redis.rb
+- definitions/features/rh_cloud.rb
 - definitions/features/salt_server.rb
 - definitions/features/satellite.rb
 - definitions/features/service.rb
@@ -356,6 +357,7 @@ files:
 - definitions/reports/provisioning.rb
 - definitions/reports/rbac.rb
 - definitions/reports/recurring_logics.rb
+- definitions/reports/rh_cloud.rb
 - definitions/reports/selinux.rb
 - definitions/reports/template
 - definitions/reports/virt_who.rb