foreman_rh_cloud 12.2.5 → 12.2.7

data/locale/ko/foreman_rh_cloud.po

@@ -9,7 +9,6 @@
 # 0868a4d1af5275b3f70b0a6dac4c99a4, 2023
 # Ewoud Kohl van Wijngaarden <ewoud+transifex@kohlvanwijngaarden.nl>, 2025
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: foreman_rh_cloud 11.1.0\n"
@@ -42,6 +41,9 @@ msgstr "고급 인벤토리 설정"
 msgid "All recommendations are now selected."
 msgstr "모든 권장 사항이 선택되었습니다."
 
+msgid "Analytics data collection"
+msgstr ""
+
 msgid "Any Organization"
 msgstr "모든 조직 "
 
@@ -141,17 +143,14 @@ msgstr "인벤토리 업로드 활성화"
 msgid "Encountered an error while trying to access the server:"
 msgstr "서버에 접근하는 동안 오류가 발생했습니다:"
 
-msgid "Exclude installed Packages"
-msgstr "설치된 패키지 제외"
+msgid "Exclude installed packages"
+msgstr ""
 
 msgid "Exclude installed packages from being uploaded to the Red Hat cloud"
 msgstr "설치된 패키지가 Red Hat 클라우드에 업로드되는 것을 제외합니다."
 
-msgid "Exclude packages"
-msgstr "패키지 제외"
-
-msgid "Exclude packages from being uploaded to the Red Hat cloud"
-msgstr "Red Hat 클라우드에 업로드되는 패키지 제외"
+msgid "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.)"
+msgstr ""
 
 msgid "Exit Code: %s"
 msgstr "종료 코드: %s"
@@ -186,6 +185,9 @@ msgstr "전체 화면"
 msgid "Generate and upload report"
 msgstr "보고서 생성 및 업로드"
 
+msgid "Generate report"
+msgstr ""
+
 msgid "Generate the report, but do not upload"
 msgstr "보고서를 생성하되 업로드하지 마십시오."
 
@@ -255,6 +257,9 @@ msgstr "페이지당 항목"
 msgid "Knowledgebase article"
 msgstr "지식베이스 문서"
 
+msgid "Learn more about {minimalDataCollectionSetting}."
+msgstr ""
+
 msgid "List of host UUIDs"
 msgstr "호스트 UUID 목록"
 
@@ -270,6 +275,9 @@ msgstr "낮음"
 msgid "Manual"
 msgstr "수동"
 
+msgid "Minimal data collection"
+msgstr ""
+
 msgid "Moderate"
 msgstr "중간 수준"
 
@@ -300,21 +308,33 @@ msgstr "동기화할 것이 없습니다. 이 조직에 대한 서브스크립
 msgid "Notice"
 msgstr "주의 "
 
-msgid "Obfuscate IPs"
-msgstr "IP 난독화"
-
 msgid "Obfuscate host ipv4 addresses"
 msgstr "호스트 ipv4 주소 난독화"
 
+msgid "Obfuscate host ipv4 addresses."
+msgstr ""
+
 msgid "Obfuscate host names"
 msgstr "호스트 이름 난독화"
 
 msgid "Obfuscate host names sent to the Red Hat cloud"
 msgstr "Red Hat 클라우드로 전송된 호스트 이름을 난독화합니다."
 
+msgid "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.)"
+msgstr ""
+
 msgid "Obfuscate ipv4 addresses sent to the Red Hat cloud"
 msgstr "Red Hat 클라우드로 전송된 ipv4 주소 난독화"
 
+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 addresses are not included in the report.)"
+msgstr ""
+
+msgid "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."
+msgstr ""
+
+msgid "Only send the minimum required data to Red Hat cloud, obfuscation settings are disabled"
+msgstr ""
+
 msgid "Oops! Couldn't find organization that matches your query"
 msgstr "죄송합니다! 귀하의 쿼리와 일치하는 조직을 찾을 수 없습니다."
 
