foreman_rh_cloud 11.1.0 → 11.2.0

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/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

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

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

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

data/locale/en/foreman_rh_cloud.po

@@ -1,21 +1,23 @@
-# foreman_rh_cloud
-#
-# This file is distributed under the same license as foreman_rh_cloud.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the foreman_rh_cloud package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: version 0.0.1\n"
+"Project-Id-Version: foreman_rh_cloud 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2014-08-20 08:54+0100\n"
-"Last-Translator: Foreman Team <foreman-dev@googlegroups.com>\n"
-"Language-Team: Foreman Team <foreman-dev@googlegroups.com>\n"
+"PO-Revision-Date: 2025-02-10 20:07+0100\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-msgid " Sync inventory status"
+msgid " Sync all inventory status"
 msgstr ""
 
 msgid "%s organizations"
@@ -81,10 +83,10 @@ msgstr ""
 msgid "Configure"
 msgstr ""
 
-msgid "Configure Cloud Connector"
+msgid "Configure Cloud Connector on given hosts"
 msgstr ""
 
-msgid "Configure Cloud Connector on given hosts"
+msgid "Configure cloud connector"
 msgstr ""
 
 msgid "Connectivity test"
@@ -147,6 +149,9 @@ msgstr ""
 msgid "Exit Code: %s"
 msgstr ""
 
+msgid "Fetch Insights-related host details"
+msgstr ""
+
 msgid "Fetching data about your accounts"
 msgstr ""
 
@@ -171,13 +176,16 @@ msgstr ""
 msgid "Full Screen"
 msgstr ""
 
+msgid "Generate and upload report"
+msgstr ""
+
 msgid "Generate the report, but do not upload"
 msgstr ""
 
 msgid "Generating"
 msgstr ""
 
-msgid "Go to Satellite Insights page"
+msgid "Go to Foreman Insights page"
 msgstr ""
 
 msgid "Go to first page"
@@ -219,9 +227,6 @@ msgstr ""
 msgid "Insights"
 msgstr ""
 
-msgid "Insights synchronization process is used to provide Insights recommendations output for hosts managed here."
-msgstr ""
-
 msgid "Inventory"
 msgstr ""
 
@@ -243,6 +248,9 @@ msgstr ""
 msgid "Knowledgebase article"
 msgstr ""
 
+msgid "List of host UUIDs"
+msgstr ""
+
 msgid "Loading"
 msgstr ""
 
@@ -345,7 +353,7 @@ msgstr ""
 msgid "Recommendations synced successfully"
 msgstr ""
 
-msgid "Reconfigure Cloud Connector"
+msgid "Reconfigure cloud connector"
 msgstr ""
 
 msgid "Red Hat Cloud Inventory"
@@ -375,9 +383,6 @@ msgstr ""
 msgid "Resolution"
 msgstr ""
 
-msgid "Restart"
-msgstr ""
-
 msgid "Run RH Cloud playbook"
 msgstr ""
 
@@ -408,6 +413,9 @@ msgstr ""
 msgid "Show Advanced Settings"
 msgstr ""
 
+msgid "Show if system is configured to use local iop-advisor-engine."
+msgstr ""
+
 msgid "Start inventory synchronization"
 msgstr ""
 
@@ -429,15 +437,18 @@ msgstr ""
 msgid "Synchronize recommendations Automatically"
 msgstr ""
 
-msgid "The Red Hat Hybrid Cloud Console provides a set of cloud services, including Red Hat Insights and Subscriptions, that provide predictive analysis, remediation of issues, and unified subscription reporting for this Satellite instance."
+msgid "The Foreman inventory upload plugin automatically uploads Foreman host inventory data to the Inventory service of Insights, where it can also be used by the Subscriptions service for subscription reporting. If you use the Subscriptions service, enabling inventory uploads is required."
 msgstr ""
 
-msgid "The Satellite inventory upload plugin automatically uploads Satellite host inventory data to the Inventory service of Insights, where it can also be used by the Subscriptions service for subscription reporting. If you use the Subscriptions service, enabling inventory uploads is required."
+msgid "The Red Hat Hybrid Cloud Console provides a set of cloud services, including Red Hat Insights and Subscriptions, that provide predictive analysis, remediation of issues, and unified subscription reporting for this Foreman instance."
 msgstr ""
 
 msgid "The report file %{filename} doesn't exist"
 msgstr ""
 
+msgid "The scheduled process is disabled because this Foreman is configured with the use_local_advisor_engine option."
+msgstr ""
+
 msgid "The server returned the following error: %s"
 msgstr ""
 
@@ -450,7 +461,7 @@ msgstr ""
 msgid "This action will also enable automatic reports upload"
 msgstr ""
 
-msgid "To enable this reporting for all Satellite organizations, set {uploadButtonName} to on. The data will be reported automatically once per day."
+msgid "To enable this reporting for all Foreman organizations, set {uploadButtonName} to on. The data will be reported automatically once per day."
 msgstr ""
 
 msgid "To manually upload the data for a specific organization, select an organization and click {restartButtonName}."
@@ -462,6 +473,15 @@ msgstr ""
 msgid "Total risks"
 msgstr ""
 
+msgid "Upload hits from iop-advisor-engine"
+msgstr ""
+
+msgid "Upload hits information"
+msgstr ""
+
+msgid "Upload rules related to the hits"
+msgstr ""
+
 msgid "Uploading"
 msgstr ""
 
@@ -477,18 +497,87 @@ msgstr ""
 msgid "Wait and %s"
 msgstr ""
 
+msgid "Whether the resolution requires reboot"
+msgstr ""
+
+msgid "category name"
+msgstr ""
+
+msgid "generic"
+msgstr ""
+
 msgid "hosts page"
 msgstr ""
 
+msgid "impact name"
+msgstr ""
+
+msgid "iop payload including resolutions, rules, hits"
+msgstr ""
+
 msgid "items"
 msgstr ""
 
+msgid "likelihood number"
+msgstr ""
+
+msgid "more info"
+msgstr ""
+
 msgid "page"
 msgstr ""
 
 msgid "per page"
 msgstr ""
 
+msgid "publish date (YYYY-MM-DD)"
+msgstr ""
+
+msgid "rating"
+msgstr ""
+
+msgid "reason"
+msgstr ""
+
+msgid "reboot required"
+msgstr ""
+
+msgid "resolution description"
+msgstr ""
+
+msgid "resolution risk"
+msgstr ""
+
+msgid "result url"
+msgstr ""
+
+msgid "rule description"
+msgstr ""
+
+msgid "rule id"
+msgstr ""
+
+msgid "rule title"
+msgstr ""
+
+msgid "solution url"
+msgstr ""
+
+msgid "summary"
+msgstr ""
+
+msgid "total risk"
+msgstr ""
+
+msgid "type"
+msgstr ""
+
+msgid "upload hits details json"
+msgstr ""
+
+msgid "upload resolutions related to the hits"
+msgstr ""
+
 msgid "view the job in progress"
 msgstr ""