foreman_rh_cloud 12.0.0 → 12.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3666ab0afa45f6fbf3fbe06ec110cbbf7d7eca432b02686e945afca5b412f31
-  data.tar.gz: ce3380aca30486d23d89c3e9b30d17cbc862e51ba55032b1e60565ec63af1cc2
+  metadata.gz: bc6fa218e9a87166dd1b6ea44dc00f52dc4a0ee28edaa6363bfd74fd0e93c17c
+  data.tar.gz: 80d9b1dcfa4a2e1589d2273b895360d237e84101d0e2a216a18ffc0d9259e14d
 SHA512:
-  metadata.gz: b853fd7fe75e52c4127984c2644feb55fb455d52d68a86b55ed9d96b84e03d05408fc9ddf5190253d2938965c8583b33903682fabfe137f42ce06f57a2d96a09
-  data.tar.gz: fb4777f06aa6d47e0038cc3533b86779a95694c23e4d01b01bc78e10c07196f16df87ead87d4787e8c4dc518813d7ef4e250d8fe955857ebe6811ad5e8b0d3ec
+  metadata.gz: 4e76e623f5509cd2bedab0fcd8abf926d7380eee120d1c73fc7f3be32ec9fe97cfc3948f56e93436ac21431ec8a5f85b4f8f349d1fe5df05bcad9d4e043eb332
+  data.tar.gz: d6f0d6140787ba18bc69bcf4de2161795a4404530fd24bd4502c352d1e87e1d13bd447049b220901edc48f0fbb9fde78ce73b737dea5435fc841d70f6c1a38bf

data/app/controllers/concerns/inventory_upload/report_actions.rb

@@ -16,7 +16,7 @@ module InventoryUpload
 
     def report_file(organization_id)
       filename = ForemanInventoryUpload.facts_archive_name(organization_id)
-      files = Dir["{#{ForemanInventoryUpload.uploads_file_path(filename)},#{ForemanInventoryUpload.done_file_path(filename)}}"]
+      files = ForemanInventoryUpload.report_file_paths(organization_id)
 
       raise ReportMissingError.new(filename: filename) if files.empty?
 

data/app/controllers/foreman_inventory_upload/accounts_controller.rb

@@ -8,12 +8,14 @@ module ForemanInventoryUpload
         labels.map do |id, label|
           generate_report_status = status_for(id, ForemanInventoryUpload::Async::GenerateReportJob)
           upload_report_status = status_for(id, ForemanInventoryUpload::Async::UploadReportJob)
+          report_file_paths = ForemanInventoryUpload.report_file_paths(id)
 
           [
             label,
             {
               generate_report_status: generate_report_status,
               upload_report_status: upload_report_status,
+              report_file_paths: report_file_paths,
               id: id,
             },
           ]

data/app/controllers/foreman_inventory_upload/uploads_settings_controller.rb

@@ -2,7 +2,9 @@ module ForemanInventoryUpload
   class UploadsSettingsController < ::ApplicationController
     def index
       render json: {
+        insightsMinimalDataCollection: Setting[:insights_minimal_data_collection],
         autoUploadEnabled: Setting[:allow_auto_inventory_upload],
+        subscriptionConnectionEnabled: Setting[:subscription_connection_enabled],
         hostObfuscationEnabled: Setting[:obfuscate_inventory_hostnames],
         ipsObfuscationEnabled: Setting[:obfuscate_inventory_ips],
         excludePackagesEnabled: Setting[:exclude_installed_packages],

data/app/services/foreman_rh_cloud/cloud_request.rb

@@ -8,6 +8,10 @@ module ForemanRhCloud
         proxy: ForemanRhCloud.transformed_http_proxy_string,
       }.deep_merge(params)
 
+      if ForemanRhCloud.with_local_advisor_engine?
+        final_params[:ssl_ca_file] ||= ForemanRhCloud.ca_cert
+      end
+
       response = RestClient::Request.execute(final_params)
 
       logger.debug("Response headers for request url #{final_params[:url]} are: #{response.headers}")

data/app/services/foreman_rh_cloud/cloud_request_forwarder.rb

