foreman_rh_cloud 11.1.0 → 11.2.0

data/locale/zh_CN/foreman_rh_cloud.po

@@ -12,7 +12,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_rh_cloud 1.0.0\n"
+"Project-Id-Version: foreman_rh_cloud 11.1.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2023-01-20 13:26+0000\n"
 "Last-Translator: Ewoud Kohl van Wijngaarden <ewoud+transifex@kohlvanwijngaarde"
@@ -25,8 +25,8 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-msgid " Sync inventory status"
-msgstr " 同步清单状态"
+msgid " Sync all inventory status"
+msgstr ""
 
 msgid "%s organizations"
 msgstr "%s 机构"
@@ -91,12 +91,12 @@ msgstr "完成"
 msgid "Configure"
 msgstr "配置"
 
-msgid "Configure Cloud Connector"
-msgstr "配置云连接器"
-
 msgid "Configure Cloud Connector on given hosts"
 msgstr "在给定主机上配置 Cloud Connector"
 
+msgid "Configure cloud connector"
+msgstr ""
+
 msgid "Connectivity test"
 msgstr "连接测试"
 
@@ -157,6 +157,9 @@ msgstr "排除软件包上传到红帽云"
 msgid "Exit Code: %s"
 msgstr "退出代码：%s"
 
+msgid "Fetch Insights-related host details"
+msgstr ""
+
 msgid "Fetching data about your accounts"
 msgstr "获取有关您的帐户的数据"
 
@@ -181,14 +184,17 @@ msgstr "处理数据并将其上传到红帽云的 Foreman 插件"
 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"
-msgstr "进入 Satellite Insights 页面"
+msgid "Go to Foreman Insights page"
+msgstr ""
 
 msgid "Go to first page"
 msgstr "前往第一页"
@@ -229,9 +235,6 @@ msgstr "在 insights-client 报告中包含参数"
 msgid "Insights"
 msgstr "Insights"
 
-msgid "Insights synchronization process is used to provide Insights recommendations output for hosts managed here."
-msgstr "Insights 同步过程用于为此处管理的主机提供 Insights 建议输出。"
-
 msgid "Inventory"
 msgstr "清单"
 
@@ -253,6 +256,9 @@ msgstr "每页的项"
 msgid "Knowledgebase article"
 msgstr "知识库文章"
 
+msgid "List of host UUIDs"
+msgstr ""
+
 msgid "Loading"
 msgstr "加载"
 
@@ -355,8 +361,8 @@ msgstr "选择的建议：%s。"
 msgid "Recommendations synced successfully"
 msgstr "成功同步建议"
 
-msgid "Reconfigure Cloud Connector"
-msgstr "重新配置云连接器"
+msgid "Reconfigure cloud connector"
+msgstr ""
 
 msgid "Red Hat Cloud Inventory"
 msgstr "红帽云清单"
@@ -385,9 +391,6 @@ msgstr "报告"
 msgid "Resolution"
 msgstr "解决方案"
 
-msgid "Restart"
-msgstr "重新开始"
-
 msgid "Run RH Cloud playbook"
 msgstr "运行 RH Cloud playbook"
 
@@ -418,6 +421,9 @@ msgstr "应从 Foreman 导入包含参数标签？"
 msgid "Show Advanced Settings"
 msgstr "显示高级设置"
 
+msgid "Show if system is configured to use local iop-advisor-engine."
+msgstr ""
+
 msgid "Start inventory synchronization"
 msgstr "启动清单同步"
 
@@ -439,15 +445,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 "报告文件 %{filename} 不存在"
 
+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 "服务器返回以下错误：%s"
 
@@ -460,7 +469,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}."
@@ -472,6 +481,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 "上载中"
 
@@ -487,18 +505,87 @@ msgstr "禁用 Red Hat Insights"
 msgid "Wait and %s"
 msgstr "等待和 %s"
 
+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 "page"
 
 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 "查看正在进行中的任务"
 

data/package.json

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

data/test/unit/services/foreman_rh_cloud/cloud_request_forwarder_test.rb

@@ -112,6 +112,30 @@ class CloudRequestForwarderTest < ActiveSupport::TestCase
     assert_equal params.merge(:branch_id => 74), @forwarder.prepare_forward_params(req, 74)
   end
 
