foreman_rh_cloud 12.2.6 → 12.2.7

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

@@ -35,6 +35,9 @@
       "All recommendations are now selected.": [
         "모든 권장 사항이 선택되었습니다."
       ],
+      "Analytics data collection": [
+        ""
+      ],
       "Any Organization": [
         "모든 조직 "
       ],
@@ -134,17 +137,14 @@
       "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": [
         "설치된 패키지가 Red Hat 클라우드에 업로드되는 것을 제외합니다."
       ],
-      "Exclude packages": [
-        "패키지 제외"
-      ],
-      "Exclude packages from being uploaded to the Red Hat cloud": [
-        "Red Hat 클라우드에 업로드되는 패키지 제외"
+      "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.)": [
+        ""
       ],
       "Exit Code: %s": [
         "종료 코드: %s"
@@ -179,6 +179,9 @@
       "Generate and upload report": [
         "보고서 생성 및 업로드"
       ],
+      "Generate report": [
+        ""
+      ],
       "Generate the report, but do not upload": [
         "보고서를 생성하되 업로드하지 마십시오."
       ],
@@ -248,6 +251,9 @@
       "Knowledgebase article": [
         "지식베이스 문서"
       ],
+      "Learn more about {minimalDataCollectionSetting}.": [
+        ""
+      ],
       "List of host UUIDs": [
         "호스트 UUID 목록"
       ],
@@ -263,6 +269,9 @@
       "Manual": [
         "수동"
       ],
+      "Minimal data collection": [
+        ""
+      ],
       "Moderate": [
         "중간 수준"
       ],
@@ -293,21 +302,33 @@
       "Notice": [
         "주의 "
       ],
-      "Obfuscate IPs": [
-        "IP 난독화"
-      ],
       "Obfuscate host ipv4 addresses": [
         "호스트 ipv4 주소 난독화"
       ],
+      "Obfuscate host ipv4 addresses.": [
+        ""
+      ],
       "Obfuscate host names": [
         "호스트 이름 난독화"
       ],
       "Obfuscate host names sent to the Red Hat cloud": [
         "Red Hat 클라우드로 전송된 호스트 이름을 난독화합니다."
       ],
+      "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.)": [
+        ""
+      ],
       "Obfuscate ipv4 addresses sent to the Red Hat cloud": [
         "Red Hat 클라우드로 전송된 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.)": [
+        ""
+      ],
+      "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.": [
+        ""
+      ],
+      "Only send the minimum required data to Red Hat cloud, obfuscation settings are disabled": [
+        ""
+      ],
       "Oops! Couldn't find organization that matches your query": [
         "죄송합니다! 귀하의 쿼리와 일치하는 조직을 찾을 수 없습니다."
       ],
@@ -326,9 +347,6 @@
       "RHC daemon id": [
         "RHC 데몬 ID"
       ],
-      "RHCloud": [
-        "RHCloud"
-      ],
       "Read more about it in RH cloud insights": [
         "RH 클라우드 Insights에서 이에 대해 자세히 알아보세요."
       ],
@@ -386,8 +404,8 @@
       "Run RH Cloud playbook": [
         "RH Cloud playbook 실행"
       ],
-      "Run playbook genrated by Red Hat remediations app": [
-        "Red Hat Remediations 앱에서 생성된 playbook 실행"
+      "Run playbook generated by Red Hat remediations app": [
+        ""
       ],
       "Run remediation playbook generated by Insights": [
         "Insights에서 생성된 수정 playbook 실행"
@@ -401,6 +419,9 @@
       "Select recommendations from all pages": [
         "모든 페이지에서 추천을 선택하세요"
       ],
+      "Send additional data to enhance Insights services, as per the settings": [
+        ""
+      ],
       "Set the current organization context for the request": [
         "요청에 대한 현재 조직 컨텍스트 설정"
       ],
@@ -446,8 +467,8 @@
       "The report file %{filename} doesn't exist": [
         "보고서 파일%{filename}이/가 존재하지 않습니다"
       ],
-      "The scheduled process is disabled because this Foreman is configured with the use_local_advisor_engine option.": [
-        "예약된 프로세스는 이 Foreman이 use_local_advisor_engine 옵션으로 구성되어 있기 때문에 비활성화되었습니다."
+      "The scheduled process is disabled because this Foreman is configured with a local IoP Smart Proxy.": [
+        ""
       ],
       "The server returned the following error: %s": [
         "서버에서 다음 오류가 반환되었습니다. %s"
@@ -467,6 +488,9 @@
       "To manually upload the data for a specific organization, select an organization and click {restartButtonName}.": [
         "특정 조직에 대한 데이터를 수동으로 업로드하려면 조직을 선택하고 {restartButtonName}를 클릭하십시오."
       ],
+      "Total CVEs": [
+        ""
+      ],
       "Total risk": [
         "총 위험"
       ],
@@ -494,6 +518,12 @@
       "View in Red Hat Insights": [
         "Red Hat Insights에서 보기"
       ],
+      "Vulnerabilities": [
+        ""
+      ],
+      "Vulnerability": [
+        ""
+      ],
       "Wait and %s": [
         "대기 및 %s"
       ],
@@ -560,6 +590,9 @@
       "rule title": [
         "규칙 제목"
       ],
+      "setting minimal data collection": [
+        ""
+      ],
       "solution url": [
         "솔루션 URL"
       ],

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

@@ -35,6 +35,9 @@
       "All recommendations are now selected.": [
         "现在选择了所有建议。"
       ],
+      "Analytics data collection": [
+        ""
+      ],
       "Any Organization": [
         "任意机构"
       ],
@@ -134,17 +137,14 @@
       "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 packages": [
-        "排除软件包"
-      ],
-      "Exclude 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.)": [
+        ""
       ],
       "Exit Code: %s": [
         "退出代码：%s"
@@ -179,6 +179,9 @@
       "Generate and upload report": [
         "生成并上传报告"
       ],
+      "Generate report": [
+        ""
+      ],
       "Generate the report, but do not upload": [
         "生成报告，但不上传"
       ],
@@ -248,6 +251,9 @@
       "Knowledgebase article": [
         "知识库文章"
       ],
+      "Learn more about {minimalDataCollectionSetting}.": [
+        ""
+      ],
       "List of host UUIDs": [
         "主机 UUID 列表"
       ],
@@ -263,6 +269,9 @@
       "Manual": [
         "手册"
       ],
+      "Minimal data collection": [
+        ""
+      ],
       "Moderate": [
         "中等"
       ],
@@ -293,21 +302,33 @@
       "Notice": [
         "注意事項"
       ],
-      "Obfuscate IPs": [
-        "模糊 IP"
-      ],
       "Obfuscate host ipv4 addresses": [
         "模糊的主机 ipv4 地址"
       ],
+      "Obfuscate host ipv4 addresses.": [
+        ""
+      ],
       "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.)": [
+        ""
+      ],
       "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.)": [
+        ""
+      ],
+      "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.": [
+        ""
+      ],
+      "Only send the minimum required data to Red Hat cloud, obfuscation settings are disabled": [
+        ""
+      ],
       "Oops! Couldn't find organization that matches your query": [
         "未找到与您的查询匹配的机构"
       ],
@@ -326,9 +347,6 @@
       "RHC daemon id": [
         "RHC 守护进程 ID"
       ],
-      "RHCloud": [
-        "RHCloud"
-      ],
       "Read more about it in RH cloud insights": [
         "在 RH Cloud insights 中了解更多有关它的信息"
       ],
@@ -386,8 +404,8 @@
       "Run RH Cloud playbook": [
         "运行 RH Cloud playbook"
       ],
-      "Run playbook genrated by Red Hat remediations app": [
-        "运行由红帽补救应用生成的 playbook"
+      "Run playbook generated by Red Hat remediations app": [
+        ""
       ],
       "Run remediation playbook generated by Insights": [
         "运行 Insights 生成的补救 playbook"
@@ -401,6 +419,9 @@
       "Select recommendations from all pages": [
         "在所有页面中选择建议"
       ],
+      "Send additional data to enhance Insights services, as per the settings": [
+        ""
+      ],
       "Set the current organization context for the request": [
         "设置请求的当前机构上下文"
       ],
@@ -446,8 +467,8 @@
       "The report file %{filename} doesn't exist": [
         "报告文件 %{filename} 不存在"
       ],
-      "The scheduled process is disabled because this Foreman is configured with the use_local_advisor_engine option.": [
-        "调度的进程被禁用，因为此 Foreman 配置了 use_local_advisor_engine 选项。"
+      "The scheduled process is disabled because this Foreman is configured with a local IoP Smart Proxy.": [
+        ""
       ],
       "The server returned the following error: %s": [
         "服务器返回以下错误：%s"
@@ -467,6 +488,9 @@
       "To manually upload the data for a specific organization, select an organization and click {restartButtonName}.": [
         "要手动上传特定机构的数据，请选择机构并点 {restartButtonName}。"
       ],
+      "Total CVEs": [
+        ""
+      ],
       "Total risk": [
         "总风险"
       ],
@@ -494,6 +518,12 @@
       "View in Red Hat Insights": [
         "禁用 Red Hat Insights"
       ],
+      "Vulnerabilities": [
+        ""
+      ],
+      "Vulnerability": [
+        ""
+      ],
       "Wait and %s": [
         "等待和 %s"
       ],
@@ -560,6 +590,9 @@
       "rule title": [
         "rule 标题"
       ],
+      "setting minimal data collection": [
+        ""
+      ],
       "solution url": [
         "solution url"
       ],

data/app/models/insights_hit.rb

@@ -1,6 +1,6 @@
 class InsightsHit < ApplicationRecord
   include ::Authorizable
-  belongs_to :host
+  belongs_to :host, class_name: 'Host::Base'
   # 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/lib/foreman_rh_cloud/engine.rb

@@ -83,6 +83,27 @@ 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/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '12.2.6'.freeze
+  VERSION = '12.2.7'.freeze
 end

data/lib/insights_cloud.rb

@@ -44,8 +44,4 @@ module InsightsCloud
   def self.enable_cloud_remediations_param
     'enable_cloud_remediations'
   end
-
-  def self.vmaas_reposcan_sync_url
-    ForemanRhCloud.iop_smart_proxy.url + '/api/vmaas-reposcan/sync'
-  end
 end