@@ -333,9 +353,6 @@ msgstr "RH 클라우드"
 msgid "RHC daemon id"
 msgstr "RHC 데몬 ID"
 
-msgid "RHCloud"
-msgstr "RHCloud"
-
 msgid "Read more about it in RH cloud insights"
 msgstr "RH 클라우드 Insights에서 이에 대해 자세히 알아보세요."
 
@@ -393,8 +410,8 @@ msgstr "해결 방법"
 msgid "Run RH Cloud playbook"
 msgstr "RH Cloud playbook 실행"
 
-msgid "Run playbook genrated by Red Hat remediations app"
-msgstr "Red Hat Remediations 앱에서 생성된 playbook 실행"
+msgid "Run playbook generated by Red Hat remediations app"
+msgstr ""
 
 msgid "Run remediation playbook generated by Insights"
 msgstr "Insights에서 생성된 수정 playbook 실행"
@@ -408,6 +425,9 @@ msgstr "호스트 제거를 위한 범위 검색 문자열"
 msgid "Select recommendations from all pages"
 msgstr "모든 페이지에서 추천을 선택하세요"
 
+msgid "Send additional data to enhance Insights services, as per the settings"
+msgstr ""
+
 msgid "Set the current organization context for the request"
 msgstr "요청에 대한 현재 조직 컨텍스트 설정"
 
@@ -453,8 +473,8 @@ msgstr "Red Hat 하이브리드 클라우드 콘솔은 이 Foreman 인스턴스
 msgid "The report file %{filename} doesn't exist"
 msgstr "보고서 파일%{filename}이/가 존재하지 않습니다"
 
-msgid "The scheduled process is disabled because this Foreman is configured with the use_local_advisor_engine option."
-msgstr "예약된 프로세스는 이 Foreman이 use_local_advisor_engine 옵션으로 구성되어 있기 때문에 비활성화되었습니다."
+msgid "The scheduled process is disabled because this Foreman is configured with a local IoP Smart Proxy."
+msgstr ""
 
 msgid "The server returned the following error: %s"
 msgstr "서버에서 다음 오류가 반환되었습니다. %s"
@@ -474,6 +494,9 @@ msgstr "이 보고서를 모든 Foreman 조직에 대해 활성화하려면 {upl
 msgid "To manually upload the data for a specific organization, select an organization and click {restartButtonName}."
 msgstr "특정 조직에 대한 데이터를 수동으로 업로드하려면 조직을 선택하고 {restartButtonName}를 클릭하십시오."
 
+msgid "Total CVEs"
+msgstr ""
+
 msgid "Total risk"
 msgstr "총 위험"
 
@@ -501,6 +524,12 @@ msgstr "모든 권장 사항 보기"
 msgid "View in Red Hat Insights"
 msgstr "Red Hat Insights에서 보기"
 
+msgid "Vulnerabilities"
+msgstr ""
+
+msgid "Vulnerability"
+msgstr ""
+
 msgid "Wait and %s"
 msgstr "대기 및 %s"
 
@@ -567,6 +596,9 @@ msgstr "규칙 ID"
 msgid "rule title"
 msgstr "규칙 제목"
 
+msgid "setting minimal data collection"
+msgstr ""
+
 msgid "solution url"
 msgstr "솔루션 URL"
 

data/locale/zh_CN/foreman_rh_cloud.po

@@ -10,7 +10,6 @@
 # Amit Upadhye <aupadhye@redhat.com>, 2023
 # Ewoud Kohl van Wijngaarden <ewoud+transifex@kohlvanwijngaarden.nl>, 2025
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: foreman_rh_cloud 11.1.0\n"
@@ -44,6 +43,9 @@ msgstr "高级清单设置"
 msgid "All recommendations are now selected."
 msgstr "现在选择了所有建议。"
 
+msgid "Analytics data collection"
+msgstr ""
+
 msgid "Any Organization"
 msgstr "任意机构"
 
@@ -143,17 +145,14 @@ msgstr "启用清单上传"
 msgid "Encountered an error while trying to access the server:"
 msgstr "在尝试访问服务器时遇到错误："
 
