foreman_rh_cloud 13.2.0 → 14.0.1

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

@@ -3,7 +3,7 @@
   "locale_data": {
     "foreman_rh_cloud": {
       "": {
-        "Project-Id-Version": "foreman_rh_cloud 13.0.5",
+        "Project-Id-Version": "foreman_rh_cloud 13.2.0",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2023-01-20 13:26+0000",
         "Last-Translator": "Ondřej Gajdušek, 2025",
@@ -23,6 +23,9 @@
       "%s organizations": [
         "%s 机构"
       ],
+      "A specific organization must be selected from the organization context.": [
+        ""
+      ],
       "About subscription watch": [
         "订阅查看"
       ],
@@ -35,6 +38,9 @@
       "All recommendations are now selected.": [
         "现在选择了所有建议。"
       ],
+      "Analysis disabled": [
+        ""
+      ],
       "Analytics data collection": [
         "数据收集分析"
       ],
@@ -44,6 +50,9 @@
       "Apply Insights recommendations": [
         "应用 Insights 建议"
       ],
+      "Attempted to destroy HBI host %s, but host does not exist in HBI": [
+        ""
+      ],
       "Automatic inventory upload": [
         "自动清单上传"
       ],
@@ -83,6 +92,9 @@
       "Completed": [
         "完成"
       ],
+      "Completed with warnings": [
+        ""
+      ],
       "Configure": [
         "配置"
       ],
@@ -101,6 +113,15 @@
       "Current page": [
         "当前页"
       ],
+      "Details": [
+        ""
+      ],
+      "Disable": [
+        ""
+      ],
+      "Disable vulnerability analysis": [
+        ""
+      ],
       "Disconnected hosts: ": [
         "断开连接的主机："
       ],
@@ -116,6 +137,15 @@
       "Download latest report": [
         "下载最新的报告"
       ],
+      "Download report": [
+        ""
+      ],
+      "Duration": [
+        ""
+      ],
+      "Enable": [
+        ""
+      ],
       "Enable automatic deletion of mismatched host records from the Red Hat cloud": [
         "启用自动删除来自红帽云的主机记录"
       ],
@@ -140,6 +170,9 @@
       "Enable inventory upload": [
         "启用清单上传"
       ],
+      "Enable vulnerability analysis": [
+        ""
+      ],
       "Encountered an error while trying to access the server:": [
         "在尝试访问服务器时遇到错误："
       ],
@@ -155,6 +188,18 @@
       "Exit Code: %s": [
         "退出代码：%s"
       ],
+      "Failed": [
+        ""
+      ],
+      "Failed to destroy HBI host %s: %s": [
+        ""
+      ],
+      "Failed to fetch hosts": [
+        ""
+      ],
+      "Failed to update vulnerability analysis status": [
+        ""
+      ],
       "Fetch Insights-related host details": [
         "获取与 Insights 相关的主机详情"
       ],
@@ -191,6 +236,9 @@
       "Generate the report, but do not upload": [
         "生成报告，但不上传"
       ],
+      "Generated": [
+        ""
+      ],
       "Generating": [
         "生成中"
       ],
@@ -239,6 +287,9 @@
       "Insights": [
         "Insights"
       ],
+      "Invalid response from server": [
+        ""
+      ],
       "Inventory": [
         "清单"
       ],
@@ -275,6 +326,9 @@
       "Low": [
         "低"
       ],
+      "Manage vulnerability analysis": [
+        ""
+      ],
       "Manual": [
         "手册"
       ],
@@ -290,21 +344,42 @@
       "More details can be found in": [
         "如需更多详细信息，请参阅"
       ],
+      "N/A": [
+        ""
+      ],
       "Next run: ": [
         "下一次运行 ："
       ],
       "No": [
         "否"
       ],
+      "No account data available.": [
+        ""
+      ],
+      "No recent tasks": [
+        ""
+      ],
       "No recommendations were found for this host!": [
         "没有找到此主机的建议！"
       ],
+      "No report generation tasks have been run yet.": [
+        ""
+      ],
       "No results found": [
         "没有找到结果"
       ],
+      "No task history": [
+        ""
+      ],
       "No task was found": [
         "没有找到任务"
       ],
+      "No tasks have been run yet.": [
+        ""
+      ],
+      "None of the selected hosts are registered": [
+        ""
+      ],
       "Not reporting": [
         "未报告"
       ],
@@ -350,9 +425,15 @@
       "Pagination": [
         "分页"
       ],
+      "Paused": [
+        ""
+      ],
       "Playbook": [
         "运行 playbook"
       ],
+      "Previous tasks will appear here.": [
+        ""
+      ],
       "RH Cloud": [
         "RH Cloud"
       ],
@@ -407,6 +488,18 @@
       "Remediation summary": [
         "补救概述"
       ],
+      "Report Generation": [
+        ""
+      ],
+      "Report generation and upload started": [
+        ""
+      ],
+      "Report generation started": [
+        ""
+      ],
+      "Report saved to": [
+        ""
+      ],
       "Reporting": [
         "报告"
       ],
@@ -422,6 +515,9 @@
       "Run remediation playbook generated by Insights": [
         "运行 Insights 生成的补救 playbook"
       ],
+      "Running": [
+        ""
+      ],
       "Satellite server has %{hits_count} recommendations by Red Hat": [
         "Satellite 服务器有 %{hits_count} 个红帽提供的建议"
       ],
@@ -461,6 +557,15 @@
       "Start report generation": [
         "开始报告生成"
       ],
+      "Started": [
+        ""
+      ],
+      "Stopped": [
+        ""
+      ],
+      "Success": [
+        ""
+      ],
       "Successfully synced hosts: ": [
         "成功同步的主机："
       ],
@@ -518,15 +623,24 @@
       "Total risks": [
         "总风险"
       ],
+      "Unknown": [
+        ""
+      ],
       "Upload hits from iop-advisor-engine": [
         "从 iop-advisor-engine 上传 hits"
       ],
       "Upload hits information": [
         "上传 hits 信息"
       ],
+      "Upload is disabled because subscription connection is not enabled. Enable it in Administer > Settings > Content.": [
+        ""
+      ],
       "Upload rules related to the hits": [
         "上传与 hits 相关的 rule"
       ],
+      "Uploaded": [
+        ""
+      ],
       "Uploading": [
         "上载中"
       ],
@@ -539,18 +653,36 @@
       "View in Red Hat Insights": [
         "禁用 Red Hat Insights"
       ],
+      "View task": [
+        ""
+      ],
+      "View task details": [
+        ""
+      ],
       "Vulnerabilities": [
         "安全漏洞"
       ],
       "Vulnerability": [
         "安全漏洞"
       ],
+      "Vulnerability analysis disabled": [
+        ""
+      ],
+      "Vulnerability analysis enabled": [
+        ""
+      ],
       "Wait and %s": [
         "等待和 %s"
       ],
+      "Warning": [
+        ""
+      ],
       "Whether the resolution requires reboot": [
         "resolution 是否需要重启"
       ],
+      "You do not have permission to perform this action": [
+        ""
+      ],
       "category name": [
         "类别名称"
       ],

data/lib/foreman_inventory_upload/generators/fact_helpers.rb

@@ -28,14 +28,6 @@ module ForemanInventoryUpload
         @organization_accounts[organization.id] ||= organization.pools.where.not(account_number: nil).pluck(:account_number).first
       end
 
-      def golden_ticket?(organization)
-        result = organization.try(:golden_ticket?)
-        result = organization.content_access_mode == 'org_environment' if result.nil?
-
-        @organization_golden_tickets ||= {}
-        @organization_golden_tickets[organization.id] ||= result
-      end
-
       def cloud_provider(host)
         bios_version = fact_value(host, 'dmi::bios::version')
 

data/lib/foreman_inventory_upload/generators/queries.rb

@@ -47,8 +47,14 @@ module ForemanInventoryUpload
       end
 
       def self.for_slice(base)
-        base
-          .search_for("not params.#{InsightsCloud.enable_client_param_inventory} = f")
+        query = base
+
+        # In IoP mode, skip the parameter check - include all hosts regardless of opt-out setting
+        unless skip_inventory_parameter_filter?
+          query = query.search_for("not params.#{InsightsCloud.enable_client_param_inventory} = f")
+        end
+
+        query
           .joins(:subscription_facet)
           .preload(
             :interfaces,
@@ -56,10 +62,14 @@ module ForemanInventoryUpload
             :content_facet,
             :host_statuses,
             :inventory_upload_facts,
-            subscription_facet: [:pools, :installed_products, :hypervisor_host]
+            subscription_facet: [:installed_products, :hypervisor_host]
           )
       end
 
+      def self.skip_inventory_parameter_filter?
+        ForemanRhCloud.with_iop_smart_proxy?
+      end
+
       def self.for_org(organization_id, use_batches: true, hosts_query: '')
         base_query = for_slice(Host.unscoped.where(organization_id: organization_id).search_for(hosts_query))
         use_batches ? base_query.in_batches(of: ForemanInventoryUpload.slice_size) : base_query

data/lib/foreman_inventory_upload/generators/slice.rb

@@ -230,7 +230,7 @@ module ForemanInventoryUpload
         @stream.simple_field('system_purpose_sla', host.subscription_facet.service_level)
         @stream.simple_field('distribution_version', fact_value(host, 'distribution::version'))
         @stream.simple_field('satellite_instance_id', Foreman.try(:instance_id))
-        @stream.simple_field('is_simple_content_access', golden_ticket?(host.organization))
+        @stream.simple_field('is_simple_content_access', true)
         @stream.simple_field('is_hostname_obfuscated', !!obfuscate_hostname?(host))
         @stream.simple_field('organization_id', host.organization_id, :last)
       end

data/lib/foreman_inventory_upload.rb

@@ -1,10 +1,10 @@
 module ForemanInventoryUpload
   def self.base_folder
     # in production setup, where selinux is enabled, we only have rights to
-    # create folders under /ver/lib/foreman. If the folder does not exist, it's
-    # a dev setup, where we can use our current root
+    # create folders under /var/lib/foreman. If the folder does not exist, it's
+    # a dev setup, where we can use the parent of the current working directory
     @base_folder ||= File.join(
-      Dir.glob('/var/lib/foreman').first || Dir.getwd,
+      Dir.glob('/var/lib/foreman').first || File.dirname(Dir.getwd),
       'red_hat_inventory/'
     )
   end
@@ -30,11 +30,6 @@ module ForemanInventoryUpload
     File.join(ForemanInventoryUpload.done_folder, filename)
   end
 
-  def self.report_file_paths(organization_id)
-    filename = facts_archive_name(organization_id)
-    Dir[ForemanInventoryUpload.uploads_file_path(filename), ForemanInventoryUpload.done_file_path(filename)]
-  end
-
   def self.generated_reports_folder
     @generated_reports_folder ||= ensure_folder(
       File.join(
@@ -44,6 +39,26 @@ module ForemanInventoryUpload
     )
   end
 
+  def self.generated_reports_file_path(filename)
+    File.join(ForemanInventoryUpload.generated_reports_folder, filename)
+  end
+
+  def self.report_file_paths(organization_id)
+    filename = facts_archive_name(organization_id)
+    # Report files start in generated
+    # They are then MOVED (not copied) to uploads, then done.
+    # When they are moved to the new folder, they overwrite any file with the same name.
+    # If it's a generate-only, it will be in generated
+    # Failed or incomplete uploads will be in uploads
+    # Completed uploads will be in done
+    # The ordering here ensures we get the correct file path every time.
+    Dir[
+      ForemanInventoryUpload.generated_reports_file_path(filename),
+      ForemanInventoryUpload.uploads_file_path(filename),
+      ForemanInventoryUpload.done_file_path(filename),
+    ]
+  end
+
   def self.outputs_folder
     @outputs_folder ||= ensure_folder(File.join(ForemanInventoryUpload.base_folder, 'outputs/'))
   end

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '13.2.0'.freeze
+  VERSION = '14.0.1'.freeze
 end

data/locale/Makefile

@@ -60,9 +60,9 @@ tx-pull: $(EDITFILES)
 
 tx-update: tx-pull
 	@echo
-	@echo Run rake plugin:gettext[$(DOMAIN)] from the Foreman installation
-	@echo then run rake plugin:po_to_json[$(DOMAIN)] from the Foreman installation
-	@echo then run make -C locale mo-files to finish
+	@echo Run bundle exec rake plugin:gettext[$(DOMAIN)] from the Foreman installation git directory
+	@echo then run bundle exec rake plugin:po_to_json[$(DOMAIN)] from the Foreman installation git directory
+	@echo then run make -C locale mo-files from the foreman_rh_cloud directory to finish
 	@echo
 
 mo-files: $(MOFILES)