foreman_rh_cloud 12.2.17 → 13.0.0

data/app/assets/javascripts/foreman_rh_cloud/locale/zh_CN/foreman_rh_cloud.js

@@ -3,10 +3,10 @@
   "locale_data": {
     "foreman_rh_cloud": {
       "": {
-        "Project-Id-Version": "foreman_rh_cloud 13.0.5",
+        "Project-Id-Version": "foreman_rh_cloud 11.1.0",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2023-01-20 13:26+0000",
-        "Last-Translator": "Ondřej Gajdušek, 2025",
+        "Last-Translator": "Ewoud Kohl van Wijngaarden <ewoud+transifex@kohlvanwijngaarden.nl>, 2025",
         "Language-Team": "Chinese (China) (https://app.transifex.com/foreman/teams/114/zh_CN/)",
         "MIME-Version": "1.0",
         "Content-Type": "text/plain; charset=UTF-8",
@@ -35,9 +35,6 @@
       "All recommendations are now selected.": [
         "现在选择了所有建议。"
       ],
-      "Analytics data collection": [
-        "数据收集分析"
-      ],
       "Any Organization": [
         "任意机构"
       ],
@@ -119,17 +116,11 @@
       "Enable automatic deletion of mismatched host records from the Red Hat cloud": [
         "启用自动删除来自红帽云的主机记录"
       ],
-      "Enable automatic deletion of mismatched host records from the Red Hat cloud. Ignored when using local Insights.": [
-        ""
-      ],
       "Enable automatic synchronization of Insights recommendations from the Red Hat cloud": [
         "启用来自红帽云的 Insights 建议自动同步"
       ],
-      "Enable automatic synchronization of Insights recommendations from the Red Hat cloud. Ignored when using local Insights.": [
-        ""
-      ],
-      "Enable automatic upload of your host inventory to the Red Hat cloud. Ignored when using local Insights.": [
-        ""
+      "Enable automatic upload of your host inventory to the Red Hat cloud": [
+        "启用自动将主机清单上传到红帽云"
       ],
       "Enable automatic upload of your hosts inventory to the Red Hat cloud": [
         "启用自动将主机清单上传到红帽云"
@@ -143,14 +134,17 @@
       "Encountered an error while trying to access the server:": [
         "在尝试访问服务器时遇到错误："
       ],
-      "Exclude installed packages": [
+      "Exclude installed Packages": [
         "排除安装的软件包"
       ],
       "Exclude installed packages from being uploaded to the Red Hat cloud": [
         "将安装的软件包上传到红帽云"
       ],
-      "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.": [
-        ""
+      "Exclude packages": [
+        "排除软件包"
+      ],
+      "Exclude packages from being uploaded to the Red Hat cloud": [
+        "排除软件包上传到红帽云"
       ],
       "Exit Code: %s": [
         "退出代码：%s"
@@ -185,9 +179,6 @@
       "Generate and upload report": [
         "生成并上传报告"
       ],
-      "Generate report": [
-        "生成报告"
-      ],
       "Generate the report, but do not upload": [
         "生成报告，但不上传"
       ],
@@ -215,9 +206,6 @@
       "Host Insights recommendations": [
         "主机 Insights 建议"
       ],
-      "Host inventory report job": [
-        ""
-      ],
       "Host was not uploaded to your RH cloud inventory": [
         "主机没有上传到您的 RH 云清单"
       ],
@@ -260,9 +248,6 @@
       "Knowledgebase article": [
         "知识库文章"
       ],
-      "Learn more about {minimalDataCollectionSetting}.": [
-        "了解有关 {minimalDataCollectionSetting} 的更多信息。"
-      ],
       "List of host UUIDs": [
         "主机 UUID 列表"
       ],
@@ -278,12 +263,6 @@
       "Manual": [
         "手册"
       ],
-      "Minimal data collection": [
-        "最小数据收集"
-      ],
-      "Missing Insights facets created: %s": [
-        ""
-      ],
       "Moderate": [
         "中等"
       ],
@@ -314,33 +293,21 @@
       "Notice": [
         "注意事項"
       ],
+      "Obfuscate IPs": [
+        "模糊 IP"
+      ],
       "Obfuscate host ipv4 addresses": [
         "模糊的主机 ipv4 地址"
       ],
-      "Obfuscate host ipv4 addresses.": [
-        "对主机 ipv4 地址进行模糊化处理"
-      ],
       "Obfuscate host names": [
         "模糊主机名"
       ],
       "Obfuscate host names sent to the Red Hat cloud": [
         "发送到红帽云的模糊主机名"
       ],
-      "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.": [
-        ""
-      ],
       "Obfuscate ipv4 addresses sent to the Red Hat cloud": [
         "发送到红帽云的模糊 ipv4 地址"
       ],
-      "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.": [
-        ""
-      ],
-      "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.": [
-        ""
-      ],
-      "Only send the minimum required data to Red Hat cloud, obfuscation settings are disabled": [
-        "仅将最低所需的数据发送到红帽云，禁用模糊设置"
-      ],
       "Oops! Couldn't find organization that matches your query": [
         "未找到与您的查询匹配的机构"
       ],
@@ -356,8 +323,11 @@
       "RH Cloud": [
         "RH Cloud"
       ],
-      "RHC daemon id. Ignored when using local Insights.": [
-        ""
+      "RHC daemon id": [
+        "RHC 守护进程 ID"
+      ],
+      "RHCloud": [
+        "RHCloud"
       ],
       "Read more about it in RH cloud insights": [
         "在 RH Cloud insights 中了解更多有关它的信息"
@@ -416,7 +386,7 @@
       "Run RH Cloud playbook": [
         "运行 RH Cloud playbook"
       ],
-      "Run playbook generated by Red Hat remediations app": [
+      "Run playbook genrated by Red Hat remediations app": [
         "运行由红帽补救应用生成的 playbook"
       ],
       "Run remediation playbook generated by Insights": [
@@ -431,17 +401,14 @@
       "Select recommendations from all pages": [
         "在所有页面中选择建议"
       ],
-      "Send additional data to enhance Insights services, as per the settings": [
-        "根据设置，发送额外数据以增强 Insights 服务"
-      ],
       "Set the current organization context for the request": [
         "设置请求的当前机构上下文"
       ],
       "Settings": [
         "设置"
       ],
-      "Should import include parameter tags from Foreman? Ignored when using local Insights.": [
-        ""
+      "Should import include parameter tags from Foreman?": [
+        "应从 Foreman 导入包含参数标签？"
       ],
       "Show Advanced Settings": [
         "显示高级设置"
@@ -449,12 +416,6 @@
       "Show if system is configured to use local iop-advisor-engine.": [
         "显示系统是否被配置为使用本地 iop-advisor-engine。"
       ],
-      "Single-host report job": [
-        ""
-      ],
-      "Single-host report job for host %s": [
-        ""
-      ],
       "Start inventory synchronization": [
         "启动清单同步"
       ],
@@ -485,8 +446,8 @@
       "The report file %{filename} doesn't exist": [
         "报告文件 %{filename} 不存在"
       ],
-      "The scheduled process is disabled because this Foreman is configured with a local IoP Smart Proxy.": [
-        "调度的进程被禁用，因为此 Foreman 配置了一个本地 IoP Smart Proxy。"
+      "The scheduled process is disabled because this Foreman is configured with the use_local_advisor_engine option.": [
+        "调度的进程被禁用，因为此 Foreman 配置了 use_local_advisor_engine 选项。"
       ],
       "The server returned the following error: %s": [
         "服务器返回以下错误：%s"
@@ -497,9 +458,6 @@
       "There are no recommendations for your hosts": [
         "没有适用于您的主机的建议"
       ],
-      "There were no missing Insights facets": [
-        ""
-      ],
       "This action will also enable automatic reports upload": [
         "此操作还会启用自动报告上传"
       ],
@@ -509,9 +467,6 @@
       "To manually upload the data for a specific organization, select an organization and click {restartButtonName}.": [
         "要手动上传特定机构的数据，请选择机构并点 {restartButtonName}。"
       ],
-      "Total CVEs": [
-        "CVE 总数"
-      ],
       "Total risk": [
         "总风险"
       ],
@@ -539,12 +494,6 @@
       "View in Red Hat Insights": [
         "禁用 Red Hat Insights"
       ],
-      "Vulnerabilities": [
-        "安全漏洞"
-      ],
-      "Vulnerability": [
-        "安全漏洞"
-      ],
       "Wait and %s": [
         "等待和 %s"
       ],
@@ -611,9 +560,6 @@
       "rule title": [
         "rule 标题"
       ],
-      "setting minimal data collection": [
-        "设置最小数据收集"
-      ],
       "solution url": [
         "solution url"
       ],

data/app/controllers/concerns/insights_cloud/package_profile_upload_extensions.rb

@@ -15,15 +15,13 @@ module InsightsCloud
       logger.debug("Generating host-specific report for host #{@host.name}")
 
       ForemanTasks.async_task(
-        ForemanInventoryUpload::Async::SingleHostReportJob,
+        ForemanInventoryUpload::Async::GenerateReportJob,
         ForemanInventoryUpload.generated_reports_folder,
         @host.organization_id,
-        @host.id
+        false,
+        "id=#{@host.id}"
       )
 
-      # Ensure insights UUID matches subscription UUID (only runs in IoP mode per method guard above)
-      @host.ensure_iop_insights_uuid
-
       # in IoP case, the hosts are identified by the sub-man ID, and we can assume they already
       # exist in the local inventory. This will also handle facet creation for new hosts.
       return if @host.insights

data/app/controllers/foreman_inventory_upload/accounts_controller.rb

@@ -7,7 +7,7 @@ module ForemanInventoryUpload
       accounts = Hash[
         labels.map do |id, label|
           generate_report_status = status_for(id, ForemanInventoryUpload::Async::GenerateReportJob)
-          upload_report_status = status_for(id, ForemanInventoryUpload::Async::UploadReportDirectJob)
+          upload_report_status = status_for(id, ForemanInventoryUpload::Async::UploadReportJob)
           report_file_paths = ForemanInventoryUpload.report_file_paths(id)
 
           [

data/app/controllers/foreman_inventory_upload/uploads_controller.rb

@@ -6,7 +6,7 @@ module ForemanInventoryUpload
     before_action :require_non_iop_smart_proxy, only: [:enable_cloud_connector]
 
     def last
-      label = ForemanInventoryUpload::Async::UploadReportDirectJob.output_label(params[:organization_id])
+      label = ForemanInventoryUpload::Async::UploadReportJob.output_label(params[:organization_id])
       output = ForemanInventoryUpload::Async::ProgressOutput.get(label)&.full_output
 
       render json: {

data/app/controllers/insights_cloud/ui_requests_controller.rb

@@ -2,7 +2,7 @@ module InsightsCloud
   class UIRequestsController < ::ApplicationController
     layout false
 
-    before_action :ensure_org, :find_location, :only => [:forward_request]
+    before_action :ensure_org, :ensure_loc, :only => [:forward_request]
 
     # The method that "proxies" requests over to Cloud
     def forward_request
@@ -93,8 +93,9 @@ module InsightsCloud
       return render_message 'Organization not found or invalid', :status => 400 unless @organization
     end
 
-    def find_location
+    def ensure_loc
       @location = Location.current
+      return render_message 'Location not found or invalid', :status => 400 unless @location
     end
 
     def base_url

data/app/models/concerns/rh_cloud_host.rb

@@ -21,54 +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 :on => :id, :rename => :insights_uuid, :only_explicit => true,
-      :ext_method => :search_by_insights_uuid, :complete_value => false
+    scoped_search :relation => :insights, :on => :uuid, :only_explicit => true, :rename => :insights_uuid
 
     def insights_facet
       insights
     end
-
-    # In IoP, read directly from the subscription facet to avoid stale data (see comment on ensure_iop_insights_uuid)
-    def insights_uuid
-      ForemanRhCloud.with_iop_smart_proxy? ? subscription_facet&.uuid : insights_facet&.uuid
-    end
-
-    # In non-IoP, insights_facet uuids are assigned by Hosted.
-    # In IoP, insights_facet uuids must match Katello subscription_facet uuids.
-    # If the host was previously registered to hosted Insights,
-    # we need to correct its uuid.
-    def ensure_iop_insights_uuid
-      return unless insights_facet.present? && subscription_facet.present? && insights_facet.uuid != subscription_facet.uuid
-      insights_facet.update!(uuid: subscription_facet.uuid)
-    end
-  end
-
-  module ClassMethods
-    def search_by_insights_uuid(_key, operator, value)
-      # Determine which facet table to search based on IoP mode
-      facet_table = ForemanRhCloud.with_iop_smart_proxy? ? Katello::Host::SubscriptionFacet.table_name : InsightsFacet.table_name
-
-      # Build SQL condition
-      if ['IN', 'NOT IN'].include?(operator)
-        # For IN/NOT IN, value may be an array or comma-separated string
-        # Convert to array and build placeholders for each value
-        values = value.is_a?(Array) ? value : value.to_s.split(',').map(&:strip)
-        placeholders = (['?'] * values.size).join(',')
-        condition = sanitize_sql_for_conditions(
-          ["#{facet_table}.uuid #{operator} (#{placeholders})", *values]
-        )
-      else
-        # For other operators (=, !=, LIKE, etc.), use value_to_sql for proper SQL formatting
-        condition = sanitize_sql_for_conditions(
-          ["#{facet_table}.uuid #{operator} ?", value_to_sql(operator, value)]
-        )
-      end
-
-      # Return search parameters with LEFT JOIN to include hosts without facets
-      {
-        joins: "LEFT JOIN #{facet_table} ON #{facet_table}.host_id = #{Host::Managed.table_name}.id",
-        conditions: condition,
-      }
-    end
   end
 end

data/app/models/foreman_rh_cloud/ping.rb

@@ -7,7 +7,7 @@ module ForemanRhCloud
       include ForemanRhCloud::CertAuth
 
       def iop_smart_proxy_url
-        ForemanRhCloud.iop_smart_proxy&.url
+        @iop_smart_proxy_url ||= ForemanRhCloud.iop_smart_proxy.url
       end
 
       def service_urls
@@ -33,7 +33,6 @@ module ForemanRhCloud
       end
 
       def ping
-        return {} unless ForemanRhCloud.with_iop_smart_proxy?
         ping_services
       end
 

data/app/models/insights_hit.rb

@@ -1,6 +1,6 @@
 class InsightsHit < ApplicationRecord
   include ::Authorizable
-  belongs_to :host, class_name: 'Host::Base'
+  belongs_to :host
   # since the facet is one-to-one association with a host, we can connect
   # through host_id column on both this model and facet.
   belongs_to :insights_facet, foreign_key: 'host_id', primary_key: 'host_id', counter_cache: :hits_count

data/app/services/foreman_rh_cloud/cert_auth.rb

@@ -11,21 +11,11 @@ module ForemanRhCloud
 
     def execute_cloud_request(params)
       organization = params.delete(:organization)
-      # Cache the value of with_iop_smart_proxy? to avoid multiple calls to the database
-      with_iop_smart_proxy = ForemanRhCloud.with_iop_smart_proxy?
-      certs = with_iop_smart_proxy ? foreman_certificate : candlepin_id_cert(organization)
-      default_params = {
+      certs = ForemanRhCloud.with_iop_smart_proxy? ? foreman_certificate : candlepin_id_cert(organization)
+      final_params = {
         ssl_client_cert: OpenSSL::X509::Certificate.new(certs[:cert]),
         ssl_client_key: OpenSSL::PKey.read(certs[:key]),
-      }
-
-      if with_iop_smart_proxy && organization&.label
-        default_params[:headers] = {
-          'X-Org-Id' => organization&.label,
-        }
-      end
-
-      final_params = default_params.deep_merge(params)
+      }.deep_merge(params)
 
       super(final_params)
     end

data/app/services/foreman_rh_cloud/gateway_request.rb

@@ -0,0 +1,26 @@
+module ForemanRhCloud
+  module GatewayRequest
+    extend ActiveSupport::Concern
+
+    include CloudRequest
+
+    def execute_cloud_request(params)
+      certs = params.delete(:certs) || foreman_certificates
+      final_params = {
+        ssl_client_cert: OpenSSL::X509::Certificate.new(certs[:cert]),
+        ssl_client_key: OpenSSL::PKey.read(certs[:key]),
+        ssl_ca_file: Setting[:ssl_ca_file],
+        verify_ssl: OpenSSL::SSL::VERIFY_PEER,
+      }.deep_merge(params)
+
+      super(final_params)
+    end
+
+    def foreman_certificates
+      {
+        cert: File.read(Setting[:ssl_certificate]),
+        key: File.read(Setting[:ssl_priv_key]),
+      }
+    end
+  end
+end

data/app/services/foreman_rh_cloud/insights_api_forwarder.rb

@@ -2,7 +2,7 @@ require 'rest-client'
 
 module ForemanRhCloud
   class InsightsApiForwarder
-    include ForemanRhCloud::CertAuth
+    include ForemanRhCloud::GatewayRequest
 
     SCOPED_REQUESTS = [
       { test: %r{api/vulnerability/v1/vulnerabilities/cves}, tag_name: :tags },
@@ -26,8 +26,6 @@ module ForemanRhCloud
 
       request_opts = prepare_request_opts(original_request, path, forward_payload, forward_params)
 
-      request_opts[:organization] = organization
-
       logger.debug("Sending request to: #{request_opts[:url]}")
 
       execute_cloud_request(request_opts)

data/app/services/foreman_rh_cloud/tags_auth.rb

@@ -1,6 +1,6 @@
 module ForemanRhCloud
   class TagsAuth
-    include CertAuth
+    include GatewayRequest
 
     TAG_NAMESPACE = 'sat_iam'.freeze
     TAG_SHORT_NAME = 'scope'.freeze
@@ -20,12 +20,10 @@ module ForemanRhCloud
     end
 
     def update_tag
-      loc_name = location_name_for_tag
-      logger.debug("Updating tags for user: #{@user}, org: #{@org.name}, loc: #{loc_name}")
+      logger.debug("Updating tags for user: #{@user}, org: #{@org.name}, loc: #{@loc.name}")
 
       payload = tags_query_payload
       params = {
-        organization: @org,
         method: :post,
         url: "#{InsightsCloud.gateway_url}/tags",
         headers: {
@@ -37,9 +35,7 @@ module ForemanRhCloud
     end
 
     def allowed_hosts
-      query = Host.authorized_as(@user, nil, nil).where(organization: @org)
-      query = query.where(location: @loc) if @loc
-      query.joins(:subscription_facet).pluck('katello_subscription_facets.uuid')
+      Host.authorized_as(@user, nil, nil).where(organization: @org, location: @loc).joins(:subscription_facet).pluck('katello_subscription_facets.uuid')
     end
 
     def tags_query_payload
@@ -50,18 +46,11 @@ module ForemanRhCloud
     end
 
     def tag_value
-      location_part = "L:\"#{location_name_for_tag}\""
-      "U:\"#{@user.login}\"O:\"#{@org.name}\"#{location_part}"
+      "U:\"#{@user.login}\"O:\"#{@org.name}\"L:\"#{@loc.name}\""
     end
 
     def auth_tag
       "#{TAG_NAME}=#{tag_value}"
     end
-
-    private
-
-    def location_name_for_tag
-      @loc ? @loc.name : '*'
-    end
   end
 end

data/app/views/api/v2/advisor_engine/host_details.json.rabl

@@ -1,7 +1,9 @@
 collection @hosts
 
 attributes :name
-node :insights_uuid, &:insights_uuid
+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

@@ -1,6 +1,5 @@
-node :uuid do |facet|
-  facet&.host&.insights_uuid
-end
+attributes :uuid
+
 node :insights_hit_details do |facet|
   facet&.host&.facts('insights::hit_details')&.values&.first
 end

data/lib/foreman_inventory_upload/async/generate_report_job.rb

@@ -5,7 +5,7 @@ module ForemanInventoryUpload
         "report_for_#{label}"
       end
 
-      def plan(base_folder, organization_id, disconnected = false, hosts_filter = nil)
+      def plan(base_folder, organization_id, disconnected, hosts_filter = nil)
         sequence do
           super(
             GenerateReportJob.output_label("#{organization_id}#{hosts_filter.empty? ? nil : "[#{hosts_filter.to_s.parameterize}]"}"),
@@ -14,14 +14,13 @@ module ForemanInventoryUpload
             hosts_filter: hosts_filter
           )
 
-          unless content_disconnected?(disconnected)
-            plan_action(
-              QueueForUploadJob,
-              base_folder,
-              ForemanInventoryUpload.facts_archive_name(organization_id, hosts_filter),
-              organization_id
-            )
-          end
+          plan_action(
+            QueueForUploadJob,
+            base_folder,
+            ForemanInventoryUpload.facts_archive_name(organization_id, hosts_filter),
+            organization_id,
+            disconnected
+          )
         end
       end
 
@@ -41,10 +40,6 @@ module ForemanInventoryUpload
         )
       end
 
-      def content_disconnected?(disconnected)
-        disconnected || !Setting[:subscription_connection_enabled]
-      end
-
       def base_folder
         input[:base_folder]
       end

data/lib/foreman_inventory_upload/async/queue_for_upload_job.rb

@@ -1,14 +1,15 @@
 module ForemanInventoryUpload
   module Async
     class QueueForUploadJob < ::Actions::EntryAction
-      def plan(base_folder, report_file, organization_id)
+      def plan(base_folder, report_file, organization_id, disconnected)
         enqueue_task = plan_self(base_folder: base_folder, report_file: report_file)
-        plan_upload_report(enqueue_task.output[:enqueued_file_name], organization_id)
+        plan_upload_report(enqueue_task.output[:enqueued_file_name], organization_id, disconnected)
       end
 
       def run
         logger.debug('Ensuring objects')
         ensure_ouput_folder
+        ensure_output_script
         logger.debug("Copying #{report_file} to #{uploads_folder}")
         enqueued_file_name = File.join(uploads_folder, report_file)
         FileUtils.mv(File.join(base_folder, report_file), enqueued_file_name)
@@ -21,10 +22,31 @@ module ForemanInventoryUpload
         @uploads_folder ||= ForemanInventoryUpload.uploads_folder
       end
 
+      def script_file
+        @script_file ||= File.join(uploads_folder, ForemanInventoryUpload.upload_script_file)
+      end
+
       def ensure_ouput_folder
         FileUtils.mkdir_p(uploads_folder)
       end
 
+      def ensure_output_script
+        return if File.exist?(script_file)
+
+        script_source = File.join(ForemanRhCloud::Engine.root, 'lib/foreman_inventory_upload/scripts/uploader.sh.erb')
+
+        template_src = Foreman::Renderer::Source::String.new(content: File.read(script_source))
+        scope = Foreman::Renderer::Scope::Base.new(
+          source: template_src,
+          variables: {
+            upload_url: ForemanInventoryUpload.upload_url,
+          }
+        )
+        script_source = Foreman::Renderer.render(template_src, scope)
+        File.write(script_file, script_source)
+        FileUtils.chmod('+x', script_file)
+      end
+
       def logger
         Foreman::Logging.logger('background')
       end
@@ -37,8 +59,8 @@ module ForemanInventoryUpload
         input[:report_file]
       end
 
-      def plan_upload_report(enqueued_file_name, organization_id)
-        plan_action(UploadReportDirectJob, enqueued_file_name, organization_id)
+      def plan_upload_report(enqueued_file_name, organization_id, disconnected)
+        plan_action(UploadReportJob, enqueued_file_name, organization_id, disconnected)
       end
     end
   end