foreman_rh_cloud 11.0.3 → 11.2.0

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/controllers/insights_cloud/api/machine_telemetries_controller.rb

@@ -16,7 +16,15 @@ module InsightsCloud::Api
     # The method that "proxies" requests over to Cloud
     def forward_request
       certs = candlepin_id_cert @organization
-      @cloud_response = ::ForemanRhCloud::CloudRequestForwarder.new.forward_request(request, controller_name, @branch_id, certs)
+      begin
+        @cloud_response = ::ForemanRhCloud::CloudRequestForwarder.new.forward_request(request, controller_name, @branch_id, certs)
+      rescue RestClient::Exception => e
+        logger.info("Forwarding request failed with exception: #{e}")
+        return render json: { error: e }, status: :bad_gateway
+      rescue RestClient::Timeout => e
+        logger.info("Forwarding request failed with timeout: #{e}")
+        return render json: { error: e }, status: :gateway_timeout
+      end
 
       if @cloud_response.code == 401
         return render json: {

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

@@ -17,7 +17,7 @@ module ForemanRhCloud
       logger.debug("Sending request to: #{request_opts[:url]}")
 
       execute_cloud_request(request_opts)
-    rescue RestClient::Exception => error_response
+    rescue RestClient::ExceptionWithResponse => error_response
       error_response.response
     end
 
@@ -52,7 +52,9 @@ module ForemanRhCloud
 
     def prepare_forward_params(original_request, branch_id)
       forward_params = original_request.query_parameters
-      if original_request.user_agent && !original_request.user_agent.include?('redhat_access_cfme')
+      compliance_request = original_request.path.match?(/compliance\/v2(\/.*)?/)
+      user_agent = original_request.user_agent.present? && !original_request.user_agent.include?('redhat_access_cfme')
+      if user_agent && !compliance_request
         forward_params = forward_params.merge(:branch_id => branch_id)
       end
 

data/app/services/foreman_rh_cloud/hits_uploader.rb

@@ -0,0 +1,50 @@
+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?
+      rule_ids = @payload[:rules].map { |rule| rule[:rule_id] }
+      has_missing_rules = InsightsRule.where(rule_id: rule_ids).count != rule_ids.count
+      RulesIngester.new.ingest_rules_and_resolutions! if has_missing_rules
+    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/services/foreman_rh_cloud/rules_ingester.rb

@@ -0,0 +1,61 @@
+module ForemanRhCloud
+  class RulesIngester
+    def ingest_rules_and_resolutions!
+      rules, resolutions = fetch_rules_and_resolutions
+      # rubocop:disable Rails/SkipsModelValidations
+      ::InsightsRule.upsert_all(rules, unique_by: :rule_id)
+      ::InsightsResolution.delete_all
+      ::InsightsResolution.insert_all(resolutions)
+      # rubocop:enable Rails/SkipsModelValidations
+    end
+
+    private
+
+    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)
+    end
+
+    def fetch_rules_and_resolutions
+      rules = fetch_rules_data.values.map do |rule|
+        next unless rule[:active]
+        next if rule[:playbooks].blank?
+        rule.slice(:description, :category,
+          :impact_name, :summary, :generic, :reason,
+          :rec_likelihood, :rec_impact, :reboot_required,
+          :more_info, :rule_id, :playbooks)
+      end
+      rules.compact!
+
+      resolutions = rules.flat_map do |rule|
+        rule[:playbooks].map do |fix_type, playbook|
+          {
+            rule_id: rule[:rule_id],
+            description: playbook[:name],
+            needs_reboot: playbook[:reboot_required] == true,
+            resolution_risk: rule[:resolution_risk],
+            resolution_type: fix_type,
+          }
+        end
+      end
+
+      rules.map! do |rule|
+        {
+          rule_id: rule[:rule_id],
+          description: rule[:description],
+          category_name: rule[:category],
+          impact_name: rule[:impact_name],
+          summary: rule[:summary],
+          generic: rule[:generic],
+          reason: rule[:reason],
+          total_risk: ((rule[:rec_likelihood] + rule[:rec_impact]) / 2).to_i,
+          reboot_required: rule[:reboot_required] == true,
+          more_info: rule[:more_info],
+          rating: 0,
+        }
+      end
+
+      [rules, resolutions]
+    end
+  end
+end

