foreman_rh_cloud 11.0.2 → 11.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f59aefea33a7933386cdc77e326b13ceca715d51f4fdf3c02905896363bcc33
-  data.tar.gz: 95b711179cb036dbfcb8a6261db1f6c9911ff931807a4a0d9765440534c30c8f
+  metadata.gz: a0510d9fc263ac8ff7313350cdcdf6fc82e0d13c35c5e8936463f1d5f7367d88
+  data.tar.gz: 14561397aed26a96af5a7105c24147c7cf31d9235ea987d065dcb451fb7b05a7
 SHA512:
-  metadata.gz: 4bf762fb0c67730e9317948e6ca74921717d8699fb532b4f3c196049ac38f5ba145d7a9a54122f9c18710e4ede293c4d35beb3e3b462b20e936acd8c5547ed8f
-  data.tar.gz: 91e0dceccebc4fb48d93c7916f0a229a0b1d2077f0319e67fa014ecb29f0adade7c28e6af1ac717d0b12488065031b37ecf20b84c816086d260385211d15e468
+  metadata.gz: 7947b880d5a0e7544f1e668d59f67bf5ec8169a4a0d0fd5922160949cd60636e1f8294637f033df4d1df18a624deb207d16da95292511731735e530f1d959534
+  data.tar.gz: 58f596790b70a0daa7174ba6360094d2bbf024cacce3cda74e2dedb8319333395df96ce0590c4cf397f3bd6ca3f5c36c89e839fe6fa364beb62314d533050483

data/README.md

@@ -15,7 +15,7 @@ for how to install Foreman plugins
 
 #### Inventory upload
 
-In UI: Configure -> Inventory Upload -> Restart
+In UI: Configure -> Inventory Upload -> Generate and upload report 
 
 From command-line:
 
@@ -46,7 +46,7 @@ From command-line:
 
 #### Synchronize inventory status
 
-In UI: Configure -> Inventory Upload -> Sync inventory status
+In UI: Configure -> Inventory Upload -> Sync all inventory status
 
 From command-line:
 

data/app/controllers/api/v2/advisor_engine/advisor_engine_controller.rb