+  test 'should NOT add branch id into forwarded params for compliance urls' do
+    user_agent = { :foo => :bar }
+    params = { :page => 5, :per_page => 42 }
+
+    uris = [
+      "/redhat_access/r/insights/platform/compliance/v2/systems/MyUUID/policies",
+      "/redhat_access/r/insights/platform/compliance/v2/policies/MyUUID",
+      "/redhat_access/r/insights/platform/compliance/v2/systems/MyUUID",
+      "/redhat_access/r/insights/platform/compliance/v2/policies",
+      "/redhat_access/r/insights/platform/compliance/v2/",
+    ]
+    uris.each do |uri|
+      req = ActionDispatch::Request.new(
+        'REQUEST_URI' => uri,
+        'REQUEST_METHOD' => 'GET',
+        'HTTP_USER_AGENT' => user_agent,
+        'rack.input' => ::Puma::NullIO.new,
+        'action_dispatch.request.query_parameters' => params
+      )
+      req.stubs(:path).returns(uri)
+      refute @forwarder.prepare_forward_params(req, 74).key?(:branch_id), "Branch id should not be added for #{uri}"
+    end
+  end
+
   test 'should reuse BranchInfo identifiers for user_agent' do
     user_agent = { :foo => :bar }
     params = { :page => 5, :per_page => 42 }

data/test/unit/services/foreman_rh_cloud/hits_uploader_test.rb

@@ -72,8 +72,11 @@ class HitsUploaderTest < ActiveSupport::TestCase
   setup do
     @host = FactoryBot.create(:host)
     @uuid = SecureRandom.uuid
-    uploader = ForemanRhCloud::HitsUploader.new(host: @host, payload: PAYLOAD, uuid: @uuid)
-    uploader.upload!
+    rules_resolutions = [PAYLOAD[:rules], PAYLOAD[:resolutions]]
+    ForemanRhCloud::RulesIngester.any_instance.
+      expects(:fetch_rules_and_resolutions).returns(rules_resolutions)
+    @uploader = ForemanRhCloud::HitsUploader.new(host: @host, payload: PAYLOAD, uuid: @uuid)
+    @uploader.upload!
     @host.reload
   end
 
@@ -86,6 +89,14 @@ class HitsUploaderTest < ActiveSupport::TestCase
     assert_includes @host.insights_facet.hits.pluck(:rule_id), "R124"
   end
 
+  test 'assert reupload does not trigger rules download' do
+    # rules must already be in the database so dont retrigger
+    # rules download.
+    ForemanRhCloud::RulesIngester.any_instance.
+      expects(:ingest_rules_and_resolutions!).never
+    @uploader.upload!
+  end
+
   test "resolutions" do
     assert_equal 2, InsightsResolution.where(rule_id: ["R123", "R124"]).count
   end

data/test/unit/services/foreman_rh_cloud/rules_ingester_test.rb

@@ -0,0 +1,60 @@
+require 'test_plugin_helper'
+
+class RulesIngesterTest < ActiveSupport::TestCase
+  PAYLOAD = {
+    non_active: {
+      rule_id: "non_active",
+      active: false,
+    },
+    no_playbooks: {
+      rule_id: "no_playbooks",
+      active: true,
+      playbooks: {},
+    },
+    R123: {
+      active: true,
+      rule_id: "R123",
+      description: "R123 failed.",
+      category: "Stability",
+      reboot_required: false,
+      impact_name: "R123 Failure",
+      rec_impact: 1,
+      rec_likelihood: 1,
+      playbooks: {
+        resolution1: {
+          name: "Update package to 100.9 or above",
+          reboot_required: false,
+        },
+        resolution2: {
+          name: "Update other package to 101.9 or above",
+          reboot_required: true,
+          text: "- name: Update package-102",
+        },
+      },
+    },
+  }.freeze
+
+  setup do
+    ForemanRhCloud::RulesIngester.any_instance.expects(:fetch_rules_data).returns(PAYLOAD)
+    ForemanRhCloud::RulesIngester.new.ingest_rules_and_resolutions!
+  end
+
+  test 'non active are ignored' do
+    refute InsightsRule.where(rule_id: "non_active").exists?
+  end
+
+  test 'non playbooks are ignored' do
+    refute InsightsRule.where(rule_id: "no_playbooks").exists?
+  end
+
+  test 'R123 exists' do
+    rule = InsightsRule.find_by(rule_id: "R123")
+    refute_nil rule
+    assert_equal "R123 Failure", rule.impact_name
+  end
+
+  test 'Resolutions exists' do
+    assert_equal 2, InsightsResolution.where(rule_id: "R123").count
+    assert InsightsResolution.where(rule_id: "R123", resolution_type: "resolution1").exists?
+  end
+end

data/test/unit/slice_generator_test.rb

@@ -453,9 +453,9 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     assert_equal 1, generator.hosts_count
   end
 
-  test 'excludes hosts with host_registration_insights set to false' do
+  test 'excludes hosts with host_registration_insights_inventory set to false' do
     @host.host_parameters << HostParameter.create(
-      name: 'host_registration_insights',
+      name: 'host_registration_insights_inventory',
       value: "false",
       parameter_type: 'boolean'
     )
@@ -465,6 +465,28 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     assert_equal 0, count
   end
 
