foreman_rh_cloud 11.1.0 → 11.3.0

data/app/controllers/insights_cloud/api/machine_telemetries_controller.rb

@@ -16,7 +16,17 @@ 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
+
+      return render json: { message: @cloud_response.to_s }, status: :gateway_timeout if @cloud_response.is_a?(RestClient::Exceptions::OpenTimeout)
 
       if @cloud_response.code == 401
         return render json: {

data/app/services/foreman_rh_cloud/cloud_request_forwarder.rb

@@ -17,8 +17,8 @@ module ForemanRhCloud
       logger.debug("Sending request to: #{request_opts[:url]}")
 
       execute_cloud_request(request_opts)
-    rescue RestClient::Exception => error_response
-      error_response.response
+    rescue RestClient::ExceptionWithResponse => error_response
+      error_response.response.presence || error_response.exception
     end
 
     def prepare_request_opts(original_request, forward_payload, forward_params, certs)
@@ -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

@@ -35,14 +35,9 @@ module ForemanRhCloud
 
     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
+      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

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/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,8 +65,10 @@ Rails.application.routes.draw do
       end
 
       namespace 'rh_cloud' do
-        post 'enable_connector', to: 'inventory#enable_cloud_connector'
-        post 'cloud_request', to: 'cloud_request#update'
+        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
 

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/upload_report_job.rb

@@ -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_rh_cloud/engine.rb

@@ -40,7 +40,7 @@ module ForemanRhCloud
           apipie_documented_controllers ["#{ForemanRhCloud::Engine.root}/app/controllers/api/v2/**/*.rb"]
 
           settings do
-            category(:rh_cloud, N_('RHCloud')) do
+            category(:rh_cloud, N_('Insights')) 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: 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'))

data/lib/foreman_rh_cloud/version.rb

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

data/lib/insights_cloud/async/insights_full_sync.rb

@@ -9,10 +9,11 @@ module InsightsCloud
 
       def plan(organizations)
         organizations = organizations.select do |organization|
-          if cert_auth_available?(organization)
+          checker = ::Katello::UpstreamConnectionChecker.new(organization)
+          if cert_auth_available?(organization) && !organization.manifest_expired? && checker.can_connect?
             true
           else
-            logger.debug("Certificate is not available for org: #{organization.name}, skipping insights sync")
+            logger.info("A manifest is not available for org: #{organization.name}, or it has expired, or been deleted. skipping insights sync")
             false
           end
         end
@@ -20,19 +21,23 @@ module InsightsCloud
         sequence do
           # This can be turned off when we enable automatic status syncs
           # This step will query cloud inventory to retrieve inventory uuids for each host
-          plan_hosts_sync(organizations)
-          plan_self(organization_ids: organizations.map(&:id))
-          concurrence do
-            plan_rules_sync(organizations)
-            plan_notifications
+          valid_organizations = organizations.reject(&:manifest_expired?)
+          if valid_organizations.any?
+            plan_hosts_sync(organizations)
+            plan_self(organization_ids: organizations.map(&:id))
+            concurrence do
+              plan_rules_sync(organizations)
+              plan_notifications
+            end
           end
         end
       end
 
       def try_execute
         organizations.each do |organization|
-          unless cert_auth_available?(organization)
-            logger.debug("Certificate is not available for org: #{organization.name}, skipping insights sync")
+          checker = ::Katello::UpstreamConnectionChecker.new(organization)
+          if !cert_auth_available?(organization) && organization.manifest_expired && !checker.can_connect?
+            logger.info("A manifest is not available for org: #{organization.name}, or it has expired, or been deleted. skipping insights sync")
             next
           end
 

data/lib/insights_cloud/async/insights_resolutions_sync.rb

@@ -13,7 +13,11 @@ module InsightsCloud
           InsightsResolution.delete_all
           rule_ids = relevant_rules
           Organization.all.each do |organization|
-            next if !cert_auth_available?(organization) || organization.manifest_expired?
+            checker = ::Katello::UpstreamConnectionChecker.new(organization)
+            if !cert_auth_available?(organization) || organization.manifest_expired? || !checker.can_connect?
+              logger.info("A manifest is not available for org: #{organization.name}, or it has expired, or been deleted. skipping resolutions sync")
+              next
+            end
             api_response = query_insights_resolutions(rule_ids, organization) unless rule_ids.empty?
             written_rules = write_resolutions(api_response) if api_response
             rule_ids -= Array(written_rules)

data/lib/insights_cloud.rb

@@ -29,6 +29,10 @@ module InsightsCloud
     'host_registration_insights'
   end
 
+  def self.enable_client_param_inventory
+    'host_registration_insights_inventory'
+  end
+
   def self.enable_cloud_remediations_param
     'enable_cloud_remediations'
   end

data/lib/tasks/insights.rake

@@ -24,13 +24,16 @@ namespace :rh_cloud_insights do
   desc "Re-announce all organizations into Sources on RH cloud."
   task announce_to_sources: [:environment] do
     logger = Logging::Logger.new(STDOUT)
-    Organization.unscoped.each do |org|
-      presence = ForemanRhCloud::CloudPresence.new(org, logger)
-      presence.announce_to_sources
-    rescue StandardError => ex
-      logger.warn(ex)
+    if ForemanRhCloud.with_local_advisor_engine?
+      logger.warn('Task announce_to_sources is not available when using local advisor engine')
+    else
+      Organization.unscoped.each do |org|
+        presence = ForemanRhCloud::CloudPresence.new(org, logger)
+        presence.announce_to_sources
+      rescue StandardError => ex
+        logger.warn(ex)
+      end
+      logger.info('Reannounced all organizations')
     end
-
-    logger.info('Reannounced all organizations')
   end
 end

data/lib/tasks/rh_cloud_inventory.rake

@@ -9,10 +9,15 @@ namespace :rh_cloud_inventory do
       else
         organizations = [Organization.where(:id => ENV['organization_id']).first]
       end
-
+      disconnected = ForemanRhCloud.with_local_advisor_engine?
       User.as_anonymous_admin do
         organizations.each do |organization|
-          ForemanTasks.async_task(ForemanInventoryUpload::Async::GenerateReportJob, ForemanInventoryUpload.generated_reports_folder, organization.id, false)
+          ForemanTasks.async_task(
+            ForemanInventoryUpload::Async::GenerateReportJob,
+            ForemanInventoryUpload.generated_reports_folder,
+            organization.id,
+            disconnected
+          )
           puts "Generated and uploaded inventory report for organization '#{organization.name}'"
         end
       end
@@ -47,7 +52,7 @@ namespace :rh_cloud_inventory do
       base_folder = ENV['target'] || ForemanInventoryUpload.generated_reports_folder
       organization_id = ENV['organization_id']
       report_file = ForemanInventoryUpload.facts_archive_name(organization_id)
-      disconnected = false
+      disconnected = ForemanRhCloud.with_local_advisor_engine?
       ForemanTasks.sync_task(ForemanInventoryUpload::Async::QueueForUploadJob, base_folder, report_file, organization_id, disconnected)
       puts "Uploaded #{report_file}"
     end

data/locale/Makefile

@@ -31,9 +31,16 @@ all-mo: $(MOFILES)
 	cat $@
 	! grep -q msgid $@
 
-%.edit.po:
+%.edit.po: %.po.time_stamp
 	touch $@
 
+# gettext will trash the .edit.po file if the time stamp doesn't exist or is older than the po file
+%.po.time_stamp: %.po
+	touch --reference $< $@
+
+# Prevent make from treating this as an intermediate file to be cleaned up
+.PRECIOUS: %.po.time_stamp
+
 check: $(POXFILES)
 
 # Unify duplicate translations
@@ -43,7 +50,10 @@ uniq-po:
 	done
 
 tx-pull: $(EDITFILES)
-	cd .. && tx pull -f --all
+	# Initialize new languages
+	cd .. && tx pull -f --all --minimum-perc 50
+	# Force update all existing languages
+	cd .. && tx pull -f --minimum-perc 0
 	for f in $(EDITFILES) ; do \
 		sed -i 's/^\("Project-Id-Version: \).*$$/\1$(DOMAIN) $(VERSION)\\n"/' $$f; \
 	done