@@ -0,0 +1,98 @@
+module Api
+  module V2
+    module AdvisorEngine
+      class AdvisorEngineController < ::Api::V2::BaseController
+        include ::Api::Version2
+        include Foreman::Controller::SmartProxyAuth
+        include ::Foreman::Controller::FilterParameters
+
+        filter_parameters :payload
+        add_smart_proxy_filters [:host_details, :upload_hits]
+
+        api :GET, "/advisor_engine/host_details", N_('Fetch Insights-related host details')
+        param :host_uuids, Array, required: true, desc: N_('List of host UUIDs')
+        def host_details
+          uuids = params.require(:host_uuids)
+          @hosts = ::Host.joins(:insights).where(:insights => { :uuid => uuids })
+          if @hosts.empty?
+            render json: { error: 'No hosts found for the given UUIDs' }, status: :not_found
+          else
+            respond_to do |format|
+              format.json { render 'api/v2/advisor_engine/host_details' }
+            end
+          end
+        end
+
+        api :PATCH, "/advisor_engine/upload_hits", N_("Upload hits from iop-advisor-engine")
+        param :host_name, String, required: true
+        param :host_uuid, String
+
+        param :payload, Hash, :desc => N_("iop payload including resolutions, rules, hits") do
+          param :resolutions, Array, :desc => N_("upload resolutions related to the hits") do
+            param :rule_id, String,  :desc => N_("rule id"), :required => true
+            param :description, String, :desc => N_("resolution description")
+            param :needs_reboot, :bool, :desc => N_("Whether the resolution requires reboot")
+            param :resolution_risk, String, :desc => N_("resolution risk")
+            param :resolution_type, String, :desc => N_("type")
+          end
+
+          param :rules, Array, :desc => N_("Upload rules related to the hits") do
+            param :rule_id, String, :desc => N_("rule id"), :required => true
+            param :description, String, :desc => N_("rule description")
+            param :category_name, String, :desc => N_("category name")
+            param :impact_name, String, :desc => N_("impact name")
+            param :summary, String, :desc => N_("summary")
+            param :generic, String, :desc => N_("generic")
+            param :reason, String, :desc => N_("reason")
+            param :total_risk, :number, :desc => N_("total risk")
+            param :reboot_required, :bool, :desc => N_("reboot required")
+            param :more_info, String, :desc => N_("more info")
+            param :rating, :number, :desc => N_("rating")
+          end
+
+          param :hits, Array, :desc => N_("Upload hits information") do
+            param :rule_id, String, :desc => N_("rule id"), :required => true
+            param :title, String, :desc => N_("rule title")
+            param :solution_url, String, :desc => N_("solution url")
+            param :total_risk, :number, :desc => N_("total risk")
+            param :likelihood, :number, :desc => N_("likelihood number")
+            param :publish_date, String, :desc => N_("publish date (YYYY-MM-DD)")
+            param :results_url, String, :desc => N_("result url")
+          end
+          param :details, String, :desc => N_("upload hits details json")
+        end
+
+        def upload_hits
+          host = Host.find_by(name: params.require(:host_name))
+          if host.blank?
+            render json: { error: 'No host found for the given host name' }, status: :not_found
+          else
+            hits_uploader = ForemanRhCloud::HitsUploader.new(host: host, payload: payload_params.to_h, uuid: params[:host_uuid])
+            hits_uploader.upload!
+            render json: {
+              action_status: 'success',
+            }, status: :ok
+          end
+        end
+
+        def payload_params
+          params.require(:payload).permit(
+            :details,
+            {
+              resolutions: [
+                :rule_id, :description, :needs_reboot, :resolution_risk, :resolution_type
+              ],
+              rules: [
+                :rule_id, :description, :category_name, :impact_name, :summary, :generic,
+                :reason, :total_risk, :reboot_required, :more_info, :rating
+              ],
+              hits: [
+                :rule_id, :title, :solution_url, :total_risk, :likelihood, :publish_date, :results_url
+              ],
+            }
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+module Api
+  module V2
+    module RhCloud
+      class AdvisorEngineConfigController < ::Api::V2::BaseController
+        include ::Api::Version2
+
+        api :GET, "/rh_cloud/advisor_engine_config", N_("Show if system is configured to use local iop-advisor-engine.")
+        def show
+          render json: {
+            use_local_advisor_engine: ForemanRhCloud.with_local_advisor_engine?,
+          }, status: :ok
+        end
+      end
+    end
+  end
+end

data/app/models/concerns/rh_cloud_host.rb

@@ -21,5 +21,10 @@ module RhCloudHost
     scoped_search :relation => :inventory_sync_status_object, :on => :status, :rename => :insights_inventory_sync_status,
       :complete_value => { :disconnect => ::InventorySync::InventoryStatus::DISCONNECT,
                            :sync => ::InventorySync::InventoryStatus::SYNC }
+    scoped_search :relation => :insights, :on => :uuid, :only_explicit => true, :rename => :insights_uuid
+
+    def insights_facet
+      insights
+    end
   end
 end

data/app/services/foreman_rh_cloud/cloud_connector.rb

@@ -17,7 +17,7 @@ module ForemanRhCloud
         :satellite_cloud_connector_password => token_value,
       }
 
-      if (http_proxy = ForemanRhCloud.proxy_setting(logger: Foreman::Logging.logger('app')))
+      if (http_proxy = ForemanRhCloud.proxy_setting)
         input[:satellite_cloud_connector_http_proxy] = http_proxy
       end
 

data/app/services/foreman_rh_cloud/cloud_request.rb

