foreman_rh_cloud 12.2.10 → 13.0.0

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

@@ -35,9 +35,6 @@
       "All recommendations are now selected.": [
         "모든 권장 사항이 선택되었습니다."
       ],
-      "Analytics data collection": [
-        ""
-      ],
       "Any Organization": [
         "모든 조직 "
       ],
@@ -137,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": [
         "설치된 패키지가 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.)": [
-        ""
+      "Exclude packages": [
+        "패키지 제외"
+      ],
+      "Exclude packages from being uploaded to the Red Hat cloud": [
+        "Red Hat 클라우드에 업로드되는 패키지 제외"
       ],
       "Exit Code: %s": [
         "종료 코드: %s"
@@ -179,9 +179,6 @@
       "Generate and upload report": [
         "보고서 생성 및 업로드"
       ],
-      "Generate report": [
-        ""
-      ],
       "Generate the report, but do not upload": [
         "보고서를 생성하되 업로드하지 마십시오."
       ],
@@ -251,9 +248,6 @@
       "Knowledgebase article": [
         "지식베이스 문서"
       ],
-      "Learn more about {minimalDataCollectionSetting}.": [
-        ""
-      ],
       "List of host UUIDs": [
         "호스트 UUID 목록"
       ],
@@ -269,9 +263,6 @@
       "Manual": [
         "수동"
       ],
-      "Minimal data collection": [
-        ""
-      ],
       "Moderate": [
         "중간 수준"
       ],
@@ -302,33 +293,21 @@
       "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": [
         "죄송합니다! 귀하의 쿼리와 일치하는 조직을 찾을 수 없습니다."
       ],
@@ -347,6 +326,9 @@
       "RHC daemon id": [
         "RHC 데몬 ID"
       ],
+      "RHCloud": [
+        "RHCloud"
+      ],
       "Read more about it in RH cloud insights": [
         "RH 클라우드 Insights에서 이에 대해 자세히 알아보세요."
       ],
@@ -404,8 +386,8 @@
       "Run RH Cloud playbook": [
         "RH Cloud playbook 실행"
       ],
-      "Run playbook generated by Red Hat remediations app": [
-        ""
+      "Run playbook genrated by Red Hat remediations app": [
+        "Red Hat Remediations 앱에서 생성된 playbook 실행"
       ],
       "Run remediation playbook generated by Insights": [
         "Insights에서 생성된 수정 playbook 실행"
@@ -419,9 +401,6 @@
       "Select recommendations from all pages": [
         "모든 페이지에서 추천을 선택하세요"
       ],
-      "Send additional data to enhance Insights services, as per the settings": [
-        ""
-      ],
       "Set the current organization context for the request": [
         "요청에 대한 현재 조직 컨텍스트 설정"
       ],
@@ -467,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.": [
-        ""
+      "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"
@@ -488,9 +467,6 @@
       "To manually upload the data for a specific organization, select an organization and click {restartButtonName}.": [
         "특정 조직에 대한 데이터를 수동으로 업로드하려면 조직을 선택하고 {restartButtonName}를 클릭하십시오."
       ],
-      "Total CVEs": [
-        ""
-      ],
       "Total risk": [
         "총 위험"
       ],
@@ -518,12 +494,6 @@
       "View in Red Hat Insights": [
         "Red Hat Insights에서 보기"
       ],
-      "Vulnerabilities": [
-        ""
-      ],
-      "Vulnerability": [
-        ""
-      ],
       "Wait and %s": [
         "대기 및 %s"
       ],
@@ -590,9 +560,6 @@
       "rule title": [
         "규칙 제목"
       ],
-      "setting minimal data collection": [
-        ""
-      ],
       "solution url": [
         "솔루션 URL"
       ],

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

@@ -35,9 +35,6 @@
       "All recommendations are now selected.": [
         "现在选择了所有建议。"
       ],
-      "Analytics data collection": [
-        ""
-      ],
       "Any Organization": [
         "任意机构"
       ],
@@ -137,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.)": [
-        ""
+      "Exclude packages": [
+        "排除软件包"
+      ],
+      "Exclude packages from being uploaded to the Red Hat cloud": [
+        "排除软件包上传到红帽云"
       ],
       "Exit Code: %s": [
         "退出代码：%s"
@@ -179,9 +179,6 @@
       "Generate and upload report": [
         "生成并上传报告"
       ],
-      "Generate report": [
-        ""
-      ],
       "Generate the report, but do not upload": [
         "生成报告，但不上传"
       ],
@@ -251,9 +248,6 @@
       "Knowledgebase article": [
         "知识库文章"
       ],
-      "Learn more about {minimalDataCollectionSetting}.": [
-        ""
-      ],
       "List of host UUIDs": [
         "主机 UUID 列表"
       ],
@@ -269,9 +263,6 @@
       "Manual": [
         "手册"
       ],
-      "Minimal data collection": [
-        ""
-      ],
       "Moderate": [
         "中等"
       ],
@@ -302,33 +293,21 @@
       "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": [
         "未找到与您的查询匹配的机构"
       ],
@@ -347,6 +326,9 @@
       "RHC daemon id": [
         "RHC 守护进程 ID"
       ],
+      "RHCloud": [
+        "RHCloud"
+      ],
       "Read more about it in RH cloud insights": [
         "在 RH Cloud insights 中了解更多有关它的信息"
       ],
@@ -404,8 +386,8 @@
       "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": [
         "运行 Insights 生成的补救 playbook"
@@ -419,9 +401,6 @@
       "Select recommendations from all pages": [
         "在所有页面中选择建议"
       ],
-      "Send additional data to enhance Insights services, as per the settings": [
-        ""
-      ],
       "Set the current organization context for the request": [
         "设置请求的当前机构上下文"
       ],
@@ -467,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.": [
-        ""
+      "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"
@@ -488,9 +467,6 @@
       "To manually upload the data for a specific organization, select an organization and click {restartButtonName}.": [
         "要手动上传特定机构的数据，请选择机构并点 {restartButtonName}。"
       ],
-      "Total CVEs": [
-        ""
-      ],
       "Total risk": [
         "总风险"
       ],
@@ -518,12 +494,6 @@
       "View in Red Hat Insights": [
         "禁用 Red Hat Insights"
       ],
-      "Vulnerabilities": [
-        ""
-      ],
-      "Vulnerability": [
-        ""
-      ],
       "Wait and %s": [
         "等待和 %s"
       ],
@@ -590,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,10 +15,11 @@ 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}"
       )
 
       # in IoP case, the hosts are identified by the sub-man ID, and we can assume they already

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
@@ -24,7 +24,6 @@ module ForemanRhCloud
 
       payload = tags_query_payload
       params = {
-        organization: @org,
         method: :post,
         url: "#{InsightsCloud.gateway_url}/tags",
         headers: {

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,9 +1,9 @@
 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
@@ -59,8 +59,8 @@ module ForemanInventoryUpload
         input[:report_file]
       end
 
-      def plan_upload_report(enqueued_file_name, organization_id)
-        plan_action(UploadReportJob, 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

data/lib/foreman_inventory_upload/async/upload_report_job.rb

@@ -7,15 +7,15 @@ module ForemanInventoryUpload
         "upload_for_#{label}"
       end
 
-      def plan(filename, organization_id)
+      def plan(filename, organization_id, disconnected = false)
         label = UploadReportJob.output_label(organization_id)
-        super(label, filename: filename, organization_id: organization_id)
+        super(label, filename: filename, organization_id: organization_id, disconnected: disconnected)
       end
 
       def try_execute
         if content_disconnected?
           progress_output do |progress_output|
-            progress_output.write_line("Report was not moved and upload was canceled because connection to Insights is not enabled. Report location: #{filename}.")
+            progress_output.write_line('Upload canceled because connection to Insights is not enabled or the --no-upload option was passed.')
             progress_output.status = "Task aborted, exit 1"
             done!
           end
@@ -48,8 +48,7 @@ module ForemanInventoryUpload
       def env
         env_vars = super.merge(
           'FILES' => filename,
-          'CER_PATH' => @cer_path,
-          'ORG_ID' => organization.label
+          'CER_PATH' => @cer_path
         )
 
         http_proxy_string = ForemanRhCloud.http_proxy_string
@@ -90,7 +89,7 @@ module ForemanInventoryUpload
       end
 
       def content_disconnected?
-        !Setting[:subscription_connection_enabled]
+        input[:disconnected] || !Setting[:subscription_connection_enabled]
       end
     end
   end

data/lib/foreman_inventory_upload/generators/fact_helpers.rb

@@ -59,7 +59,7 @@ module ForemanInventoryUpload
       def obfuscate_hostname?(host)
         # Returns true if hostname obfuscation should be applied for a given host, based on hierarchy:
         # 1. Global setting for hostname obfuscation.
-        return true if Setting[:obfuscate_inventory_hostnames] && !ForemanRhCloud.with_iop_smart_proxy?
+        return true if Setting[:obfuscate_inventory_hostnames]
 
         insights_client_setting = fact_value(host, 'insights_client::obfuscate_hostname_enabled')
         insights_client_setting = ActiveModel::Type::Boolean.new.cast(insights_client_setting)
@@ -99,7 +99,7 @@ module ForemanInventoryUpload
       def obfuscate_ips?(host)
         # Returns true if IP obfuscation should be applied for a given host, based on hierarchy:
         # 1. Global setting for IP obfuscation.
-        return true if Setting[:obfuscate_inventory_ips] && !ForemanRhCloud.with_iop_smart_proxy?
+        return true if Setting[:obfuscate_inventory_ips]
 
         insights_client_ipv4_setting = fact_value(host, 'insights_client::obfuscate_ipv4_enabled')
         insights_client_ipv6_setting = fact_value(host, 'insights_client::obfuscate_ipv6_enabled')

data/lib/foreman_inventory_upload/generators/slice.rb

@@ -90,7 +90,7 @@ module ForemanInventoryUpload
       def report_host(host)
         host_ips_cache = host_ips(host)
         @stream.object do
-          if Setting[:insights_minimal_data_collection] && !ForemanRhCloud.with_iop_smart_proxy?
+          if Setting[:insights_minimal_data_collection]
             insights_minimal_data_collection(host)
           else
             @stream.simple_field('fqdn', fqdn(host))
@@ -205,7 +205,7 @@ module ForemanInventoryUpload
             end.join(', '))
           end
         end
-        if ForemanRhCloud.with_iop_smart_proxy? || (!Setting[:insights_minimal_data_collection] && !Setting[:exclude_installed_packages])
+        if !Setting[:insights_minimal_data_collection] && !Setting[:exclude_installed_packages]
           @stream.array_field('installed_packages') do
             first = true
             host.installed_packages.each do |package|
@@ -256,7 +256,7 @@ module ForemanInventoryUpload
 
         @stream.array_field('yum_repos') do
           host.content_facet.bound_repositories.each_with_index do |repo, index|
-            report_yum_repo(host.content_source&.load_balancer_pulp_content_url || ::SmartProxy.pulp_primary.pulp_content_url, repo)
+            report_yum_repo(host.content_source.load_balancer_pulp_content_url, repo)
             @stream.comma unless index == host.content_facet.bound_repositories.count - 1
           end
         end

data/lib/foreman_inventory_upload/scripts/uploader.sh.erb

@@ -27,12 +27,6 @@ else
         AUTH_VAL="\"$RH_USERNAME\":\"$RH_PASSWORD\""
 fi
 
-ORG_HEADER=()
-if [ -n "$ORG_ID" ]
-then
-+        ORG_HEADER=("-H" "X-Org-Id: $ORG_ID")
-fi
-
 # /tmp/a b/x.pem
 # curl --cert /tmp/a\ b/x.pem
 
@@ -42,7 +36,7 @@ mkdir -p $DONE_DIR
 
 for f in $FILES
 do
-  curl -k -vvv -# --fail -F "file=@$f;type=application/vnd.redhat.qpc.tar+tgz" $DEST "$AUTH_KEY" "$AUTH_VAL" "${ORG_HEADER[@]}"
+  curl -k -vvv -# --fail -F "file=@$f;type=application/vnd.redhat.qpc.tar+tgz" $DEST "$AUTH_KEY" "$AUTH_VAL"
   status=$?
   if [ $status -eq 0 ]; then
     mv $f $DONE_DIR