foreman_rh_cloud 11.0.3 → 11.2.0

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/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/inventory_sync/async/inventory_full_sync.rb

@@ -28,16 +28,6 @@ module InventorySync
         output[:host_statuses] = host_statuses
       end
 
-      def clear_inventory_statuses_for_hosts_with_insights_false
-        host_ids_to_delete = Host.joins(:host_parameters).where(id: InventorySync::InventoryStatus.select(:host_id), host_parameters: { name: 'host_registration_insights', value: false })
-        if host_ids_to_delete.present?
-          InventorySync::InventoryStatus.where(host_id: host_ids_to_delete).delete_all
-          Host.where(id: host_ids_to_delete).find_each(&:refresh_global_status!)
-        else
-          logger.debug('No hosts with host_registration_insights set to false found')
-        end
-      end
-
       def update_statuses_batch
         results = yield
 

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)

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