@@ -5,7 +5,7 @@ module ForemanRhCloud
     def execute_cloud_request(params)
       final_params = {
         verify_ssl: ForemanRhCloud.verify_ssl_method,
-        proxy: ForemanRhCloud.transformed_http_proxy_string(logger: logger),
+        proxy: ForemanRhCloud.transformed_http_proxy_string,
       }.deep_merge(params)
 
       response = RestClient::Request.execute(final_params)

data/app/services/foreman_rh_cloud/cloud_request_forwarder.rb

@@ -33,7 +33,8 @@ module ForemanRhCloud
           }
         ),
       }
-      base_params.merge(path_params(original_request.path, certs))
+      requested_url = original_request.original_fullpath.end_with?('/') ? original_request.path + '/' : original_request.path
+      base_params.merge(path_params(requested_url, certs))
     end
 
     def prepare_forward_payload(original_request, controller_name)

data/app/services/foreman_rh_cloud/hits_uploader.rb

@@ -0,0 +1,55 @@
+module ForemanRhCloud
+  class HitsUploader
+    def initialize(host:, payload:, uuid: nil)
+      @host = host
+      @uuid = uuid
+      @payload = payload
+    end
+
+    def upload!
+      ActiveRecord::Base.transaction do
+        update_facets
+        update_hits
+        update_rules_and_resolutions
+        update_details
+      end
+    end
+
+    private
+
+    def update_facets
+      facet = InsightsFacet.find_or_create_by(host_id: @host.id)
+      facet.update!(uuid: @uuid) if @uuid.present?
+      @host.reload
+    end
+
+    def update_hits
+      facet = @host.insights
+      facet.hits.delete_all
+      hits = @payload[:hits]
+      # rubocop:disable Rails/SkipsModelValidations
+      facet.hits.insert_all(hits) if hits.present?
+      # rubocop:enable Rails/SkipsModelValidations
+      InsightsFacet.reset_counters(facet.id, :hits_count)
+    end
+
+    def update_rules_and_resolutions
+      return if @payload[:rules].blank?
+      # rubocop:disable Rails/SkipsModelValidations
+      ::InsightsRule.upsert_all(@payload[:rules], unique_by: :rule_id)
+      rules = @payload[:rules].map { |rule| rule[:rule_id] }
+
+      return if @payload[:resolutions].blank?
+      ::InsightsResolution.where(rule_id: rules).delete_all
+      ::InsightsResolution.insert_all(@payload[:resolutions])
+      # rubocop:enable Rails/SkipsModelValidations
+    end
+
+    def update_details
+      return if @payload[:details].blank?
+      fact_name = FactName.where(name: "insights::hit_details", short_name: 'insights_details').first_or_create
+      fact_value = @host.fact_values.where(fact_name: fact_name).first_or_create
+      fact_value.update(value: @payload[:details])
+    end
+  end
+end

data/app/views/api/v2/advisor_engine/host_details.json.rabl

@@ -0,0 +1,9 @@
+collection @hosts
+
+attributes :name
+node :insights_uuid do |host|
+  host.insights_facet&.uuid
+end
+node :insights_hit_details do |host|
+  host&.facts('insights::hit_details')&.values&.first
+end

data/app/views/api/v2/hosts/insights/base.rabl

@@ -0,0 +1,5 @@
+attributes :uuid
+
+node :insights_hit_details do |facet|
+  facet&.host&.facts('insights::hit_details')&.values&.first
+end

data/app/views/api/v2/hosts/insights/insights.rabl

@@ -0,0 +1,3 @@
+node :insights_attributes do
+  partial 'api/v2/hosts/insights/base', object: @object&.insights_facet
+end

data/config/routes.rb

@@ -62,8 +62,13 @@ Rails.application.routes.draw do
 
       namespace 'rh_cloud' do
         post 'enable_connector', to: 'inventory#enable_cloud_connector'
-
         post 'cloud_request', to: 'cloud_request#update'