-msgid "Exclude installed Packages"
-msgstr "排除安装的软件包"
+msgid "Exclude installed packages"
+msgstr ""
 
 msgid "Exclude installed packages from being uploaded to the Red Hat cloud"
 msgstr "将安装的软件包上传到红帽云"
 
-msgid "Exclude packages"
-msgstr "排除软件包"
-
-msgid "Exclude packages from being uploaded to the Red Hat cloud"
-msgstr "排除软件包上传到红帽云"
+msgid "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.)"
+msgstr ""
 
 msgid "Exit Code: %s"
 msgstr "退出代码：%s"
@@ -188,6 +187,9 @@ msgstr "全屏"
 msgid "Generate and upload report"
 msgstr "生成并上传报告"
 
+msgid "Generate report"
+msgstr ""
+
 msgid "Generate the report, but do not upload"
 msgstr "生成报告，但不上传"
 
@@ -257,6 +259,9 @@ msgstr "每页的项"
 msgid "Knowledgebase article"
 msgstr "知识库文章"
 
+msgid "Learn more about {minimalDataCollectionSetting}."
+msgstr ""
+
 msgid "List of host UUIDs"
 msgstr "主机 UUID 列表"
 
@@ -272,6 +277,9 @@ msgstr "低"
 msgid "Manual"
 msgstr "手册"
 
+msgid "Minimal data collection"
+msgstr ""
+
 msgid "Moderate"
 msgstr "中等"
 
@@ -302,21 +310,33 @@ msgstr "没有同步，此机构没有带有订阅的主机。"
 msgid "Notice"
 msgstr "注意事項"
 
-msgid "Obfuscate IPs"
-msgstr "模糊 IP"
-
 msgid "Obfuscate host ipv4 addresses"
 msgstr "模糊的主机 ipv4 地址"
 
+msgid "Obfuscate host ipv4 addresses."
+msgstr ""
+
 msgid "Obfuscate host names"
 msgstr "模糊主机名"
 
 msgid "Obfuscate host names sent to the Red Hat cloud"
 msgstr "发送到红帽云的模糊主机名"
 
+msgid "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.)"
+msgstr ""
+
 msgid "Obfuscate ipv4 addresses sent to the Red Hat cloud"
 msgstr "发送到红帽云的模糊 ipv4 地址"
 
+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 addresses are not included in the report.)"
+msgstr ""
+
+msgid "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."
+msgstr ""
+
+msgid "Only send the minimum required data to Red Hat cloud, obfuscation settings are disabled"
+msgstr ""
+
 msgid "Oops! Couldn't find organization that matches your query"
 msgstr "未找到与您的查询匹配的机构"
 
@@ -335,9 +355,6 @@ msgstr "RH Cloud"
 msgid "RHC daemon id"
 msgstr "RHC 守护进程 ID"
 
-msgid "RHCloud"
-msgstr "RHCloud"
-
 msgid "Read more about it in RH cloud insights"
 msgstr "在 RH Cloud insights 中了解更多有关它的信息"
 
@@ -395,8 +412,8 @@ msgstr "解决方案"
 msgid "Run RH Cloud playbook"
 msgstr "运行 RH Cloud playbook"
 
-msgid "Run playbook genrated by Red Hat remediations app"
-msgstr "运行由红帽补救应用生成的 playbook"
+msgid "Run playbook generated by Red Hat remediations app"
+msgstr ""
 
 msgid "Run remediation playbook generated by Insights"
 msgstr "运行 Insights 生成的补救 playbook"
@@ -410,6 +427,9 @@ msgstr "用于删除主机的有范围的搜索字符串"
 msgid "Select recommendations from all pages"
 msgstr "在所有页面中选择建议"
 
+msgid "Send additional data to enhance Insights services, as per the settings"
+msgstr ""
+
 msgid "Set the current organization context for the request"
 msgstr "设置请求的当前机构上下文"
 