@@ -34,7 +34,13 @@ module ForemanRhCloud
         ),
       }
       requested_url = original_request.original_fullpath.end_with?('/') ? original_request.path + '/' : original_request.path
-      base_params.merge(path_params(requested_url, certs))
+      params = path_params(requested_url, certs)
+
+      if ForemanRhCloud.with_local_advisor_engine?
+        params[:ssl_ca_file] = ForemanRhCloud.ca_cert
+      end
+
+      base_params.merge(params)
     end
 
     def prepare_forward_payload(original_request, controller_name)
@@ -63,6 +69,12 @@ module ForemanRhCloud
 
     def path_params(request_path, certs)
       case request_path
+      when lightspeed?
+        {
+          url: ForemanRhCloud.cert_base_url + request_path,
+          ssl_client_cert: OpenSSL::X509::Certificate.new(certs[:cert]),
+          ssl_client_key: OpenSSL::PKey.read(certs[:key]),
+        }
       when platform_request?
         {
           url: ForemanRhCloud.cert_base_url + request_path.sub('/redhat_access/r/insights/platform', '/api'),
@@ -95,6 +107,10 @@ module ForemanRhCloud
       headers
     end
 
+    def lightspeed?
+      ->(request_path) { request_path.include? '/lightspeed' }
+    end
+
     def platform_request?
       ->(request_path) { request_path.include? '/platform' }
     end

data/app/services/foreman_rh_cloud/rules_ingester.rb

@@ -13,7 +13,18 @@ module ForemanRhCloud
 
     def fetch_rules_data
       advisor_url = "#{ForemanRhCloud.on_premise_url}/r/insights/v1/static/release/content.json"
-      JSON.parse(Net::HTTP.get(URI.parse(advisor_url)), symbolize_names: true)
+      uri = URI.parse(advisor_url)
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = true
+
+      # Set CA certificate
+      http.ca_file = ForemanRhCloud.ca_cert
+      http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+
+      request = Net::HTTP::Get.new(uri.request_uri)
+
+      response = http.request(request)
+      JSON.parse(response.body, symbolize_names: true)
     end
 
     def fetch_rules_and_resolutions

data/config/routes.rb

@@ -49,6 +49,10 @@ Rails.application.routes.draw do
     end
   end
 
+  scope :module => :'insights_cloud/api' do
+    match '/api/lightspeed/*path', to: 'machine_telemetries#forward_request', via: :all
+  end
+
   # API routes
 
   namespace :api, :defaults => { :format => 'json' } do

data/lib/foreman_inventory_upload/generators/queries.rb

@@ -17,6 +17,8 @@ module ForemanInventoryUpload
               'distribution::name',
               'uname::release',
               'lscpu::flags',
+              'hypervisor::type',
+              'hypervisor::version',
               'distribution::version',
               'distribution::id',
               'virt::is_guest',

data/lib/foreman_inventory_upload/generators/slice.rb

@@ -50,56 +50,97 @@ module ForemanInventoryUpload
         @stream.simple_field('success', ActiveModel::Type::Boolean.new.cast(fact_value(host, 'conversions::success')), :last)
       end
 
+      def insights_minimal_data_collection(host)
+        @stream.simple_field('account', account_id(host.organization).to_s)
+        @stream.simple_field('subscription_manager_id', uuid_value!(host.subscription_facet&.uuid))
+        @stream.simple_field('insights_id', uuid_value(fact_value(host, 'insights_id')))
+        @stream.simple_field('bios_uuid', bios_uuid(host))
+        @stream.simple_field('bios_vendor', fact_value(host, 'dmi::bios::vendor'))
+        @stream.simple_field('bios_version', fact_value(host, 'dmi::bios::version'))
+        @stream.simple_field('arch', host.architecture&.name)
+        @stream.simple_field(
+          'infrastructure_type',
+          ActiveModel::Type::Boolean.new.cast(fact_value(host, 'virt::is_guest')) ? 'virtual' : 'physical'
+        )
+        @stream.object_field('system_profile') do
+          unless (installed_products = host.subscription_facet&.installed_products).empty?
+            @stream.array_field('installed_products') do
+              @stream.raw(installed_products.map do |product|
+                {
+                  'name': product.name,
+                  'id': product.cp_product_id,
+                }.to_json
+              end.join(', '))
+            end
+          end
+          @stream.simple_field('cores_per_socket', fact_value(host, 'cpu::core(s)_per_socket')) { |v| v.to_i } if fact_value(host, 'cpu::core(s)_per_socket').present?
+          @stream.simple_field('system_memory_bytes', fact_value(host, 'memory::memtotal')) { |v| kilobytes_to_bytes(v.to_i) } if fact_value(host, 'memory::memtotal').present?
+          @stream.simple_field('number_of_cpus', fact_value(host, 'cpu::cpu(s)')) { |v| v.to_i } if fact_value(host, 'cpu::cpu(s)').present?
+          @stream.simple_field('number_of_sockets', fact_value(host, 'cpu::cpu_socket(s)'), :last) { |v| v.to_i } if fact_value(host, 'cpu::cpu_socket(s)').present?
+        end
+        if host.subscription_facet.hypervisor?
+          @stream.simple_field('cpu_socket(s)', fact_value(host, 'cpu::cpu_socket(s)'))
+          @stream.simple_field('hypervisor_type', fact_value(host, 'hypervisor::type'))
+          @stream.simple_field('hypervisor_version', fact_value(host, 'hypervisor::version'), :last)
+        else
+          @stream.simple_field('cpu_socket(s)', fact_value(host, 'cpu::cpu_socket(s)'), :last)
+        end
+      end
+
       def report_host(host)
         host_ips_cache = host_ips(host)
         @stream.object do
-          @stream.simple_field('fqdn', fqdn(host))
-          @stream.simple_field('account', account_id(host.organization).to_s)
-          @stream.simple_field('subscription_manager_id', uuid_value!(host.subscription_facet&.uuid))
-          @stream.simple_field('satellite_id', uuid_value!(host.subscription_facet&.uuid))
-          if host.subscription_facet&.convert2rhel_through_foreman.present?
-            @stream.object_field('conversions') do
-              @stream.object_field('source_os') do
-                @stream.simple_field('name', fact_value(host, 'conversions::source_os::name'))
-                @stream.simple_field('version', fact_value(host, 'conversions::source_os::version') || 'Unknown - Fact not reported', :last)
-              end
-              @stream.object_field('target_os') do
-                @stream.simple_field('name', fact_value(host, 'conversions::target_os::name'))
-                @stream.simple_field('version', fact_value(host, 'conversions::target_os::version') || 'Unknown - Fact not reported', :last)
+          if Setting[:insights_minimal_data_collection]
+            insights_minimal_data_collection(host)
+          else
+            @stream.simple_field('fqdn', fqdn(host))
+            @stream.simple_field('account', account_id(host.organization).to_s)
+            @stream.simple_field('subscription_manager_id', uuid_value!(host.subscription_facet&.uuid))
+            @stream.simple_field('satellite_id', uuid_value!(host.subscription_facet&.uuid))
+            if host.subscription_facet&.convert2rhel_through_foreman.present?
+              @stream.object_field('conversions') do
+                @stream.object_field('source_os') do
+                  @stream.simple_field('name', fact_value(host, 'conversions::source_os::name'))
+                  @stream.simple_field('version', fact_value(host, 'conversions::source_os::version') || 'Unknown - Fact not reported', :last)
+                end
+                @stream.object_field('target_os') do
+                  @stream.simple_field('name', fact_value(host, 'conversions::target_os::name'))
+                  @stream.simple_field('version', fact_value(host, 'conversions::target_os::version') || 'Unknown - Fact not reported', :last)
+                end
+                report_conversions(host)
               end
-              report_conversions(host)
             end
-          end
-          @stream.simple_field('bios_uuid', bios_uuid(host))
-          @stream.simple_field('vm_uuid', uuid_value(fact_value(host, 'virt::uuid')))
-          @stream.simple_field('insights_id', uuid_value(fact_value(host, 'insights_id')))
-          report_ip_addresses(host, host_ips_cache)
-          report_mac_addresses(host)
-          @stream.object_field('system_profile') do
-            report_system_profile(host, host_ips_cache)
-          end
-          @stream.array_field('facts') do
-            @stream.object do
-              @stream.simple_field('namespace', SATELLITE_NAMESPACE)
-              @stream.object_field('facts', :last) do
-                report_satellite_facts(host)
-              end
+            @stream.simple_field('bios_uuid', bios_uuid(host))
+            @stream.simple_field('vm_uuid', uuid_value(fact_value(host, 'virt::uuid')))
+            @stream.simple_field('insights_id', uuid_value(fact_value(host, 'insights_id')))
+            report_ip_addresses(host, host_ips_cache)
+            report_mac_addresses(host)
+            @stream.object_field('system_profile') do
+              report_system_profile(host, host_ips_cache)
             end
-          end
 
-          @stream.array_field('tags', :last) do
-            tags_generator = Tags.new(host)
-
-            host_params_tags = tags_generator.generate_parameters
-            host_params_tags.each do |key, value|
-              report_tag(SATELLITE_PARAMS_NAMESPACE, key, value)
+            @stream.array_field('facts') do
+              @stream.object do
+                @stream.simple_field('namespace', SATELLITE_NAMESPACE)
+                @stream.object_field('facts', :last) do
+                  report_satellite_facts(host)
+                end
+              end
             end
 
-            tags = tags_generator.generate
-            last_index = tags.count - 1
-            tags.each_with_index do |pair, index|
-              key, value = pair
-              report_tag(SATELLITE_NAMESPACE, key, value, index == last_index)
+            @stream.array_field('tags', :last) do
+              tags_generator = Tags.new(host)
+              host_params_tags = tags_generator.generate_parameters
+              host_params_tags.each do |key, value|
+                report_tag(SATELLITE_PARAMS_NAMESPACE, key, value)
+              end
+
+              tags = tags_generator.generate
+              last_index = tags.count - 1
+              tags.each_with_index do |pair, index|
+                key, value = pair
+                report_tag(SATELLITE_NAMESPACE, key, value, index == last_index)
+              end
             end
           end
         end
@@ -165,7 +206,7 @@ module ForemanInventoryUpload
             end.join(', '))
           end
         end