+        get 'advisor_engine_config', to: 'advisor_engine_config#show'
+      end
+
+      namespace 'advisor_engine' do
+        get 'host_details', to: 'advisor_engine#host_details'
+        patch 'upload_hits', to: 'advisor_engine#upload_hits'
       end
     end
   end

data/db/migrate/20241217190624_add_unique_index_to_rule_id_and_host_id_in_insights_hits.rb

@@ -0,0 +1,5 @@
+class AddUniqueIndexToRuleIdAndHostIdInInsightsHits < ActiveRecord::Migration[7.0]
+  def change
+    add_index :insights_hits, [:rule_id, :host_id], unique: true, name: 'index_insight_hits_on_rule_id_and_host_id'
+  end
+end

data/db/migrate/20241220184900_change_sync_insights_recommendations_to_true.rb

@@ -0,0 +1,5 @@
+class ChangeSyncInsightsRecommendationsToTrue < ActiveRecord::Migration[7.0]
+  def change
+    Setting.where(name: 'allow_auto_insights_sync')&.destroy_all
+  end
+end

data/lib/foreman_inventory_upload/async/generate_all_reports_job.rb

@@ -13,22 +13,30 @@ module ForemanInventoryUpload
           return
         end
 
-        after_delay do
-          organizations = Organization.unscoped.all
-
-          organizations.map do |organization|
-            total_hosts = ForemanInventoryUpload::Generators::Queries.for_org(organization.id, use_batches: false).count
-
-            if total_hosts <= ForemanInventoryUpload.max_org_size
-              disconnected = false
-              plan_generate_report(ForemanInventoryUpload.generated_reports_folder, organization, disconnected)
-            else
-              logger.info("Skipping automatic uploads for organization #{organization.name}, too many hosts (#{total_hosts}/#{ForemanInventoryUpload.max_org_size})")
-            end
-          end.compact
+        if ForemanRhCloud.with_local_advisor_engine?
+          plan_self # so that 'run' runs
+        else
+          after_delay do
+            organizations = Organization.unscoped.all
+
+            organizations.map do |organization|
+              total_hosts = ForemanInventoryUpload::Generators::Queries.for_org(organization.id, use_batches: false).count
+
+              if total_hosts <= ForemanInventoryUpload.max_org_size
+                disconnected = false
+                plan_generate_report(ForemanInventoryUpload.generated_reports_folder, organization, disconnected)
+              else
+                logger.info("Skipping automatic uploads for organization #{organization.name}, too many hosts (#{total_hosts}/#{ForemanInventoryUpload.max_org_size})")
+              end
+            end.compact
+          end
         end
       end
 
+      def run
+        output[:status] = _('The scheduled process is disabled because this Foreman is configured with the use_local_advisor_engine option.') if ForemanRhCloud.with_local_advisor_engine?
+      end
+
       def rescue_strategy_for_self
         Dynflow::Action::Rescue::Fail
       end

data/lib/foreman_inventory_upload/async/shell_process.rb

@@ -7,6 +7,7 @@ module ForemanInventoryUpload
       include ::ForemanRhCloud::Async::ExponentialBackoff
 
       def plan(instance_label, more_inputs = {})
+        clear_task_output(instance_label)
         inputs = more_inputs.merge(instance_label: instance_label)
         plan_self(inputs)
       end
@@ -53,6 +54,11 @@ module ForemanInventoryUpload
         Dynflow::Action::Rescue::Fail
       end
 
+      def clear_task_output(label)
+        TaskOutputLine.where(label: label).delete_all
+        TaskOutputStatus.where(label: label).delete_all
+      end
+
       private
 
       def preprocess_command(command)

data/lib/foreman_inventory_upload/async/upload_report_job.rb

@@ -51,7 +51,7 @@ module ForemanInventoryUpload
           'CER_PATH' => @cer_path
         )
 
