foreman_rh_cloud 11.2.0 → 11.3.0

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

@@ -3,10 +3,10 @@
   "locale_data": {
     "foreman_rh_cloud": {
       "": {
-        "Project-Id-Version": "foreman_rh_cloud 1.0.0",
+        "Project-Id-Version": "foreman_rh_cloud 11.1.0",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2023-01-20 13:26+0000",
-        "Last-Translator": "Ewoud Kohl van Wijngaarden <ewoud+transifex@kohlvanwijngaarden.nl>, 2024",
+        "Last-Translator": "Ewoud Kohl van Wijngaarden <ewoud+transifex@kohlvanwijngaarden.nl>, 2025",
         "Language-Team": "Korean (https://app.transifex.com/foreman/teams/114/ko/)",
         "MIME-Version": "1.0",
         "Content-Type": "text/plain; charset=UTF-8",
@@ -18,7 +18,7 @@
         "plural_forms": "nplurals=1; plural=0;"
       },
       " Sync all inventory status": [
-        ""
+        "모든 인벤토리 상태 동기화"
       ],
       "%s organizations": [
         "%s 조직"
@@ -45,10 +45,10 @@
         "자동 인벤토리 업로드"
       ],
       "Automatic mismatch deletion": [
-        ""
+        "자동 불일치 삭제"
       ],
       "Cancel": [
-        "취소"
+        "취소 "
       ],
       "Clear": [
         "삭제"
@@ -87,7 +87,7 @@
         "지정된 호스트에서 Cloud Connector 구성"
       ],
       "Configure cloud connector": [
-        ""
+        "클라우드 커넥터 구성"
       ],
       "Connectivity test": [
         "연결성 테스트"
@@ -114,7 +114,7 @@
         "최신 보고서 다운로드"
       ],
       "Enable automatic deletion of mismatched host records from the Red Hat cloud": [
-        ""
+        "Red Hat 클라우드에서 일치하지 않는 호스트 기록의 자동 삭제를 활성화하십시오."
       ],
       "Enable automatic synchronization of Insights recommendations from the Red Hat cloud": [
         "Red Hat 클라우드에서 Insights 권장 사항의 자동 동기화를 활성화합니다."
@@ -150,7 +150,7 @@
         "종료 코드: %s"
       ],
       "Fetch Insights-related host details": [
-        ""
+        "Insights 관련 호스트 세부 정보 가져오기"
       ],
       "Fetching data about your accounts": [
         "귀하의 계정에 대한 데이터를 가져오는 중"
@@ -165,10 +165,10 @@
         "자세한 내용은 다음에서 참조하세요"
       ],
       "For more information about Insights and Cloud Connector, see:": [
-        ""
+        "Insights 및 Cloud Connector에 대한 자세한 내용은 다음을 참조하세요."
       ],
       "For more information about the Subscriptions service, see:": [
-        ""
+        "서브스크립션 서비스에 대한 자세한 정보는 다음을 참조하십시오:"
       ],
       "Foreman plugin that process & upload data to Red Hat Cloud": [
         "Red Hat Cloud에 데이터를 처리하고 업로드하는 Foreman 플러그인"
@@ -177,16 +177,16 @@
         "전체 화면"
       ],
       "Generate and upload report": [
-        ""
+        "보고서 생성 및 업로드"
       ],
       "Generate the report, but do not upload": [
-        ""
+        "보고서를 생성하되 업로드하지 마십시오."
       ],
       "Generating": [
         "생성 중"
       ],
       "Go to Foreman Insights page": [
-        ""
+        "Foreman Insights 페이지로 이동"
       ],
       "Go to first page": [
         "첫 번째 페이지로 이동"
@@ -201,7 +201,7 @@
         "이전 페이지로 이동"
       ],
       "Grab hosts that are missing in RH Cloud": [
-        ""
+        "RH Cloud에 없는 호스트를 가져오십시오."
       ],
       "Host Insights recommendations": [
         "호스트 Insights 추천"
@@ -249,7 +249,7 @@
         "지식베이스 문서"
       ],
       "List of host UUIDs": [
-        ""
+        "호스트 UUID 목록"
       ],
       "Loading": [
         "로딩 중 "
@@ -354,7 +354,7 @@
         "추천사항이 성공적으로 동기화되었습니다."
       ],
       "Reconfigure cloud connector": [
-        ""
+        "클라우드 커넥터 재구성"
       ],
       "Red Hat Cloud Inventory": [
         "Red Hat 클라우드 인벤토리"
@@ -396,7 +396,7 @@
         "Satellite 서버에는 Red Hat의 권장 사항이 %{hits_count} 개 있습니다"
       ],
       "Scoped search string for host removal": [
-        ""
+        "호스트 제거를 위한 범위 검색 문자열"
       ],
       "Select recommendations from all pages": [
         "모든 페이지에서 추천을 선택하세요"
@@ -414,7 +414,7 @@
         "고급 설정 표시"
       ],
       "Show if system is configured to use local iop-advisor-engine.": [
-        ""
+        "시스템이 로컬 iop-advisor-engine을 사용하도록 구성되어 있는지 표시하십시오."
       ],
       "Start inventory synchronization": [
         "인벤토리 동기화 시작"
@@ -438,16 +438,16 @@
         "추천 사항을 자동으로 동기화합니다"
       ],
       "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.": [
-        ""
+        "Foreman 인벤토리 업로드 플러그인은 Foreman 호스트 인벤토리 데이터를 자동으로 Insights의 인벤토리 서비스에 업로드하며, 이 데이터는 서브스크립션 보고서를 위한 서브스크립션 서비스에서도 사용할 수 있습니다. 서브스크립션 서비스를 사용하는 경우, 인벤토리 업로드를 활성화하는 것이 필수입니다."
       ],
       "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.": [
-        ""
+        "Red Hat 하이브리드 클라우드 콘솔은 이 Foreman 인스턴스를 위한 예측 분석, 문제 해결, 통합된 서브스크립션 보고서를 제공하는 Red Hat Insights와 서브스크립션을 포함한 클라우드 서비스 세트를 제공합니다."
       ],
       "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 server returned the following error: %s": [
         "서버에서 다음 오류가 반환되었습니다. %s"
@@ -456,16 +456,16 @@
         "다음 오류로 인해 작업이 실패했습니다."
       ],
       "There are no recommendations for your hosts": [
-        ""
+        "호스트에 대한 권장 사항이 없음"
       ],
       "This action will also enable automatic reports upload": [
         "이 작업을 수행하면 자동 보고서 업로드도 활성화됩니다."
       ],
       "To enable this reporting for all Foreman organizations, set {uploadButtonName} to on. The data will be reported automatically once per day.": [
-        ""
+        "이 보고서를 모든 Foreman 조직에 대해 활성화하려면 {uploadButtonName}를 켬으로 설정하십시오. 데이터는 하루에 한 번 자동으로 보고됩니다."
       ],
       "To manually upload the data for a specific organization, select an organization and click {restartButtonName}.": [
-        ""
+        "특정 조직에 대한 데이터를 수동으로 업로드하려면 조직을 선택하고 {restartButtonName}를 클릭하십시오."
       ],
       "Total risk": [
         "총 위험"
@@ -474,13 +474,13 @@
         "총 위험"
       ],
       "Upload hits from iop-advisor-engine": [
-        ""
+        "iop-advisor-engine에서 히트 업로드"
       ],
       "Upload hits information": [
-        ""
+        "히트 정보 업로드"
       ],
       "Upload rules related to the hits": [
-        ""
+        "히트와 관련된 규칙 업로드"
       ],
       "Uploading": [
         "업로드 중"
@@ -498,31 +498,31 @@
         "대기 및 %s"
       ],
       "Whether the resolution requires reboot": [
-        ""
+        "해결을 위해 재부팅이 필요한지 여부"
       ],
       "category name": [
-        ""
+        "카테고리 이름"
       ],
       "generic": [
-        ""
+        "일반"
       ],
       "hosts page": [
         "호스트 페이지"
       ],
       "impact name": [
-        ""
+        "영향 이름"
       ],
       "iop payload including resolutions, rules, hits": [
-        ""
+        "해결책, 규칙, 히트를 포함한 IOP 페이로드"
       ],
       "items": [
         "항목"
       ],
       "likelihood number": [
-        ""
+        "가능성 점수"
       ],
       "more info": [
-        ""
+        "상세 정보"
       ],
       "page": [
         "페이지"
@@ -531,52 +531,52 @@
         "페이지 당"
       ],
       "publish date (YYYY-MM-DD)": [
-        ""
+        "게시 날짜 (YYYY-MM-DD)"
       ],
       "rating": [
-        ""
+        "등급"
       ],
       "reason": [
-        ""
+        "이유"
       ],
       "reboot required": [
-        ""
+        "재부팅 필요"
       ],
       "resolution description": [
-        ""
+        "해결 방법"
       ],
       "resolution risk": [
-        ""
+        "해결책 리스크"
       ],
       "result url": [
-        ""
+        "결과 URL"
       ],
       "rule description": [
-        ""
+        "규칙 설명"
       ],
       "rule id": [
-        ""
+        "규칙 ID"
       ],
       "rule title": [
-        ""
+        "규칙 제목"
       ],
       "solution url": [
-        ""
+        "솔루션 URL"
       ],
       "summary": [
-        ""
+        "요약"
       ],
       "total risk": [
-        ""
+        "전체 리스크"
       ],
       "type": [
-        ""
+        "유형"
       ],
       "upload hits details json": [
-        ""
+        "히트 상세정보 json 업로드"
       ],
       "upload resolutions related to the hits": [
-        ""
+        "히트와 관련된 해결책 업로드"
       ],
       "view the job in progress": [
         "진행중인 작업 보기"

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

@@ -6,7 +6,7 @@
         "Project-Id-Version": "foreman_rh_cloud 11.1.0",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2023-01-20 13:26+0000",
-        "Last-Translator": "Ewoud Kohl van Wijngaarden <ewoud+transifex@kohlvanwijngaarden.nl>, 2023",
+        "Last-Translator": "Ewoud Kohl van Wijngaarden <ewoud+transifex@kohlvanwijngaarden.nl>, 2025",
         "Language-Team": "Chinese (China) (https://app.transifex.com/foreman/teams/114/zh_CN/)",
         "MIME-Version": "1.0",
         "Content-Type": "text/plain; charset=UTF-8",
@@ -18,7 +18,7 @@
         "plural_forms": "nplurals=1; plural=0;"
       },
       " Sync all inventory status": [
-        ""
+        " 同步所有清单状态"
       ],
       "%s organizations": [
         "%s 机构"
@@ -45,7 +45,7 @@
         "自动清单上传"
       ],
       "Automatic mismatch deletion": [
-        ""
+        "自动清单删除"
       ],
       "Cancel": [
         "取消"
@@ -87,7 +87,7 @@
         "在给定主机上配置 Cloud Connector"
       ],
       "Configure cloud connector": [
-        ""
+        "配置云连接器"
       ],
       "Connectivity test": [
         "连接测试"
@@ -111,10 +111,10 @@
         "下载报告"
       ],
       "Download latest report": [
-        "下载最新報告"
+        "下载最新的报告"
       ],
       "Enable automatic deletion of mismatched host records from the Red Hat cloud": [
-        ""
+        "启用自动删除来自红帽云的主机记录"
       ],
       "Enable automatic synchronization of Insights recommendations from the Red Hat cloud": [
         "启用来自红帽云的 Insights 建议自动同步"
@@ -150,7 +150,7 @@
         "退出代码：%s"
       ],
       "Fetch Insights-related host details": [
-        ""
+        "获取与 Insights 相关的主机详情"
       ],
       "Fetching data about your accounts": [
         "获取有关您的帐户的数据"
@@ -165,10 +165,10 @@
         "如需更多信息，请访问"
       ],
       "For more information about Insights and Cloud Connector, see:": [
-        ""
+        "有关 Insights 和云连接器的更多信息，请参阅"
       ],
       "For more information about the Subscriptions service, see:": [
-        ""
+        "有关订阅服务的更多信息，请参阅："
       ],
       "Foreman plugin that process & upload data to Red Hat Cloud": [
         "处理数据并将其上传到红帽云的 Foreman 插件"
@@ -177,16 +177,16 @@
         "全屏"
       ],
       "Generate and upload report": [
-        ""
+        "生成并上传报告"
       ],
       "Generate the report, but do not upload": [
-        ""
+        "生成报告，但不上传"
       ],
       "Generating": [
         "生成中"
       ],
       "Go to Foreman Insights page": [
-        ""
+        "进入 Foreman Insights 页面"
       ],
       "Go to first page": [
         "前往第一页"
@@ -201,7 +201,7 @@
         "前往上一页"
       ],
       "Grab hosts that are missing in RH Cloud": [
-        ""
+        "获取 RH Cloud 中缺少的主机"
       ],
       "Host Insights recommendations": [
         "主机 Insights 建议"
@@ -249,7 +249,7 @@
         "知识库文章"
       ],
       "List of host UUIDs": [
-        ""
+        "主机 UUID 列表"
       ],
       "Loading": [
         "加载"
@@ -354,7 +354,7 @@
         "成功同步建议"
       ],
       "Reconfigure cloud connector": [
-        ""
+        "重新配置云连接器"
       ],
       "Red Hat Cloud Inventory": [
         "红帽云清单"
@@ -396,7 +396,7 @@
         "Satellite 服务器有 %{hits_count} 个红帽提供的建议"
       ],
       "Scoped search string for host removal": [
-        ""
+        "用于删除主机的有范围的搜索字符串"
       ],
       "Select recommendations from all pages": [
         "在所有页面中选择建议"
@@ -414,7 +414,7 @@
         "显示高级设置"
       ],
       "Show if system is configured to use local iop-advisor-engine.": [
-        ""
+        "显示系统是否被配置为使用本地 iop-advisor-engine。"
       ],
       "Start inventory synchronization": [
         "启动清单同步"
@@ -438,16 +438,16 @@
         "自动同步建议"
       ],
       "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.": [
-        ""
+        "Foreman 清单上传插件会自动将 Foreman 主机清单数据上传到 Insights 的 Inventory 服务，订阅服务使用这些信息来提供订阅报告。如果使用订阅服务，则需要启用清单上传。"
       ],
       "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.": [
-        ""
+        "Red Hat Hybrid Cloud Console 提供了一组云服务，包括 Red Hat Insights 和订阅，提供预测分析、修复问题以及针对此 Foreman 实例的统一订阅报告。"
       ],
       "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 server returned the following error: %s": [
         "服务器返回以下错误：%s"
@@ -456,16 +456,16 @@
         "任务失败，错误为:"
       ],
       "There are no recommendations for your hosts": [
-        ""
+        "没有适用于您的主机的建议"
       ],
       "This action will also enable automatic reports upload": [
         "此操作还会启用自动报告上传"
       ],
       "To enable this reporting for all Foreman organizations, set {uploadButtonName} to on. The data will be reported automatically once per day.": [
-        ""
+        "要为所有 Foreman 机构启用此报告，请将 {uploadButtonName} 设置为 on。数据将每天自动报告一次。"
       ],
       "To manually upload the data for a specific organization, select an organization and click {restartButtonName}.": [
-        ""
+        "要手动上传特定机构的数据，请选择机构并点 {restartButtonName}。"
       ],
       "Total risk": [
         "总风险"
@@ -474,13 +474,13 @@
         "总风险"
       ],
       "Upload hits from iop-advisor-engine": [
-        ""
+        "从 iop-advisor-engine 上传 hits"
       ],
       "Upload hits information": [
-        ""
+        "上传 hits 信息"
       ],
       "Upload rules related to the hits": [
-        ""
+        "上传与 hits 相关的 rule"
       ],
       "Uploading": [
         "上载中"
@@ -498,85 +498,85 @@
         "等待和 %s"
       ],
       "Whether the resolution requires reboot": [
-        ""
+        "resolution 是否需要重启"
       ],
       "category name": [
-        ""
+        "类别名称"
       ],
       "generic": [
-        ""
+        "通用"
       ],
       "hosts page": [
         "主机页"
       ],
       "impact name": [
-        ""
+        "影响名称"
       ],
       "iop payload including resolutions, rules, hits": [
-        ""
+        "IOP 有效负载，包括 resolutions, rules, hits"
       ],
       "items": [
         "项"
       ],
       "likelihood number": [
-        ""
+        "可能性号"
       ],
       "more info": [
-        ""
+        "更多信息"
       ],
       "page": [
-        "page"
+        "页"
       ],
       "per page": [
         "每页"
       ],
       "publish date (YYYY-MM-DD)": [
-        ""
+        "发布日期 (YYYY-MM-DD)"
       ],
       "rating": [
-        ""
+        "评级"
       ],
       "reason": [
-        ""
+        "原因"
       ],
       "reboot required": [
-        ""
+        "需要重启"
       ],
       "resolution description": [
-        ""
+        "resolution 描述"
       ],
       "resolution risk": [
-        ""
+        "resolution 风险"
       ],
       "result url": [
-        ""
+        "结果 url"
       ],
       "rule description": [
-        ""
+        "rule 描述"
       ],
       "rule id": [
-        ""
+        "rule id"
       ],
       "rule title": [
-        ""
+        "rule 标题"
       ],
       "solution url": [
-        ""
+        "solution url"
       ],
       "summary": [
-        ""
+        "摘要"
       ],
       "total risk": [
-        ""
+        "总风险"
       ],
       "type": [
-        ""
+        "类型"
       ],
       "upload hits details json": [
-        ""
+        "上传 hits 详情 json"
       ],
       "upload resolutions related to the hits": [
-        ""
+        "上传与 hits 相关的 resolutions"
       ],
       "view the job in progress": [
         "查看正在进行中的任务"

data/app/controllers/insights_cloud/api/machine_telemetries_controller.rb

@@ -26,6 +26,8 @@ module InsightsCloud::Api
         return render json: { error: e }, status: :gateway_timeout
       end
 
+      return render json: { message: @cloud_response.to_s }, status: :gateway_timeout if @cloud_response.is_a?(RestClient::Exceptions::OpenTimeout)
+
       if @cloud_response.code == 401
         return render json: {
           :message => 'Authentication to the Insights Service failed.',

data/app/services/foreman_rh_cloud/cloud_request_forwarder.rb

@@ -18,7 +18,7 @@ module ForemanRhCloud
 
       execute_cloud_request(request_opts)
     rescue RestClient::ExceptionWithResponse => error_response
-      error_response.response
+      error_response.response.presence || error_response.exception
     end
 
     def prepare_request_opts(original_request, forward_payload, forward_params, certs)

data/lib/foreman_rh_cloud/engine.rb

@@ -40,7 +40,7 @@ module ForemanRhCloud
           apipie_documented_controllers ["#{ForemanRhCloud::Engine.root}/app/controllers/api/v2/**/*.rb"]
 
           settings do
-            category(:rh_cloud, N_('RHCloud')) do
+            category(:rh_cloud, N_('Insights')) do
               setting('allow_auto_inventory_upload', type: :boolean, description: N_('Enable automatic upload of your host inventory to the Red Hat cloud'), default: true, full_name: N_('Automatic inventory upload'))
               setting('allow_auto_insights_sync', type: :boolean, description: N_('Enable automatic synchronization of Insights recommendations from the Red Hat cloud'), default: true, full_name: N_('Synchronize recommendations Automatically'))
               setting('allow_auto_insights_mismatch_delete', type: :boolean, description: N_('Enable automatic deletion of mismatched host records from the Red Hat cloud'), default: false, full_name: N_('Automatic mismatch deletion'))

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '11.2.0'.freeze
+  VERSION = '11.3.0'.freeze
 end

data/lib/insights_cloud/async/insights_full_sync.rb

@@ -9,10 +9,11 @@ module InsightsCloud
 
       def plan(organizations)
         organizations = organizations.select do |organization|
-          if cert_auth_available?(organization)
+          checker = ::Katello::UpstreamConnectionChecker.new(organization)
+          if cert_auth_available?(organization) && !organization.manifest_expired? && checker.can_connect?
             true
           else
-            logger.debug("Certificate is not available for org: #{organization.name}, skipping insights sync")
+            logger.info("A manifest is not available for org: #{organization.name}, or it has expired, or been deleted. skipping insights sync")
             false
           end
         end
@@ -20,19 +21,23 @@ module InsightsCloud
         sequence do
           # This can be turned off when we enable automatic status syncs
           # This step will query cloud inventory to retrieve inventory uuids for each host
-          plan_hosts_sync(organizations)
-          plan_self(organization_ids: organizations.map(&:id))
-          concurrence do
-            plan_rules_sync(organizations)
-            plan_notifications
+          valid_organizations = organizations.reject(&:manifest_expired?)
+          if valid_organizations.any?
+            plan_hosts_sync(organizations)
+            plan_self(organization_ids: organizations.map(&:id))
+            concurrence do
+              plan_rules_sync(organizations)
+              plan_notifications
+            end
           end
         end
       end
 
       def try_execute
         organizations.each do |organization|
-          unless cert_auth_available?(organization)
-            logger.debug("Certificate is not available for org: #{organization.name}, skipping insights sync")
+          checker = ::Katello::UpstreamConnectionChecker.new(organization)
+          if !cert_auth_available?(organization) && organization.manifest_expired && !checker.can_connect?
+            logger.info("A manifest is not available for org: #{organization.name}, or it has expired, or been deleted. skipping insights sync")
             next
           end