-        unless Setting[:exclude_installed_packages]
+        if !Setting[:insights_minimal_data_collection] && !Setting[:exclude_installed_packages]
           @stream.array_field('installed_packages') do
             first = true
             host.installed_packages.each do |package|

data/lib/foreman_inventory_upload.rb

@@ -30,6 +30,11 @@ module ForemanInventoryUpload
     File.join(ForemanInventoryUpload.done_folder, filename)
   end
 
+  def self.report_file_paths(organization_id)
+    filename = facts_archive_name(organization_id)
+    Dir[ForemanInventoryUpload.uploads_file_path(filename), ForemanInventoryUpload.done_file_path(filename)]
+  end
+
   def self.generated_reports_folder
     @generated_reports_folder ||= ensure_folder(
       File.join(

data/lib/foreman_rh_cloud/engine.rb

@@ -44,11 +44,12 @@ module ForemanRhCloud
               setting('allow_auto_inventory_upload', type: :boolean, description: N_('Enable automatic upload of your host inventory to the Red Hat cloud'), default: true, full_name: N_('Automatic inventory upload'))
               setting('allow_auto_insights_sync', type: :boolean, description: N_('Enable automatic synchronization of Insights recommendations from the Red Hat cloud'), default: true, full_name: N_('Synchronize recommendations Automatically'))
               setting('allow_auto_insights_mismatch_delete', type: :boolean, description: N_('Enable automatic deletion of mismatched host records from the Red Hat cloud'), default: false, full_name: N_('Automatic mismatch deletion'))
-              setting('obfuscate_inventory_hostnames', type: :boolean, description: N_('Obfuscate host names sent to the Red Hat cloud'), default: false, full_name: N_('Obfuscate host names'))
-              setting('obfuscate_inventory_ips', type: :boolean, description: N_('Obfuscate ipv4 addresses sent to the Red Hat cloud'), default: false, full_name: N_('Obfuscate host ipv4 addresses'))
-              setting('exclude_installed_packages', type: :boolean, description: N_('Exclude installed packages from being uploaded to the Red Hat cloud'), default: false, full_name: N_("Exclude installed Packages"))
+              setting('obfuscate_inventory_hostnames', type: :boolean, description: N_('Obfuscate host names sent to the Red Hat cloud. (If insights_minimal_data_collection is set to true, this setting is ignored and host names are always obfuscated.)'), default: false, full_name: N_('Obfuscate host names'))
+              setting('obfuscate_inventory_ips', type: :boolean, description: N_('Obfuscate ipv4 addresses sent to the Red Hat cloud.  (If insights_minimal_data_collection is set to true, this setting is ignored and host ipv4 addresses are always obfuscated.)'), default: false, full_name: N_('Obfuscate host ipv4 addresses.'))
+              setting('exclude_installed_packages', type: :boolean, description: N_('Exclude installed packages from being uploaded to the Red Hat cloud. (If insights_minimal_data_collection is set to true, this setting is ignored and installed packages are always excluded.)'), default: false, full_name: N_("Exclude installed packages"))
               setting('include_parameter_tags', type: :boolean, description: N_('Should import include parameter tags from Foreman?'), default: false, full_name: N_('Include parameters in insights-client reports'))
               setting('rhc_instance_id', type: :string, description: N_('RHC daemon id'), default: nil, full_name: N_('ID of the RHC(Yggdrasil) daemon'))
+              setting('insights_minimal_data_collection', type: :boolean, default: false, full_name: N_('Minimal data collection'), description: N_('Only send the minimum required data to Red Hat cloud, and obfuscate wherever possible. When this is true, hostnames and IPv4 addresses are always obfuscated and installed packages are excluded, regardless of those settings.'))
             end
           end
 
@@ -212,4 +213,15 @@ module ForemanRhCloud
   def self.with_local_advisor_engine?
     SETTINGS.dig(:foreman_rh_cloud, :use_local_advisor_engine) || false
   end
+
+  def self.ca_cert
+    # The reference to candlepin ca_cert_file can be removed
+    # once the setting is dropped. Foreman 3.15 introduces
+    # a single CA file that bundles all CAs.
+    if ::SETTINGS.dig(:katello, :candlepin, :ca_cert_file)
+      ::SETTINGS[:katello][:candlepin][:ca_cert_file]
+    else
+      ::SETTINGS[:ssl_ca_file]
+    end
+  end
 end

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '12.0.0'.freeze
+  VERSION = '12.1.0'.freeze
 end

data/lib/foreman_rh_cloud.rb

@@ -47,6 +47,8 @@ module ForemanRhCloud
   end
 
   def self.proxy_string
+    return '' if ForemanRhCloud.with_local_advisor_engine?
+
     HttpProxy.default_global_content_proxy&.full_url ||
     ForemanRhCloud.global_foreman_proxy ||
     ''

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "foreman_rh_cloud",
-  "version": "12.0.0",
+  "version": "12.1.0",
   "description": "Inventory Upload =============",
   "main": "index.js",
   "scripts": {

data/test/unit/slice_generator_test.rb

@@ -35,6 +35,12 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     ForemanInventoryUpload::Generators::Queries.instance_variable_set(:@fact_names, nil)
   end
 
+  def create_fact_values(host, facts)
+    facts.each do |fact_name, value|
+      FactoryBot.create(:fact_value, fact_name: fact_names[fact_name], value: value, host: host)
+    end
+  end
+
   def interesting_facts
     [
       'dmi::system::uuid',
@@ -52,6 +58,8 @@ class SliceGeneratorTest < ActiveSupport::TestCase
       'distribution::version',
       'distribution::id',
       'virt::is_guest',
+      'hypervisor::type',
+      'hypervisor::version',
       'dmi::system::manufacturer',
       'dmi::system::product_name',
       'dmi::chassis::asset_tag',
@@ -98,10 +106,210 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     assert_equal 'test_nic1', actual_nic['name']
   end
 
+  test 'generates a report with minimal data collection' do
+    Setting[:insights_minimal_data_collection] = true
+    create_fact_values(@host,
+      'dmi::system::uuid' => 'D30B0B42-7824-2635-C62D-491394DE43F7',
+      'dmi::bios::vendor' => 'SeaBios',
+      'dmi::bios::version' => '10',
+      'cpu::cpu_socket(s)' => '2',
+      'cpu::cpu(s)' => '4',
+      'cpu::core(s)_per_socket' => '1',
+      'memory::memtotal' => '1024',
+      'insights_id' => '00000000-0073-0400-0000-000000000000')
+
+    batch = Host.where(id: @host.id).in_batches.first
+    generator = create_generator(batch)
+
+    json_str = generator.render
+    actual = JSON.parse(json_str.join("\n"))
+
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
+    assert_not_nil(actual_host = actual['hosts'].first)
+    assert_equal 1, generator.hosts_count
+    assert_equal '1234', actual_host['account']
+    assert_not_nil(actual_system_profile = actual_host['system_profile'])
+    assert_not_nil actual_host['subscription_manager_id']
+    assert_equal 'D30B0B42-7824-2635-C62D-491394DE43F7', actual_host['bios_uuid']
+    assert_equal '00000000-0073-0400-0000-000000000000', actual_host['insights_id']
+    assert_equal 4, actual_system_profile['number_of_cpus']
+    assert_equal 2, actual_system_profile['number_of_sockets']
+    assert_equal 1_048_576, actual_system_profile['system_memory_bytes']
+    assert_equal 1, actual_system_profile['cores_per_socket']
+    assert_equal 'SeaBios', actual_host['bios_vendor']
+    assert_equal '10', actual_host['bios_version']
+    assert_equal '2', actual_host['cpu_socket(s)']
+    # Assert exclusion of non-minimal data collection fact
+    assert_nil actual_host['ip_addresses']
+    assert_nil actual_host['mac_addresses']
+    assert_nil actual_host['fqdn']
+  end
+
+  test 'generates a report with minimal data collection for a hypervisor' do
+    Setting[:insights_minimal_data_collection] = true
+    create_fact_values(@host,
+      'dmi::system::uuid' => 'D30B0B42-7824-2635-C62D-491394DE43F7',
+      'hypervisor::type' => 'VMware',
+      'hypervisor::version' => '6.7',
+      'cpu::cpu_socket(s)' => '2',
+      'cpu::cpu(s)' => '4',
+      'cpu::core(s)_per_socket' => '1',
+      'memory::memtotal' => '1024')
+
+    @host.subscription_facet.hypervisor = true
+    @host.subscription_facet.save!
+
+    batch = Host.where(id: @host.id).in_batches.first
+    generator = create_generator(batch)
+
+    json_str = generator.render
+    actual = JSON.parse(json_str.join("\n"))
+
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
+    assert_not_nil(actual_host = actual['hosts'].first)
+    assert_not_nil(actual_system_profile = actual_host['system_profile'])
+    assert_equal 'D30B0B42-7824-2635-C62D-491394DE43F7', actual_host['bios_uuid']
+    assert_equal 'VMware', actual_host['hypervisor_type']
+    assert_equal '6.7', actual_host['hypervisor_version']
+    assert_equal '2', actual_host['cpu_socket(s)']
+    assert_equal 4, actual_system_profile['number_of_cpus']
+    assert_equal 2, actual_system_profile['number_of_sockets']
+    assert_equal 1_048_576, actual_system_profile['system_memory_bytes']
+    assert_equal 1, actual_system_profile['cores_per_socket']
+    assert_equal 1, generator.hosts_count
+    # Assert exclusion of non-minimal data collection facts
+    assert_nil actual_host['ip_addresses']
+    assert_nil actual_host['mac_addresses']
+    assert_nil actual_host['fqdn']
+    assert true, @host.subscription_facet.hypervisor?
+  end
+
+  test 'packages are excluded in the report with minimal data collection' do
+    Setting[:exclude_installed_packages] = false
+    Setting[:insights_minimal_data_collection] = true
+
+    installed_package = ::Katello::InstalledPackage.create(name: 'test-package', nvrea: 'test-package-1.0.x86_64', nvra: 'test-package-1.0.x86_64')
+    another_host = FactoryBot.create(
+      :host,
+      :with_subscription,
+      :with_content,
+      content_view: @host.content_views.first,
+      lifecycle_environment: @host.lifecycle_environments.first,
+      organization: @host.organization,
+      installed_packages: [installed_package]
+    )
+    create_fact_values(another_host,
+      'dmi::system::uuid' => 'D30B0B42-7824-2635-C62D-491394DE43F7',
+      'dmi::bios::vendor' => 'SeaBios',
+      'dmi::bios::version' => '10',
+      'cpu::cpu_socket(s)' => '2',
+      'cpu::cpu(s)' => '4',
+      'cpu::core(s)_per_socket' => '1',
+      'memory::memtotal' => '1024')
+
+    batch = Host.where(id: another_host.id).in_batches.first
+    generator = create_generator(batch)
+
+    json_str = generator.render
+    actual = JSON.parse(json_str.join("\n"))
+
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
+    assert_not_nil(actual_host = actual['hosts'].first)
+    assert_not_nil(actual_host['system_profile'])
+    assert_not_nil(actual_system_profile = actual_host['system_profile'])
+    assert_not_nil actual_host['subscription_manager_id']
+    assert_equal 'D30B0B42-7824-2635-C62D-491394DE43F7', actual_host['bios_uuid']
+    assert_equal 4, actual_system_profile['number_of_cpus']
+    assert_equal 2, actual_system_profile['number_of_sockets']
+    assert_equal 1_048_576, actual_system_profile['system_memory_bytes']
+    assert_equal 1, actual_system_profile['cores_per_socket']
+    assert_equal 'SeaBios', actual_host['bios_vendor']
+    assert_equal '10', actual_host['bios_version']
+    assert_equal '2', actual_host['cpu_socket(s)']
+    assert_nil actual_host['installed_packages']
+  end
+
+  test 'generates a report with minimal data collection with ip setting overridden' do
+    Setting[:insights_minimal_data_collection] = true
+    Setting[:obfuscate_inventory_ips] = false
+    create_fact_values(@host,
+      'dmi::system::uuid' => 'D30B0B42-7824-2635-C62D-491394DE43F7',
+      'dmi::bios::vendor' => 'SeaBios',
+      'dmi::bios::version' => '10',
+      'cpu::cpu_socket(s)' => '2',
+      'cpu::cpu(s)' => '4',
+      'cpu::core(s)_per_socket' => '1',
+      'memory::memtotal' => '1024')
+
+    batch = Host.where(id: @host.id).in_batches.first
+    generator = create_generator(batch)
+
+    json_str = generator.render
+    actual = JSON.parse(json_str.join("\n"))
+
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
+    assert_not_nil(actual_host = actual['hosts'].first)
+    assert_equal 1, generator.hosts_count
+    assert_not_nil(actual_host['system_profile'])
+    assert_not_nil(actual_system_profile = actual_host['system_profile'])
+    assert_not_nil actual_host['subscription_manager_id']
+    assert_equal 'D30B0B42-7824-2635-C62D-491394DE43F7', actual_host['bios_uuid']
+    assert_equal 4, actual_system_profile['number_of_cpus']
+    assert_equal 2, actual_system_profile['number_of_sockets']
+    assert_equal 1_048_576, actual_system_profile['system_memory_bytes']
+    assert_equal 1, actual_system_profile['cores_per_socket']
+    assert_equal 'SeaBios', actual_host['bios_vendor']
+    assert_equal '10', actual_host['bios_version']
+    assert_equal '2', actual_host['cpu_socket(s)']
+    # Assert exclusion of non-minimal data collection fact
+    assert_nil actual_host['ip_addresses']
+    assert_nil actual_host['mac_addresses']
+    assert_nil actual_host['fqdn']
+  end
+
+  test 'generates a report with minimal data collection with fqdn setting overridden' do
+    Setting[:insights_minimal_data_collection] = true
+    Setting[:obfuscate_inventory_hostnames] = false
+    create_fact_values(@host,
+      'dmi::system::uuid' => 'D30B0B42-7824-2635-C62D-491394DE43F7',
+      'dmi::bios::vendor' => 'SeaBios',
+      'dmi::bios::version' => '10',
+      'cpu::cpu_socket(s)' => '2',
+      'cpu::cpu(s)' => '4',
+      'cpu::core(s)_per_socket' => '1',
+      'memory::memtotal' => '1024')
+
+    batch = Host.where(id: @host.id).in_batches.first
+    generator = create_generator(batch)
+
+    json_str = generator.render
+    actual = JSON.parse(json_str.join("\n"))
+
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
+    assert_not_nil(actual_host = actual['hosts'].first)
+    assert_not_nil(actual_host['system_profile'])
+    assert_not_nil(actual_system_profile = actual_host['system_profile'])
+    assert_not_nil actual_host['subscription_manager_id']
+    assert_equal 'D30B0B42-7824-2635-C62D-491394DE43F7', actual_host['bios_uuid']
+    assert_equal 4, actual_system_profile['number_of_cpus']
+    assert_equal 2, actual_system_profile['number_of_sockets']
+    assert_equal 1_048_576, actual_system_profile['system_memory_bytes']
+    assert_equal 1, actual_system_profile['cores_per_socket']
+    assert_equal 'SeaBios', actual_host['bios_vendor']
+    assert_equal '10', actual_host['bios_version']
+    assert_equal '2', actual_host['cpu_socket(s)']
+    # Assert exclusion of non-minimal data collection fact
+    assert_nil actual_host['ip_addresses']
+    assert_nil actual_host['mac_addresses']
+    assert_nil actual_host['fqdn']
+    assert_equal 1, generator.hosts_count
+  end
+
   test 'hosts report fields should be present if fact exist' do
-    FactoryBot.create(:fact_value, fact_name: fact_names['cpu::cpu(s)'], value: '4', host: @host)
-    FactoryBot.create(:fact_value, fact_name: fact_names['cpu::cpu_socket(s)'], value: '2', host: @host)
-    FactoryBot.create(:fact_value, fact_name: fact_names['cpu::core(s)_per_socket'], value: '1', host: @host)
+    create_fact_values(@host,
+      'cpu::cpu(s)' => '4',
+      'cpu::cpu_socket(s)' => '2',
+      'cpu::core(s)_per_socket' => '1')
 
     batch = Host.where(id: @host.id).in_batches.first
     generator = create_generator(batch)
@@ -704,7 +912,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
   end
 
   test 'passes valid bios_uuid field' do
-    FactoryBot.create(:fact_value, fact_name: fact_names['dmi::system::uuid'], value: 'D30B0B42-7824-2635-C62D-491394DE43F7', host: @host)
+    create_fact_values(@host, 'dmi::system::uuid' => 'D30B0B42-7824-2635-C62D-491394DE43F7')
 
     batch = Host.where(id: @host.id).in_batches.first
     generator = create_generator(batch)

data/webpack/ForemanInventoryUpload/Components/Dashboard/Dashboard.js

@@ -49,6 +49,7 @@ class Dashboard extends React.Component {
       showFullScreen,
       activeTab,
     } = this.props;
+    const downloadButtonDisabled = () => account.report_file_paths.length === 0;
     return (
       <NavContainer
         items={[
@@ -60,6 +61,8 @@ class Dashboard extends React.Component {
               ...generating,
               restartProcess: this.handleRestart,
               exitCode: account.generate_report_status,
+              downloadReports: this.handleDownload,
+              downloadButtonDisabled,
               toggleFullScreen: this.handleToggleFullScreen,
             },
             onClick: () => this.handleTabChange('generating'),
@@ -70,7 +73,6 @@ class Dashboard extends React.Component {
             component: ReportUpload,
             props: {
               ...uploading,
-              downloadReports: this.handleDownload,
               exitCode: account.upload_report_status,
               toggleFullScreen: this.handleToggleFullScreen,
             },
@@ -117,6 +119,7 @@ Dashboard.propTypes = {
   account: PropTypes.shape({
     generate_report_status: PropTypes.string,
     upload_report_status: PropTypes.string,
+    report_file_paths: PropTypes.arrayOf(PropTypes.string),
   }),
   showFullScreen: PropTypes.bool,
   toggleFullScreen: PropTypes.func,
@@ -136,6 +139,7 @@ Dashboard.defaultProps = {
   account: {
     generate_report_status: 'unknown',
     upload_report_status: 'unknown',
+    report_file_paths: [],
   },
   showFullScreen: false,
   toggleFullScreen: noop,