foreman_rh_cloud 13.0.4 → 13.0.6

data/lib/foreman_inventory_upload/generators/fact_helpers.rb

@@ -59,7 +59,7 @@ module ForemanInventoryUpload
       def obfuscate_hostname?(host)
         # Returns true if hostname obfuscation should be applied for a given host, based on hierarchy:
         # 1. Global setting for hostname obfuscation.
-        return true if Setting[:obfuscate_inventory_hostnames]
+        return true if Setting[:obfuscate_inventory_hostnames] && !ForemanRhCloud.with_iop_smart_proxy?
 
         insights_client_setting = fact_value(host, 'insights_client::obfuscate_hostname_enabled')
         insights_client_setting = ActiveModel::Type::Boolean.new.cast(insights_client_setting)
@@ -99,7 +99,7 @@ module ForemanInventoryUpload
       def obfuscate_ips?(host)
         # Returns true if IP obfuscation should be applied for a given host, based on hierarchy:
         # 1. Global setting for IP obfuscation.
-        return true if Setting[:obfuscate_inventory_ips]
+        return true if Setting[:obfuscate_inventory_ips] && !ForemanRhCloud.with_iop_smart_proxy?
 
         insights_client_ipv4_setting = fact_value(host, 'insights_client::obfuscate_ipv4_enabled')
         insights_client_ipv6_setting = fact_value(host, 'insights_client::obfuscate_ipv6_enabled')

data/lib/foreman_inventory_upload/generators/slice.rb

@@ -90,7 +90,7 @@ module ForemanInventoryUpload
       def report_host(host)
         host_ips_cache = host_ips(host)
         @stream.object do
-          if Setting[:insights_minimal_data_collection]
+          if Setting[:insights_minimal_data_collection] && !ForemanRhCloud.with_iop_smart_proxy?
             insights_minimal_data_collection(host)
           else
             @stream.simple_field('fqdn', fqdn(host))
@@ -205,7 +205,7 @@ module ForemanInventoryUpload
             end.join(', '))
           end
         end
-        if !Setting[:insights_minimal_data_collection] && !Setting[:exclude_installed_packages]
+        if ForemanRhCloud.with_iop_smart_proxy? || (!Setting[:insights_minimal_data_collection] && !Setting[:exclude_installed_packages])
           @stream.array_field('installed_packages') do
             first = true
             host.installed_packages.each do |package|
@@ -256,7 +256,7 @@ module ForemanInventoryUpload
 
         @stream.array_field('yum_repos') do
           host.content_facet.bound_repositories.each_with_index do |repo, index|
-            report_yum_repo(host.content_source.load_balancer_pulp_content_url, repo)
+            report_yum_repo(host.content_source&.load_balancer_pulp_content_url || ::SmartProxy.pulp_primary.pulp_content_url, repo)
             @stream.comma unless index == host.content_facet.bound_repositories.count - 1
           end
         end

data/lib/foreman_inventory_upload/scripts/uploader.sh.erb

@@ -27,6 +27,12 @@ else
         AUTH_VAL="\"$RH_USERNAME\":\"$RH_PASSWORD\""
 fi
 
+ORG_HEADER=()
+if [ -n "$ORG_ID" ]
+then
++        ORG_HEADER=("-H" "X-Org-Id: $ORG_ID")
+fi
+
 # /tmp/a b/x.pem
 # curl --cert /tmp/a\ b/x.pem
 
@@ -36,7 +42,7 @@ mkdir -p $DONE_DIR
 
 for f in $FILES
 do
-  curl -k -vvv -# --fail -F "file=@$f;type=application/vnd.redhat.qpc.tar+tgz" $DEST "$AUTH_KEY" "$AUTH_VAL"
+  curl -k -vvv -# --fail -F "file=@$f;type=application/vnd.redhat.qpc.tar+tgz" $DEST "$AUTH_KEY" "$AUTH_VAL" "${ORG_HEADER[@]}"
   status=$?
   if [ $status -eq 0 ]; then
     mv $f $DONE_DIR

data/lib/foreman_rh_cloud/engine.rb

@@ -83,27 +83,6 @@ module ForemanRhCloud
         :description => N_('Configure Cloud Connector on given hosts'),
         :proxy_selector_override => ::RemoteExecutionProxySelector::INTERNAL_PROXY
       )