@@ -455,8 +475,8 @@ msgstr "Red Hat Hybrid Cloud Console 提供了一组云服务，包括 Red Hat I
 msgid "The report file %{filename} doesn't exist"
 msgstr "报告文件 %{filename} 不存在"
 
-msgid "The scheduled process is disabled because this Foreman is configured with the use_local_advisor_engine option."
-msgstr "调度的进程被禁用，因为此 Foreman 配置了 use_local_advisor_engine 选项。"
+msgid "The scheduled process is disabled because this Foreman is configured with a local IoP Smart Proxy."
+msgstr ""
 
 msgid "The server returned the following error: %s"
 msgstr "服务器返回以下错误：%s"
@@ -476,6 +496,9 @@ msgstr "要为所有 Foreman 机构启用此报告，请将 {uploadButtonName}
 msgid "To manually upload the data for a specific organization, select an organization and click {restartButtonName}."
 msgstr "要手动上传特定机构的数据，请选择机构并点 {restartButtonName}。"
 
+msgid "Total CVEs"
+msgstr ""
+
 msgid "Total risk"
 msgstr "总风险"
 
@@ -503,6 +526,12 @@ msgstr "查看所有建议"
 msgid "View in Red Hat Insights"
 msgstr "禁用 Red Hat Insights"
 
+msgid "Vulnerabilities"
+msgstr ""
+
+msgid "Vulnerability"
+msgstr ""
+
 msgid "Wait and %s"
 msgstr "等待和 %s"
 
@@ -569,6 +598,9 @@ msgstr "rule id"
 msgid "rule title"
 msgstr "rule 标题"
 
+msgid "setting minimal data collection"
+msgstr ""
+
 msgid "solution url"
 msgstr "solution url"
 

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "foreman_rh_cloud",
-  "version": "12.2.5",
+  "version": "12.2.7",
   "description": "Inventory Upload =============",
   "main": "index.js",
   "scripts": {

data/test/jobs/queue_for_upload_job_test.rb

@@ -0,0 +1,63 @@
+require 'test_plugin_helper'
+require 'foreman_tasks/test_helpers'
+
+class QueueForUploadJobTest < ActiveSupport::TestCase
+  include ForemanTasks::TestHelpers::WithInThreadExecutor
+  include FolderIsolation
+
+  let(:organization) { FactoryBot.create(:organization) }
+  let(:base_folder) { @tmpdir }
+  let(:report_file) { 'test_report.tar.xz' }
+  let(:report_path) { File.join(base_folder, report_file) }
+  let(:uploads_folder) { ForemanInventoryUpload.uploads_folder }
+  subject { ForemanTasks.sync_task(ForemanInventoryUpload::Async::QueueForUploadJob, base_folder, report_file, organization.id) }
+
+  setup do
+    # Stub the script template source
+    script_source = File.join(ForemanRhCloud::Engine.root, 'lib/foreman_inventory_upload/scripts/uploader.sh.erb')
+    File.stubs(:read).with(script_source).returns('#!/bin/bash\necho "Test script"')
+
+    # Stub template rendering
+    Foreman::Renderer.stubs(:render).returns('#!/bin/bash\necho "Rendered script"')
+
+    # Stub additional settings that are accessed
+    Setting.stubs(:[]).with(:content_default_http_proxy).returns(nil)
+    Setting.stubs(:[]).with(:http_proxy).returns(nil)
+    Setting.stubs(:[]).with("foreman_tasks_sync_task_timeout").returns(120)
+    FileUtils.touch(report_path)
+  end
+
+  teardown do
+    FileUtils.rm_rf(uploads_folder) if Dir.exist?(uploads_folder)
+  end
+
+  test 'plan method sets up the job correctly and calls plan_upload_report' do
+    # Mock plan_upload_report to verify it's called
+    ForemanInventoryUpload::Async::QueueForUploadJob.any_instance.expects(:plan_upload_report).once
+
+    assert_equal 'success', subject.result
+  end
+
+  test 'run method processes file and moves it to uploads folder' do
+    ForemanInventoryUpload::Async::QueueForUploadJob.any_instance.stubs(:plan_upload_report)
+
+    assert_equal 'success', subject.result
+
+    # Verify the file was moved
+    refute File.exist?(report_path), "Original file should be moved"
+    assert File.exist?(File.join(uploads_folder, report_file)), "File should exist in uploads folder"
+  end
+
+  test 'creates necessary folders and scripts' do
+    ForemanInventoryUpload::Async::QueueForUploadJob.any_instance.stubs(:plan_upload_report)
+
+    assert_equal 'success', subject.result
+
+    # Verify the uploads folder was created
+    assert Dir.exist?(uploads_folder), "Uploads folder should be created"
+
+    # Verify the script file was created
+    script_path = File.join(uploads_folder, ForemanInventoryUpload.upload_script_file)
+    assert File.exist?(script_path), "Upload script should be created"
+  end
+end

data/test/jobs/upload_report_job_test.rb

@@ -18,7 +18,8 @@ class UploadReportJobTest < ActiveSupport::TestCase
 
     label = ForemanInventoryUpload::Async::UploadReportJob.output_label(organization.id)
     progress_output = ForemanInventoryUpload::Async::ProgressOutput.get(label)
-    assert_match(/Upload canceled/, progress_output.full_output)
+    assert_match(/upload was canceled because connection to Insights is not enabled/, progress_output.full_output)
+    assert_match(/Report location:/, progress_output.full_output)
     assert_match(/exit 1/, progress_output.status)
   end
 

data/webpack/InsightsHostDetailsTab/InsightsTab.scss

@@ -88,3 +88,7 @@
 #new_host_details_insights_tab {
   padding: 24px;
 }