+  test 'includes hosts with host_registration_insights set to true' do
+    @host.host_parameters.build(
+      name: 'host_registration_insights_inventory',
+      value: 'true',
+      parameter_type: 'boolean'
+    )
+    @host.save!
+
+    batch = Host.where(id: @host.id).in_batches.first
+    generator = create_generator(batch)
+
+    actual = JSON.parse(generator.render.join("\n"))
+
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
+    assert_not_nil actual_host = actual['hosts'].first
+    assert_equal @host.fqdn, actual_host['fqdn']
+
+    param = @host.host_parameters.first
+    assert_equal 'host_registration_insights_inventory', param.name
+    assert_equal true, param.value
+  end
+
   test 'shows system_memory_bytes in bytes' do
     FactoryBot.create(:fact_value, fact_name: fact_names['memory::memtotal'], value: '1', host: @host)
 

data/webpack/InsightsCloudSync/Components/RemediationModal/RemediationModal.js

@@ -74,7 +74,11 @@ const RemediationModal = ({
           <TableHeader />
           <TableBody />
         </Table>
-        <TableEmptyState status={status} error={error} />
+        <TableEmptyState
+          status={status}
+          error={error}
+          rowsLength={rows.length}
+        />
       </Modal>
     </React.Fragment>
   );

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 11.1.0
+  version: 11.2.0
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-03 00:00:00.000000000 Z
+date: 2025-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman_ansible
@@ -94,6 +94,7 @@ files:
 - app/assets/javascripts/foreman_rh_cloud/locale/fr/foreman_rh_cloud.js
 - app/assets/javascripts/foreman_rh_cloud/locale/ja/foreman_rh_cloud.js
 - app/assets/javascripts/foreman_rh_cloud/locale/ka/foreman_rh_cloud.js
+- app/assets/javascripts/foreman_rh_cloud/locale/ko/foreman_rh_cloud.js
 - app/assets/javascripts/foreman_rh_cloud/locale/zh_CN/foreman_rh_cloud.js
 - app/controllers/api/v2/advisor_engine/advisor_engine_controller.rb
 - app/controllers/api/v2/rh_cloud/advisor_engine_config_controller.rb
@@ -139,6 +140,7 @@ files:
 - app/services/foreman_rh_cloud/hits_uploader.rb
 - app/services/foreman_rh_cloud/insights_status_cleaner.rb
 - app/services/foreman_rh_cloud/remediations_retriever.rb
+- app/services/foreman_rh_cloud/rules_ingester.rb
 - app/services/foreman_rh_cloud/template_renderer_helper.rb
 - app/services/foreman_rh_cloud/url_remediations_retriever.rb
 - app/views/api/v2/advisor_engine/host_details.json.rabl
@@ -171,6 +173,7 @@ files:
 - db/migrate/20241217190624_add_unique_index_to_rule_id_and_host_id_in_insights_hits.rb
 - db/migrate/20241220184900_change_sync_insights_recommendations_to_true.rb
 - db/seeds.d/179_ui_notifications.rb
+- db/seeds.d/189_add_host_inventory_param.rb
 - db/seeds.d/50_job_templates.rb
 - lib/foreman_inventory_upload.rb
 - lib/foreman_inventory_upload/async/async_helpers.rb
@@ -227,6 +230,8 @@ files:
 - locale/ja/foreman_rh_cloud.po
 - locale/ka/LC_MESSAGES/foreman_rh_cloud.mo
 - locale/ka/foreman_rh_cloud.po
+- locale/ko/LC_MESSAGES/foreman_rh_cloud.mo
+- locale/ko/foreman_rh_cloud.po
 - locale/zh_CN/LC_MESSAGES/foreman_rh_cloud.mo
 - locale/zh_CN/foreman_rh_cloud.po
 - package.json
@@ -271,6 +276,7 @@ files:
 - test/unit/services/foreman_rh_cloud/hit_remediations_retriever_test.rb
 - test/unit/services/foreman_rh_cloud/hits_uploader_test.rb
 - test/unit/services/foreman_rh_cloud/insights_status_cleaner_test.rb
+- test/unit/services/foreman_rh_cloud/rules_ingester_test.rb
 - test/unit/services/foreman_rh_cloud/template_renderer_helper_test.rb
 - test/unit/services/foreman_rh_cloud/url_remediations_retriever_test.rb
 - test/unit/shell_process_job_test.rb
@@ -664,7 +670,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.27
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: Summary of ForemanRhCloud.
@@ -710,6 +716,7 @@ test_files:
 - test/unit/services/foreman_rh_cloud/hit_remediations_retriever_test.rb
 - test/unit/services/foreman_rh_cloud/hits_uploader_test.rb
 - test/unit/services/foreman_rh_cloud/insights_status_cleaner_test.rb
+- test/unit/services/foreman_rh_cloud/rules_ingester_test.rb
 - test/unit/services/foreman_rh_cloud/template_renderer_helper_test.rb
 - test/unit/services/foreman_rh_cloud/url_remediations_retriever_test.rb
 - test/unit/shell_process_job_test.rb