-
-      ScopedSearch::AutoCompleteBuilder.class_eval do
-        # Insights rule IDs always contain a pipe character.
-        # example: hardening_ssh_config_perms|OPENSSH_HARDENING_CONFIG_PERMS
-        # We need to override this method of scoped_search so that autocomplete
-        # will correctly put the value in quotes (otherwise the "|" will be
-        # interpreted as an OR.)
-        # The only change from scoped_search code is adding the | to the regex in the final map.
-        def complete_value_from_db(field, special_values, val)
-          count = 20 - special_values.count
-          completer_scope(field)
-            .where(@options[:value_filter])
-            .where(value_conditions(field.quoted_field, val))
-            .select(field.quoted_field)
-            .limit(count)
-            .distinct
-            .map(&field.field)
-            .compact
-            .map { |v| v.to_s =~ /\s|\|/ ? "\"#{v.gsub('"', '\"')}\"" : v }
-        end
-      end
     end
 
     # Ideally this code belongs to an initializer. The problem is that Katello controllers are not initialized completely until after the end of the to_prepare blocks

data/lib/foreman_rh_cloud/plugin.rb

@@ -6,22 +6,22 @@ module ForemanRhCloud
       return if Foreman::Plugin.find(:foreman_rh_cloud)
 
       Foreman::Plugin.register :foreman_rh_cloud do
-        requires_foreman '>= 3.13'
+        requires_foreman '>= 3.17'
         register_gettext
 
         apipie_documented_controllers ["#{ForemanRhCloud::Engine.root}/app/controllers/api/v2/**/*.rb"]
 
         settings 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'))
-            setting('obfuscate_inventory_hostnames', type: :boolean, description: N_('Obfuscate host names sent to the Red Hat cloud. (If insights_minimal_data_collection is set to true, this setting is ignored because host names are not included in the report.)'), 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.  (If insights_minimal_data_collection is set to true, this setting is ignored because host IPv4 addresses are not included in the report.)'), default: false, full_name: N_('Obfuscate host ipv4 addresses.'))
-            setting('exclude_installed_packages', type: :boolean, description: N_('Exclude installed packages from being uploaded to the Red Hat cloud. (If insights_minimal_data_collection is set to true, this setting is ignored and installed packages are always excluded.)'), default: false, full_name: N_("Exclude installed packages"))
-            setting('include_parameter_tags', type: :boolean, description: N_('Should import include parameter tags from Foreman?'), default: false, full_name: N_('Include parameters in insights-client reports'))
-            setting('rhc_instance_id', type: :string, description: N_('RHC daemon id'), default: nil, full_name: N_('ID of the RHC(Yggdrasil) daemon'))
-            setting('insights_minimal_data_collection', type: :boolean, default: false, full_name: N_('Minimal data collection'), description: N_('Only include the minimum required data in inventory reports for uploading to Red Hat cloud. When this is true, installed packages are excluded from the report regardless of the exclude_installed_packages setting, and host names and IPv4 addresses are excluded from the report regardless of obfuscation settings.'))
+            setting('allow_auto_inventory_upload', type: :boolean, description: N_('Enable automatic upload of your host inventory to the Red Hat cloud. Ignored when using local Insights.'), 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. Ignored when using local Insights.'), 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. Ignored when using local Insights.'), 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. (If insights_minimal_data_collection is set to true, this setting is ignored because host names are not included in the report.) Ignored when using local Insights.'), 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.  (If insights_minimal_data_collection is set to true, this setting is ignored because host IPv4 addresses are not included in the report.) Ignored when using local Insights.'), default: false, full_name: N_('Obfuscate host ipv4 addresses.'))
+            setting('exclude_installed_packages', type: :boolean, description: N_('Exclude installed packages from being uploaded to the Red Hat cloud. (If insights_minimal_data_collection is set to true, this setting is ignored and installed packages are always excluded.) Ignored when using local Insights.'), default: false, full_name: N_("Exclude installed packages"))
+            setting('include_parameter_tags', type: :boolean, description: N_('Should import include parameter tags from Foreman? Ignored when using local Insights.'), default: false, full_name: N_('Include parameters in insights-client reports'))
+            setting('rhc_instance_id', type: :string, description: N_('RHC daemon id. Ignored when using local Insights.'), default: nil, full_name: N_('ID of the RHC(Yggdrasil) daemon'))
+            setting('insights_minimal_data_collection', type: :boolean, default: false, full_name: N_('Minimal data collection'), description: N_('Only include the minimum required data in inventory reports for uploading to Red Hat cloud. When this is true, installed packages are excluded from the report regardless of the exclude_installed_packages setting, and host names and IPv4 addresses are excluded from the report regardless of obfuscation settings. Ignored when using local Insights.'))
           end
         end
 

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '13.0.4'.freeze
+  VERSION = '13.0.6'.freeze
 end