-        http_proxy_string = ForemanRhCloud.http_proxy_string(logger: logger)
+        http_proxy_string = ForemanRhCloud.http_proxy_string
         if http_proxy_string
           env_vars['http_proxy'] = http_proxy_string
           env_vars['https_proxy'] = http_proxy_string

data/lib/foreman_inventory_upload/generators/queries.rb

@@ -28,6 +28,16 @@ module ForemanInventoryUpload
               'insights_client::hostname',
               'insights_client::ips',
               'insights_id',
+              'conversions::activity',
+              'conversions::packages::0::nevra',
+              'conversions::packages::0::signature',
+              'conversions::activity_started',
+              'conversions::activity_ended',
+              'conversions::success',
+              'conversions::source_os::name',
+              'conversions::source_os::version',
+              'conversions::target_os::name',
+              'conversions::target_os::version',
             ]).pluck(:name, :id)
           ]
       end

data/lib/foreman_inventory_upload/generators/slice.rb

@@ -40,6 +40,16 @@ module ForemanInventoryUpload
         end
       end
 
+      def report_conversions(host)
+        @stream.simple_field('convert2rhel_through_foreman', host.subscription_facet&.convert2rhel_through_foreman)
+        @stream.simple_field('activity', fact_value(host, 'conversions::activity'))
+        @stream.simple_field('packages_0_nevra', fact_value(host, 'conversions::packages::0::nevra'))
+        @stream.simple_field('packages_0_signature', fact_value(host, 'conversions::packages::0::signature'))
+        @stream.simple_field('activity_started', fact_value(host, 'conversions::activity_started'))
+        @stream.simple_field('activity_ended', fact_value(host, 'conversions::activity_ended'))
+        @stream.simple_field('success', ActiveModel::Type::Boolean.new.cast(fact_value(host, 'conversions::success')), :last)
+      end
+
       def report_host(host)
         host_ips_cache = host_ips(host)
         @stream.object do
@@ -47,7 +57,19 @@ module ForemanInventoryUpload
           @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))
-          @stream.simple_field('convert2rhel_through_foreman', host.subscription_facet&.convert2rhel_through_foreman)
+          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
+          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')))

data/lib/foreman_rh_cloud/engine.rb

@@ -42,7 +42,7 @@ module ForemanRhCloud
           settings do
             category(:rh_cloud, N_('RHCloud')) do
               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: false, full_name: N_('Synchronize recommendations Automatically'))
+              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'))
@@ -74,6 +74,7 @@ module ForemanRhCloud
               'foreman_inventory_upload/cloud_status': [:index],
               'foreman_inventory_upload/uploads_settings': [:index],
               'foreman_inventory_upload/missing_hosts': [:index],
