foreman_rh_cloud 11.4.0 → 12.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5dded98b552dea7166e0066c2eb60dfcd9f9c5b1ac4311ded2112c791cfd07eb
-  data.tar.gz: ff43c40fe389fbdd371b2e5dc63034f7481cfe9802fb56b04d87f0ae4d5ad0a4
+  metadata.gz: bc6fa218e9a87166dd1b6ea44dc00f52dc4a0ee28edaa6363bfd74fd0e93c17c
+  data.tar.gz: 80d9b1dcfa4a2e1589d2273b895360d237e84101d0e2a216a18ffc0d9259e14d
 SHA512:
-  metadata.gz: e7af166c1a563dcd8a3e8da3c05b2c884893478fe2f622ba6e03390469c56c2e53cdcbd4463d7fe9a207f66d001971655fcb45bb526216f1eb3bfb2718b64589
-  data.tar.gz: bfbc64a2087a4e8b349bc2758e6844350a0eab487a6fc4372e43b6c2eb923f7ea0e3200cc3e6c2312b45aa4fb8d66fcd65b668ef50e0adc27bc14131b1e6d50f
+  metadata.gz: 4e76e623f5509cd2bedab0fcd8abf926d7380eee120d1c73fc7f3be32ec9fe97cfc3948f56e93436ac21431ec8a5f85b4f8f349d1fe5df05bcad9d4e043eb332
+  data.tar.gz: d6f0d6140787ba18bc69bcf4de2161795a4404530fd24bd4502c352d1e87e1d13bd447049b220901edc48f0fbb9fde78ce73b737dea5435fc841d70f6c1a38bf

data/app/controllers/api/v2/rh_cloud/inventory_controller.rb

@@ -18,10 +18,10 @@ module Api
 
         api :POST, "/organizations/:organization_id/rh_cloud/report", N_("Start report generation")
         param :organization_id, Integer, required: true, desc: N_("Set the current organization context for the request")
-        param :disconnected, :bool, required: false, default: false, desc: N_('Generate the report, but do not upload')
+        param :no_upload, :bool, required: false, default: false, desc: N_('Generate the report, but do not upload')
         def generate_report
           organization_id = params[:organization_id]
-          disconnected = params[:disconnected] || false
+          disconnected = params[:no_upload] || false
 
           start_report_generation(organization_id, disconnected)
 

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)

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/lib/foreman_inventory_upload/async/queue_for_upload_job.rb

@@ -3,7 +3,7 @@ module ForemanInventoryUpload
     class QueueForUploadJob < ::Actions::EntryAction
       def plan(base_folder, report_file, organization_id, disconnected)
         enqueue_task = plan_self(base_folder: base_folder, report_file: report_file)
-        plan_upload_report(enqueue_task.output[:enqueued_file_name], organization_id) unless disconnected
+        plan_upload_report(enqueue_task.output[:enqueued_file_name], organization_id, disconnected)
       end
 
       def run
@@ -59,8 +59,8 @@ module ForemanInventoryUpload
         input[:report_file]
       end
 
-      def plan_upload_report(enqueued_file_name, organization_id)
-        plan_action(UploadReportJob, enqueued_file_name, organization_id)
+      def plan_upload_report(enqueued_file_name, organization_id, disconnected)
+        plan_action(UploadReportJob, enqueued_file_name, organization_id, disconnected)
       end
     end
   end

data/lib/foreman_inventory_upload/async/upload_report_job.rb

@@ -7,15 +7,15 @@ module ForemanInventoryUpload
         "upload_for_#{label}"
       end
 
-      def plan(filename, organization_id)
+      def plan(filename, organization_id, disconnected = false)
         label = UploadReportJob.output_label(organization_id)
-        super(label, filename: filename, organization_id: organization_id)
+        super(label, filename: filename, organization_id: organization_id, disconnected: disconnected)
       end
 
       def try_execute
         if content_disconnected?
           progress_output do |progress_output|
-            progress_output.write_line('Upload was stopped since disconnected mode setting is enabled for content on this instance.')
+            progress_output.write_line('Upload canceled because connection to Insights is not enabled or the --no-upload option was passed.')
             progress_output.status = "Task aborted, exit 1"
             done!
           end
@@ -78,7 +78,7 @@ module ForemanInventoryUpload
       end
 
       def content_disconnected?
-        !Setting[:subscription_connection_enabled]
+        input[:disconnected] || !Setting[:subscription_connection_enabled]
       end
     end
   end

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 = '11.4.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": "11.4.0",
+  "version": "12.1.0",
   "description": "Inventory Upload =============",
   "main": "index.js",
   "scripts": {
@@ -19,13 +19,13 @@
     "url": "http://projects.theforeman.org/projects/foreman_rh_cloud/issues"
   },
   "peerDependencies": {
-    "@theforeman/vendor": ">= 10.1.1"
+    "@theforeman/vendor": ">= 15.0.1"
   },
   "devDependencies": {
     "@babel/core": "^7.7.0",
-    "@theforeman/builder": ">= 10.1.1",
-    "@theforeman/test": ">= 10.1.1",
-    "@theforeman/eslint-plugin-foreman": ">= 10.1.1",
+    "@theforeman/builder": ">= 15.0.1",
+    "@theforeman/test": ">= 15.0.1",
+    "@theforeman/eslint-plugin-foreman": ">= 15.0.1",
     "babel-eslint": "~10.0.0",
     "eslint": "~6.7.2",
     "eslint-plugin-spellcheck": "~0.0.17",

data/test/controllers/inventory_upload/api/inventory_controller_test.rb

@@ -14,7 +14,7 @@ module InventoryUpload::Api
         .expects(:start_report_generation)
         .with(@test_org.id.to_s, @disconnected)
 
-      post :generate_report, params: { organization_id: @test_org.id, disconnected: @disconnected }
+      post :generate_report, params: { organization_id: @test_org.id, no_upload: @disconnected }
 
       assert_response :success
     end

data/test/jobs/upload_report_job_test.rb

@@ -18,7 +18,7 @@ class UploadReportJobTest < ActiveSupport::TestCase
 
     label = ForemanInventoryUpload::Async::UploadReportJob.output_label(organization.id)
     progress_output = ForemanInventoryUpload::Async::ProgressOutput.get(label)
-    assert_match(/Upload was stopped/, progress_output.full_output)
+    assert_match(/Upload canceled/, progress_output.full_output)
     assert_match(/exit 1/, progress_output.status)
   end