data/lib/insights_cloud/async/vmaas_reposcan_sync.rb

@@ -23,13 +23,16 @@ module InsightsCloud
           return
         end
 
-        plan_self
+        organization_id = Katello::Repository.find(repo_id).organization_id
+
+        plan_self(organization_id: organization_id)
       end
 
       def run
         url = ::InsightsCloud.vmaas_reposcan_sync_url
 
         response = execute_cloud_request(
+          organization: organization,
           method: :put,
           url: url,
           headers: { 'Content-Type' => 'application/json' }
@@ -61,6 +64,10 @@ module InsightsCloud
         Dynflow::Action::Rescue::Skip
       end
 
+      def organization
+        @organization ||= Organization.find(input[:organization_id])
+      end
+
       private
 
       def logger

data/lib/tasks/rh_cloud_inventory.rake

@@ -9,22 +9,20 @@ namespace :rh_cloud_inventory do
       else
         organizations = [Organization.where(:id => ENV['organization_id']).first]
       end
-      disconnected = ForemanRhCloud.with_iop_smart_proxy?
       User.as_anonymous_admin do
         organizations.each do |organization|
           ForemanTasks.async_task(
             ForemanInventoryUpload::Async::GenerateReportJob,
             ForemanInventoryUpload.generated_reports_folder,
-            organization.id,
-            disconnected
+            organization.id
           )
           puts "Generated and uploaded inventory report for organization '#{organization.name}'"
         end
       end
     end
     desc 'Generate inventory report to be sent to Red Hat cloud'
-    task generate: :environment do
-      organizations = [ENV['organization_id']]
+    task generate: [:environment, 'dynflow:client'] do
+      organization_ids = [ENV['organization_id']]
       base_folder = ENV['target'] || Dir.pwd
       filter = ENV['hosts_filter']
 
@@ -34,37 +32,22 @@ namespace :rh_cloud_inventory do
         puts "Using #{base_folder} for the output"
       end
 
-      if organizations.empty?
+      if organization_ids.empty?
         puts "Must specify organization_id"
         return
       end
 
       User.as_anonymous_admin do
-        organizations.each do |organization|
-          target = File.join(base_folder, ForemanInventoryUpload.facts_archive_name(organization, filter))
-          archived_report_generator = ForemanInventoryUpload::Generators::ArchivedReport.new(target, Logger.new(STDOUT))
-          archived_report_generator.render(organization: organization, filter: filter)
-          puts "Successfully generated #{target} for organization id #{organization}"
-          puts "Check the Uploading tab for report uploading status." if Setting[:subscription_connection_enabled]
-
-          next unless ForemanRhCloud.with_iop_smart_proxy?
-
-          puts 'Creating missing insights facets'
-          hosts_without_facets = ForemanInventoryUpload::Generators::Queries.for_org(organization, hosts_query: 'null? insights_uuid')
-          hosts_without_facets.each do |batch|
-            facets = batch.pluck(:id, 'katello_subscription_facets.uuid').map do |host_id, uuid|
-              {
-                host_id: host_id,
-                uuid: uuid,
-              }
-            end
-            # We don't need to validate the facets here as we create the necessary fields.
-            # rubocop:disable Rails/SkipsModelValidations
-            InsightsFacet.upsert_all(facets, unique_by: :host_id) unless facets.empty?
-            # rubocop:enable Rails/SkipsModelValidations
-          end
-          puts 'Missing Insights facets created'
+        organization_ids.each do |organization_id|
+          ForemanTasks.sync_task(
+            ForemanInventoryUpload::Async::HostInventoryReportJob,
+            base_folder,
+            organization_id,
+            filter,
+            false # don't upload; the user ran report:generate and not report:generate_upload
+          )
         end
+        puts "Check the Uploading tab for report uploading status." if Setting[:subscription_connection_enabled]
       end
     end
     desc 'Upload generated inventory report to Red Hat cloud'
@@ -72,8 +55,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 = ForemanRhCloud.with_iop_smart_proxy?
-      ForemanTasks.sync_task(ForemanInventoryUpload::Async::QueueForUploadJob, base_folder, report_file, organization_id, disconnected)
+      ForemanTasks.sync_task(ForemanInventoryUpload::Async::QueueForUploadJob, base_folder, report_file, organization_id)
       puts "Uploaded #{report_file}"
     end
   end

data/locale/foreman_rh_cloud.pot

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: foreman_rh_cloud 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-09-12 13:20+0200\n"
-"PO-Revision-Date: 2025-09-12 13:20+0200\n"
+"POT-Creation-Date: 2025-10-07 11:44-0400\n"
+"PO-Revision-Date: 2025-10-07 11:44-0400\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -189,7 +189,7 @@ msgstr ""
 #: ../app/helpers/foreman_insights_host_helper.rb:7
 #: ../lib/foreman_rh_cloud/plugin.rb:93 ../lib/foreman_rh_cloud/plugin.rb:143
 #: ../webpack/ForemanColumnExtensions/index.js:65
-#: ../webpack/ForemanRhCloudFills.js:24
+#: ../webpack/ForemanRhCloudFills.js:28
 #: ../webpack/InsightsHostDetailsTab/InsightsTab.js:46
 msgid "Recommendations"
 msgstr ""
@@ -234,6 +234,14 @@ msgstr ""
 msgid "Satellite server has %{hits_count} recommendations by Red Hat"
 msgstr ""
 
+#: ../lib/foreman_inventory_upload/async/create_missing_insights_facets.rb:24
+msgid "There were no missing Insights facets"
+msgstr ""
+
+#: ../lib/foreman_inventory_upload/async/create_missing_insights_facets.rb:24
+msgid "Missing Insights facets created: %s"
+msgstr ""
+
 #: ../lib/foreman_inventory_upload/async/delayed_start.rb:22
 msgid "Wait and %s"
 msgstr ""
@@ -246,6 +254,18 @@ msgid ""
 "cal IoP Smart Proxy."
 msgstr ""
 
+#: ../lib/foreman_inventory_upload/async/host_inventory_report_job.rb:31
+msgid "Host inventory report job"
+msgstr ""
+
+#: ../lib/foreman_inventory_upload/async/single_host_report_job.rb:16
+msgid "Single-host report job for host %s"
+msgstr ""
+
+#: ../lib/foreman_inventory_upload/async/single_host_report_job.rb:16
+msgid "Single-host report job"
+msgstr ""
+
 #: ../lib/foreman_inventory_upload/generators/fact_helpers.rb:188
 msgid "Value %{value} is not a valid UUID"
 msgstr ""
@@ -276,7 +296,9 @@ msgid "Configure Cloud Connector on given hosts"
 msgstr ""
 
 #: ../lib/foreman_rh_cloud/plugin.rb:16
-msgid "Enable automatic upload of your host inventory to the Red Hat cloud"
+msgid ""
+"Enable automatic upload of your host inventory to the Red Hat cloud. Ignored w"
+"hen using local Insights."
 msgstr ""
 
 #: ../lib/foreman_rh_cloud/plugin.rb:16
@@ -286,10 +308,9 @@ msgid "Automatic inventory upload"
 msgstr ""
 
 #: ../lib/foreman_rh_cloud/plugin.rb:17
-#: ../webpack/InsightsCloudSync/Components/InsightsSettings/InsightsSettings.js:25
 msgid ""
 "Enable automatic synchronization of Insights recommendations from the Red Hat "
-"cloud"
+"cloud. Ignored when using local Insights."
 msgstr ""
 
 #: ../lib/foreman_rh_cloud/plugin.rb:17
@@ -297,8 +318,9 @@ msgid "Synchronize recommendations Automatically"
 msgstr ""
 
 #: ../lib/foreman_rh_cloud/plugin.rb:18
-#: ../webpack/ForemanInventoryUpload/Components/InventorySettings/AdvancedSetting/AdvancedSettingsConstants.js:14
-msgid "Enable automatic deletion of mismatched host records from the Red Hat cloud"
+msgid ""
+"Enable automatic deletion of mismatched host records from the Red Hat cloud. I"
+"gnored when using local Insights."
 msgstr ""
 
 #: ../lib/foreman_rh_cloud/plugin.rb:18
@@ -310,7 +332,7 @@ msgstr ""
 msgid ""
 "Obfuscate host names sent to the Red Hat cloud. (If insights_minimal_data_coll"
 "ection is set to true, this setting is ignored because host names are not incl"
-"uded in the report.)"
+"uded in the report.) Ignored when using local Insights."
 msgstr ""
 
 #: ../lib/foreman_rh_cloud/plugin.rb:19
@@ -322,7 +344,7 @@ msgstr ""
 msgid ""
 "Obfuscate ipv4 addresses sent to the Red Hat cloud.  (If insights_minimal_data"
 "_collection is set to true, this setting is ignored because host IPv4 addresse"
-"s are not included in the report.)"
+"s are not included in the report.) Ignored when using local Insights."
 msgstr ""
 
 #: ../lib/foreman_rh_cloud/plugin.rb:20
@@ -333,7 +355,7 @@ msgstr ""
 msgid ""
 "Exclude installed packages from being uploaded to the Red Hat cloud. (If insig"
 "hts_minimal_data_collection is set to true, this setting is ignored and instal"
-"led packages are always excluded.)"
+"led packages are always excluded.) Ignored when using local Insights."
 msgstr ""
 
 #: ../lib/foreman_rh_cloud/plugin.rb:21
@@ -342,7 +364,9 @@ msgid "Exclude installed packages"
 msgstr ""
 
 #: ../lib/foreman_rh_cloud/plugin.rb:22
-msgid "Should import include parameter tags from Foreman?"
+msgid ""
+"Should import include parameter tags from Foreman? Ignored when using local In"
+"sights."
 msgstr ""
 
 #: ../lib/foreman_rh_cloud/plugin.rb:22
@@ -350,7 +374,7 @@ msgid "Include parameters in insights-client reports"
 msgstr ""
 
 #: ../lib/foreman_rh_cloud/plugin.rb:23
-msgid "RHC daemon id"
+msgid "RHC daemon id. Ignored when using local Insights."
 msgstr ""
 
 #: ../lib/foreman_rh_cloud/plugin.rb:23
@@ -368,7 +392,8 @@ msgid ""
 "Only include the minimum required data in inventory reports for uploading to R"
 "ed Hat cloud. When this is true, installed packages are excluded from the repo"
 "rt regardless of the exclude_installed_packages setting, and host names and IP"
-"v4 addresses are excluded from the report regardless of obfuscation settings."
+"v4 addresses are excluded from the report regardless of obfuscation settings. "
+"Ignored when using local Insights."
 msgstr ""
 
 #: ../lib/foreman_rh_cloud/plugin.rb:88 ../lib/foreman_rh_cloud/plugin.rb:106
@@ -459,6 +484,11 @@ msgstr ""
 msgid "Enable automatic upload of your hosts inventory to the Red Hat cloud"
 msgstr ""
 
+#:
+#: ../webpack/ForemanInventoryUpload/Components/InventorySettings/AdvancedSetting/AdvancedSettingsConstants.js:14
+msgid "Enable automatic deletion of mismatched host records from the Red Hat cloud"
+msgstr ""
+
 #:
 #: ../webpack/ForemanInventoryUpload/Components/InventorySettings/AdvancedSetting/AdvancedSettingsConstants.js:35
 msgid "Obfuscate host names sent to the Red Hat cloud"
@@ -753,7 +783,7 @@ msgstr ""
 msgid "Configure"
 msgstr ""
 
-#: ../webpack/ForemanRhCloudFills.js:40
+#: ../webpack/ForemanRhCloudFills.js:44
 msgid "Vulnerabilities"
 msgstr ""
 
@@ -762,6 +792,13 @@ msgstr ""
 msgid "Sync automatically"
 msgstr ""
 
+#:
+#: ../webpack/InsightsCloudSync/Components/InsightsSettings/InsightsSettings.js:25
+msgid ""
+"Enable automatic synchronization of Insights recommendations from the Red Hat "
+"cloud"
+msgstr ""
+
 #:
 #: ../webpack/InsightsCloudSync/Components/InsightsTable/InsightsTableConstants.js:24
 msgid "Playbook"
@@ -951,15 +988,15 @@ msgstr ""
 msgid "Critical"
 msgstr ""
 
-#: ../webpack/InsightsHostDetailsTab/InsightsTotalRiskChart.js:129
+#: ../webpack/InsightsHostDetailsTab/InsightsTotalRiskChart.js:164
 msgid "Total risks"
 msgstr ""
 
-#: ../webpack/InsightsHostDetailsTab/InsightsTotalRiskChart.js:136
+#: ../webpack/InsightsHostDetailsTab/InsightsTotalRiskChart.js:172
 msgid "View all recommendations"
 msgstr ""
 
-#: ../webpack/InsightsHostDetailsTab/InsightsTotalRiskChart.js:145
+#: ../webpack/InsightsHostDetailsTab/InsightsTotalRiskChart.js:181
 msgid "No results found"
 msgstr ""