+              'api/v2/rh_cloud/advisor_engine_config': [:show],
               'react': [:index]
             )
             permission(
@@ -105,13 +106,21 @@ module ForemanRhCloud
             Role::MANAGER => plugin_permissions,
             Role::SYSTEM_ADMIN => plugin_permissions
 
-          # Adding a sub menu after hosts menu
-          divider :top_menu, caption: N_('RH Cloud'), parent: :configure_menu
-          menu :top_menu, :inventory_upload, caption: N_('Inventory Upload'), url: '/foreman_rh_cloud/inventory_upload', url_hash: { controller: :react, action: :index }, parent: :configure_menu
-          menu :top_menu, :insights_hits, caption: N_('Insights'), url: '/foreman_rh_cloud/insights_cloud', url_hash: { controller: :react, action: :index }, parent: :configure_menu
+          # Adding a top-level menu item
+          sub_menu :top_menu, :insights_menu, caption: N_('Insights'), icon: 'fa fa-cloud', after: :hosts_menu do
+            menu :top_menu,
+              :inventory_upload,
+              caption: N_('Inventory Upload'),
+              url: '/foreman_rh_cloud/inventory_upload',
+              url_hash: { controller: :react, action: :index },
+              parent: :insights_menu,
+              if: -> { !ForemanRhCloud.with_local_advisor_engine? }
+            menu :top_menu, :insights_hits, caption: N_('Recommendations'), url: '/foreman_rh_cloud/insights_cloud', url_hash: { controller: :react, action: :index }, parent: :insights_menu
+          end
 
           register_facet InsightsFacet, :insights do
             configure_host do
+              api_view :list => 'api/v2/hosts/insights/insights'
               set_dependent_action :destroy
             end
           end
@@ -151,6 +160,12 @@ module ForemanRhCloud
       end
     end
 
+    initializer "foreman_rh_cloud.add_rabl_view_path" do
+      Rabl.configure do |config|
+        config.view_paths << ForemanRhCloud::Engine.root.join('app', 'views')
+      end
+    end
+
     initializer 'foreman_rh_cloud.register_scheduled_tasks', :before => :finisher_hook do |_app|
       # skip database manipulations while tables do not exist, like in migrations
       # skip object creation when admin user is not present, for example in test DB
@@ -193,4 +208,8 @@ module ForemanRhCloud
       end
     end
   end
+
+  def self.with_local_advisor_engine?
+    SETTINGS.dig(:foreman_rh_cloud, :use_local_advisor_engine) || false
+  end
 end

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '11.0.2'.freeze
+  VERSION = '11.1.0'.freeze
 end

data/lib/foreman_rh_cloud.rb

@@ -3,17 +3,27 @@ require 'cgi'
 require 'uri'
 
 module ForemanRhCloud
+  def self.on_premise_url
+    return unless ForemanRhCloud.with_local_advisor_engine?
+    port = ENV['ADVISOR_ENGINE_PORT'] || "24443"
+    ENV['ADVISOR_ENGINE_URL'] || "https://localhost:#{port}"
+  end
+
+  def self.env_or_on_premise_url(env_var_name)
+    ENV[env_var_name] || on_premise_url
+  end
+
   def self.base_url
     # for testing set ENV to 'https://ci.cloud.redhat.com'
-    @base_url ||= ENV['SATELLITE_RH_CLOUD_URL'] || 'https://cloud.redhat.com'
+    @base_url ||= env_or_on_premise_url('SATELLITE_RH_CLOUD_URL') || 'https://cloud.redhat.com'
   end
 
   def self.cert_base_url
-    @cert_base_url ||= ENV['SATELLITE_CERT_RH_CLOUD_URL'] || 'https://cert.cloud.redhat.com'
+    @cert_base_url ||= env_or_on_premise_url('SATELLITE_CERT_RH_CLOUD_URL') || 'https://cert.cloud.redhat.com'
   end
 
   def self.legacy_insights_url
-    @legacy_insights_url ||= ENV['SATELLITE_LEGACY_INSIGHTS_URL'] || 'https://cert-api.access.redhat.com'
+    @legacy_insights_url ||= env_or_on_premise_url('SATELLITE_LEGACY_INSIGHTS_URL') || 'https://cert-api.access.redhat.com'
   end
 
   def self.verify_ssl_method
@@ -24,21 +34,20 @@ module ForemanRhCloud
     @query_limit ||= ENV['SATELLITE_RH_CLOUD_QUERY_LIMIT'] ? ENV['SATELLITE_RH_CLOUD_QUERY_LIMIT'].to_i : 100
   end
 
-  def self.http_proxy_string(logger: Foreman::Logging.logger('background'))
-    ForemanRhCloud.proxy_setting(logger: logger)
+  def self.http_proxy_string
+    ForemanRhCloud.proxy_setting
   end
 
-  def self.transformed_http_proxy_string(logger: Foreman::Logging.logger('background'))
-    ForemanRhCloud.transform_scheme(ForemanRhCloud.proxy_setting(logger: logger))
+  def self.transformed_http_proxy_string
+    ForemanRhCloud.transform_scheme(ForemanRhCloud.proxy_setting)
   end
 
-  def self.proxy_setting(logger: Foreman::Logging.logger('background'))
-    fix_port(proxy_string(logger: logger))
+  def self.proxy_setting
+    fix_port(proxy_string)
   end
 
-  def self.proxy_string(logger: Foreman::Logging.logger('background'))
+  def self.proxy_string
     HttpProxy.default_global_content_proxy&.full_url ||
-    ForemanRhCloud.cdn_proxy(logger: logger) ||
     ForemanRhCloud.global_foreman_proxy ||
     ''
   end
@@ -52,25 +61,6 @@ module ForemanRhCloud
     uri.to_s
   end
 
-  def self.cdn_proxy(logger: Foreman::Logging.logger('app'))
-    proxy_config = SETTINGS[:katello][:cdn_proxy]
-    return nil unless proxy_config
-
-    uri = URI('')
-    uri.host = proxy_config[:host]
-    uri.port = proxy_config[:port]
-    uri.scheme = proxy_config[:scheme] || 'http'
-
-    if proxy_config[:user]
-      uri.user = CGI.escape(proxy_config[:user])
-      uri.password = CGI.escape(proxy_config[:password])
-    end
-    uri.to_s
-  rescue URI::Error => e
-    logger.warn("cdn_proxy parsing failed: #{e}")
-    nil
-  end
-
   def self.global_foreman_proxy
     Setting[:http_proxy]
   end
@@ -114,7 +104,7 @@ module ForemanRhCloud
   end
 
   def self.legacy_insights_ca
-    "#{ForemanRhCloud::Engine.root}/config/rh_cert-api_chain.pem"
+    "#{ForemanRhCloud::Engine.root}/config/rh_cert-api_chain.pem" unless ForemanRhCloud.with_local_advisor_engine?
   end
 
   def self.cloud_url_validator

data/lib/insights_cloud/async/insights_scheduled_sync.rb

@@ -13,11 +13,19 @@ module InsightsCloud
           return
         end
 
-        after_delay do
-          plan_full_sync
+        if ForemanRhCloud.with_local_advisor_engine?
+          plan_self
+        else
+          after_delay do
+            plan_full_sync # so that 'run' runs
+          end
         end
       end
 
+      def run
+        output[:status] = _('The scheduled process is disabled because this Foreman is configured with the use_local_advisor_engine option.') if ForemanRhCloud.with_local_advisor_engine?
+      end
+
       def plan_full_sync
         plan_action(InsightsFullSync, Organization.unscoped.all)
       end

data/lib/inventory_sync/async/inventory_scheduled_sync.rb

@@ -13,13 +13,17 @@ module InventorySync
           return
         end
 
-        after_delay do
-          # perform a sequence of sync then delete in parallel for all organizations
-          concurrence do
-            Organization.unscoped.each do |org|
-              sequence do
-                plan_org_sync(org)
-                plan_remove_insights_hosts(org.id) if Setting[:allow_auto_insights_mismatch_delete]
+        if ForemanRhCloud.with_local_advisor_engine?
+          plan_self # so that 'run' runs
+        else
+          after_delay do
+            # perform a sequence of sync then delete in parallel for all organizations
+            concurrence do
+              Organization.unscoped.each do |org|
+                sequence do
+                  plan_org_sync(org)
+                  plan_remove_insights_hosts(org.id) if Setting[:allow_auto_insights_mismatch_delete]
+                end
               end
             end
           end
@@ -30,6 +34,10 @@ module InventorySync
         plan_action InventoryFullSync, org
       end
 
+      def run
+        output[:status] = _('The scheduled process is disabled because this Foreman is configured with the use_local_advisor_engine option.') if ForemanRhCloud.with_local_advisor_engine?
+      end
+
       def plan_remove_insights_hosts(org_id)
         # plan a remove hosts action with search set to empty (all records)
         plan_action(ForemanInventoryUpload::Async::RemoveInsightsHostsJob, '', org_id)