data/app/services/foreman_rh_cloud/template_renderer_helper.rb

@@ -25,7 +25,7 @@ module ForemanRhCloud
       returns String, desc: 'Playbook downloaded from the cloud'
     end
     def download_rh_playbook(playbook_url, organization_id)
-      retriever = ForemanRhCloud::UrlRemediationsRetriever.new(url: playbook_url, organization_id: organization_id, logger: template_logger)
+      retriever = ForemanRhCloud::URLRemediationsRetriever.new(url: playbook_url, organization_id: organization_id, logger: template_logger)
 
       cached("rh_playbook_#{playbook_url}") do
         retriever.create_playbook

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

@@ -9,7 +9,9 @@ Rails.application.routes.draw do
     get 'settings', to: 'uploads_settings#index'
     post 'setting', to: 'uploads_settings#set_advanced_setting'
 
-    post 'cloud_connector', to: 'uploads#enable_cloud_connector'
+    unless ForemanRhCloud.with_local_advisor_engine?
+      post 'cloud_connector', to: 'uploads#enable_cloud_connector'
+    end
 
     resources :tasks, only: [:create, :show]
 
@@ -31,7 +33,9 @@ Rails.application.routes.draw do
   end
 
   namespace :foreman_rh_cloud do
-    get 'inventory_upload', to: '/react#index'
+    unless ForemanRhCloud.with_local_advisor_engine?
+      get 'inventory_upload', to: '/react#index'
+    end
     get 'insights_cloud', to: '/react#index' # Uses foreman's react controller
   end
 
@@ -61,9 +65,16 @@ Rails.application.routes.draw do
       end
 
       namespace 'rh_cloud' do
-        post 'enable_connector', to: 'inventory#enable_cloud_connector'
+        unless ForemanRhCloud.with_local_advisor_engine?
+          post 'enable_connector', to: 'inventory#enable_cloud_connector'
+          post 'cloud_request', to: 'cloud_request#update'
+        end
+        get 'advisor_engine_config', to: 'advisor_engine_config#show'
+      end
 
-        post 'cloud_request', to: 'cloud_request#update'
+      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/db/seeds.d/189_add_host_inventory_param.rb

@@ -0,0 +1,7 @@
+CommonParameter.without_auditing do
+  params = [
+    { name: "host_registration_insights_inventory", key_type: "boolean", value: true },
+  ]
+
+  params.each { |param| CommonParameter.find_or_create_by(param) }
+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/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
@@ -78,7 +78,7 @@ module ForemanInventoryUpload
       end
 
       def content_disconnected?
-        Setting[:content_disconnected]
+        !Setting[:subscription_connection_enabled]
       end
     end
   end

data/lib/foreman_inventory_upload/generators/queries.rb

@@ -44,7 +44,7 @@ module ForemanInventoryUpload
 
       def self.for_slice(base)
         base
-          .search_for("not params.#{InsightsCloud.enable_client_param} = f")
+          .search_for("not params.#{InsightsCloud.enable_client_param_inventory} = f")
           .joins(:subscription_facet)
           .preload(
             :interfaces,

data/lib/foreman_inventory_upload/generators/slice.rb

@@ -47,7 +47,7 @@ module ForemanInventoryUpload
         @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', fact_value(host, 'conversions::success') || false, :last)
+        @stream.simple_field('success', ActiveModel::Type::Boolean.new.cast(fact_value(host, 'conversions::success')), :last)
       end
 
       def report_host(host)

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.3'.freeze
+  VERSION = '11.2.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