+
+#total-risks-dropdown-container ul.pf-v5-c-menu__list {
+  margin-bottom: 0px;
+}

data/webpack/InsightsHostDetailsTab/InsightsTotalRiskChart.js

@@ -3,8 +3,7 @@ import PropTypes from 'prop-types';
 import { useDispatch } from 'react-redux';
 import { push } from 'connected-react-router';
 import { useHistory } from 'react-router-dom';
-import { Bullseye, Title } from '@patternfly/react-core';
-import { DropdownItem } from '@patternfly/react-core/deprecated';
+import { Bullseye, DropdownItem, Title } from '@patternfly/react-core';
 import {
   ChartDonut,
   ChartLegend,
@@ -127,6 +126,7 @@ const InsightsTotalRiskCard = ({ hostDetails: { id } }) => {
   return (
     <CardTemplate
       header={__('Total risks')}
+      overrideDropdownProps={{ id: 'total-risks-dropdown-container' }}
       dropdownItems={[
         <DropdownItem
           key="insights-tab"

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 12.2.5
+  version: 12.2.7
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
+autorequire:
 bindir: bin
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2025-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman_ansible
@@ -267,6 +268,7 @@ files:
 - test/jobs/inventory_hosts_sync_test.rb
 - test/jobs/inventory_scheduled_sync_test.rb
 - test/jobs/inventory_self_host_sync_test.rb
+- test/jobs/queue_for_upload_job_test.rb
 - test/jobs/remove_insights_hosts_job_test.rb
 - test/jobs/upload_report_job_test.rb
 - test/models/insights_client_report_status_test.rb
@@ -674,6 +676,7 @@ homepage: https://github.com/theforeman/foreman_rh_cloud
 licenses:
 - GPL-3.0
 metadata: {}
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -691,7 +694,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.2.33
+signing_key:
 specification_version: 4
 summary: Summary of ForemanRhCloud.
 test_files:
@@ -719,6 +723,7 @@ test_files:
 - test/jobs/inventory_hosts_sync_test.rb
 - test/jobs/inventory_scheduled_sync_test.rb
 - test/jobs/inventory_self_host_sync_test.rb
+- test/jobs/queue_for_upload_job_test.rb
 - test/jobs/remove_insights_hosts_job_test.rb
 - test/jobs/upload_report_job_test.rb
 - test/models/insights_client_report_status_test.rb