foreman_rh_cloud 13.0.4 → 13.0.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/app/assets/javascripts/foreman_rh_cloud/locale/fr/foreman_rh_cloud.js +47 -26
- data/app/assets/javascripts/foreman_rh_cloud/locale/ja/foreman_rh_cloud.js +46 -25
- data/app/assets/javascripts/foreman_rh_cloud/locale/ka/foreman_rh_cloud.js +32 -11
- data/app/assets/javascripts/foreman_rh_cloud/locale/ko/foreman_rh_cloud.js +46 -25
- data/app/assets/javascripts/foreman_rh_cloud/locale/zh_CN/foreman_rh_cloud.js +46 -25
- data/app/controllers/concerns/insights_cloud/package_profile_upload_extensions.rb +2 -3
- data/app/services/foreman_rh_cloud/cert_auth.rb +13 -3
- data/app/services/foreman_rh_cloud/insights_api_forwarder.rb +3 -1
- data/app/services/foreman_rh_cloud/tags_auth.rb +2 -1
- data/lib/foreman_inventory_upload/async/create_missing_insights_facets.rb +29 -0
- data/lib/foreman_inventory_upload/async/generate_host_report.rb +20 -0
- data/lib/foreman_inventory_upload/async/generate_report_job.rb +1 -1
- data/lib/foreman_inventory_upload/async/host_inventory_report_job.rb +39 -0
- data/lib/foreman_inventory_upload/async/single_host_report_job.rb +20 -0
- data/lib/foreman_inventory_upload/async/upload_report_job.rb +2 -1
- data/lib/foreman_inventory_upload/generators/fact_helpers.rb +2 -2
- data/lib/foreman_inventory_upload/generators/slice.rb +3 -3
- data/lib/foreman_inventory_upload/scripts/uploader.sh.erb +7 -1
- data/lib/foreman_rh_cloud/engine.rb +0 -21
- data/lib/foreman_rh_cloud/plugin.rb +10 -10
- data/lib/foreman_rh_cloud/version.rb +1 -1
- data/lib/insights_cloud/async/vmaas_reposcan_sync.rb +8 -1
- data/lib/tasks/rh_cloud_inventory.rake +14 -32
- data/locale/foreman_rh_cloud.pot +55 -18
- data/locale/fr/foreman_rh_cloud.po +48 -27
- data/locale/ja/foreman_rh_cloud.po +47 -26
- data/locale/ka/foreman_rh_cloud.po +32 -11
- data/locale/ko/foreman_rh_cloud.po +47 -26
- data/locale/zh_CN/foreman_rh_cloud.po +47 -26
- data/package.json +1 -1
- data/test/unit/fact_helpers_test.rb +47 -0
- data/test/unit/lib/insights_cloud/async/vmaas_reposcan_sync_test.rb +12 -2
- data/test/unit/slice_generator_test.rb +57 -0
- data/webpack/InsightsHostDetailsTab/InsightsTotalRiskChart.js +57 -21
- data/webpack/InsightsHostDetailsTab/__tests__/InsightsTotalRiskChart.test.js +194 -0
- data/webpack/InsightsVulnerabilityHostIndexExtensions/CVECountCell.js +8 -2
- data/webpack/InsightsVulnerabilityHostIndexExtensions/__tests__/CVECountCell.test.js +48 -2
- metadata +6 -2
- data/app/services/foreman_rh_cloud/gateway_request.rb +0 -26
@@ -8,14 +8,14 @@
|
|
8
8
|
# Bryan Kearney <bryan.kearney@gmail.com>, 2023
|
9
9
|
# 0868a4d1af5275b3f70b0a6dac4c99a4, 2023
|
10
10
|
# Ewoud Kohl van Wijngaarden <ewoud+transifex@kohlvanwijngaarden.nl>, 2025
|
11
|
+
# Ondřej Gajdušek, 2025
|
11
12
|
#
|
12
13
|
msgid ""
|
13
14
|
msgstr ""
|
14
|
-
"Project-Id-Version: foreman_rh_cloud
|
15
|
+
"Project-Id-Version: foreman_rh_cloud 13.0.5\n"
|
15
16
|
"Report-Msgid-Bugs-To: \n"
|
16
17
|
"PO-Revision-Date: 2023-01-20 13:26+0000\n"
|
17
|
-
"Last-Translator:
|
18
|
-
"n.nl>, 2025\n"
|
18
|
+
"Last-Translator: Ondřej Gajdušek, 2025\n"
|
19
19
|
"Language-Team: Korean (https://app.transifex.com/foreman/teams/114/ko/)\n"
|
20
20
|
"MIME-Version: 1.0\n"
|
21
21
|
"Content-Type: text/plain; charset=UTF-8\n"
|
@@ -42,7 +42,7 @@ msgid "All recommendations are now selected."
|
|
42
42
|
msgstr "모든 권장 사항이 선택되었습니다."
|
43
43
|
|
44
44
|
msgid "Analytics data collection"
|
45
|
-
msgstr ""
|
45
|
+
msgstr "분석 데이터 수집"
|
46
46
|
|
47
47
|
msgid "Any Organization"
|
48
48
|
msgstr "모든 조직 "
|
@@ -125,11 +125,17 @@ msgstr "최신 보고서 다운로드"
|
|
125
125
|
msgid "Enable automatic deletion of mismatched host records from the Red Hat cloud"
|
126
126
|
msgstr "Red Hat 클라우드에서 일치하지 않는 호스트 기록의 자동 삭제를 활성화하십시오."
|
127
127
|
|
128
|
+
msgid "Enable automatic deletion of mismatched host records from the Red Hat cloud. Ignored when using local Insights."
|
129
|
+
msgstr ""
|
130
|
+
|
128
131
|
msgid "Enable automatic synchronization of Insights recommendations from the Red Hat cloud"
|
129
132
|
msgstr "Red Hat 클라우드에서 Insights 권장 사항의 자동 동기화를 활성화합니다."
|
130
133
|
|
131
|
-
msgid "Enable automatic
|
132
|
-
msgstr "
|
134
|
+
msgid "Enable automatic synchronization of Insights recommendations from the Red Hat cloud. Ignored when using local Insights."
|
135
|
+
msgstr ""
|
136
|
+
|
137
|
+
msgid "Enable automatic upload of your host inventory to the Red Hat cloud. Ignored when using local Insights."
|
138
|
+
msgstr ""
|
133
139
|
|
134
140
|
msgid "Enable automatic upload of your hosts inventory to the Red Hat cloud"
|
135
141
|
msgstr "호스트 인벤토리를 Red Hat 클라우드에 자동으로 업로드하도록 설정"
|
@@ -144,12 +150,12 @@ msgid "Encountered an error while trying to access the server:"
|
|
144
150
|
msgstr "서버에 접근하는 동안 오류가 발생했습니다:"
|
145
151
|
|
146
152
|
msgid "Exclude installed packages"
|
147
|
-
msgstr ""
|
153
|
+
msgstr "설치된 패키지 제외"
|
148
154
|
|
149
155
|
msgid "Exclude installed packages from being uploaded to the Red Hat cloud"
|
150
156
|
msgstr "설치된 패키지가 Red Hat 클라우드에 업로드되는 것을 제외합니다."
|
151
157
|
|
152
|
-
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.)"
|
158
|
+
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.) Ignored when using local Insights."
|
153
159
|
msgstr ""
|
154
160
|
|
155
161
|
msgid "Exit Code: %s"
|
@@ -186,7 +192,7 @@ msgid "Generate and upload report"
|
|
186
192
|
msgstr "보고서 생성 및 업로드"
|
187
193
|
|
188
194
|
msgid "Generate report"
|
189
|
-
msgstr ""
|
195
|
+
msgstr "보고서 생성"
|
190
196
|
|
191
197
|
msgid "Generate the report, but do not upload"
|
192
198
|
msgstr "보고서를 생성하되 업로드하지 마십시오."
|
@@ -215,6 +221,9 @@ msgstr "RH Cloud에 없는 호스트를 가져오십시오."
|
|
215
221
|
msgid "Host Insights recommendations"
|
216
222
|
msgstr "호스트 Insights 추천"
|
217
223
|
|
224
|
+
msgid "Host inventory report job"
|
225
|
+
msgstr ""
|
226
|
+
|
218
227
|
msgid "Host was not uploaded to your RH cloud inventory"
|
219
228
|
msgstr "호스트가 RH 클라우드 인벤토리에 업로드되지 않았습니다."
|
220
229
|
|
@@ -258,7 +267,7 @@ msgid "Knowledgebase article"
|
|
258
267
|
msgstr "지식베이스 문서"
|
259
268
|
|
260
269
|
msgid "Learn more about {minimalDataCollectionSetting}."
|
261
|
-
msgstr ""
|
270
|
+
msgstr "{minimalDataCollectionSetting}에 대해 자세히 알아보세요."
|
262
271
|
|
263
272
|
msgid "List of host UUIDs"
|
264
273
|
msgstr "호스트 UUID 목록"
|
@@ -276,6 +285,9 @@ msgid "Manual"
|
|
276
285
|
msgstr "수동"
|
277
286
|
|
278
287
|
msgid "Minimal data collection"
|
288
|
+
msgstr "최소한의 데이터 수집"
|
289
|
+
|
290
|
+
msgid "Missing Insights facets created: %s"
|
279
291
|
msgstr ""
|
280
292
|
|
281
293
|
msgid "Moderate"
|
@@ -312,7 +324,7 @@ msgid "Obfuscate host ipv4 addresses"
|
|
312
324
|
msgstr "호스트 ipv4 주소 난독화"
|
313
325
|
|
314
326
|
msgid "Obfuscate host ipv4 addresses."
|
315
|
-
msgstr ""
|
327
|
+
msgstr "호스트 ipv4 주소 난독화"
|
316
328
|
|
317
329
|
msgid "Obfuscate host names"
|
318
330
|
msgstr "호스트 이름 난독화"
|
@@ -320,20 +332,20 @@ msgstr "호스트 이름 난독화"
|
|
320
332
|
msgid "Obfuscate host names sent to the Red Hat cloud"
|
321
333
|
msgstr "Red Hat 클라우드로 전송된 호스트 이름을 난독화합니다."
|
322
334
|
|
323
|
-
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.)"
|
335
|
+
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.) Ignored when using local Insights."
|
324
336
|
msgstr ""
|
325
337
|
|
326
338
|
msgid "Obfuscate ipv4 addresses sent to the Red Hat cloud"
|
327
339
|
msgstr "Red Hat 클라우드로 전송된 ipv4 주소 난독화"
|
328
340
|
|
329
|
-
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.)"
|
341
|
+
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.) Ignored when using local Insights."
|
330
342
|
msgstr ""
|
331
343
|
|
332
|
-
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."
|
344
|
+
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. Ignored when using local Insights."
|
333
345
|
msgstr ""
|
334
346
|
|
335
347
|
msgid "Only send the minimum required data to Red Hat cloud, obfuscation settings are disabled"
|
336
|
-
msgstr ""
|
348
|
+
msgstr "Red Hat 클라우드에 필요한 최소한의 데이터만 전송하고 난독화 설정은 비활성화됩니다."
|
337
349
|
|
338
350
|
msgid "Oops! Couldn't find organization that matches your query"
|
339
351
|
msgstr "죄송합니다! 귀하의 쿼리와 일치하는 조직을 찾을 수 없습니다."
|
@@ -350,8 +362,8 @@ msgstr "Playbook"
|
|
350
362
|
msgid "RH Cloud"
|
351
363
|
msgstr "RH 클라우드"
|
352
364
|
|
353
|
-
msgid "RHC daemon id"
|
354
|
-
msgstr "
|
365
|
+
msgid "RHC daemon id. Ignored when using local Insights."
|
366
|
+
msgstr ""
|
355
367
|
|
356
368
|
msgid "Read more about it in RH cloud insights"
|
357
369
|
msgstr "RH 클라우드 Insights에서 이에 대해 자세히 알아보세요."
|
@@ -411,7 +423,7 @@ msgid "Run RH Cloud playbook"
|
|
411
423
|
msgstr "RH Cloud playbook 실행"
|
412
424
|
|
413
425
|
msgid "Run playbook generated by Red Hat remediations app"
|
414
|
-
msgstr ""
|
426
|
+
msgstr "Red Hat Remediations 앱에서 생성된 playbook 실행"
|
415
427
|
|
416
428
|
msgid "Run remediation playbook generated by Insights"
|
417
429
|
msgstr "Insights에서 생성된 수정 playbook 실행"
|
@@ -426,7 +438,7 @@ msgid "Select recommendations from all pages"
|
|
426
438
|
msgstr "모든 페이지에서 추천을 선택하세요"
|
427
439
|
|
428
440
|
msgid "Send additional data to enhance Insights services, as per the settings"
|
429
|
-
msgstr ""
|
441
|
+
msgstr "설정에 따라 Insights 서비스를 향상시키기 위해 추가 데이터를 보냅니다."
|
430
442
|
|
431
443
|
msgid "Set the current organization context for the request"
|
432
444
|
msgstr "요청에 대한 현재 조직 컨텍스트 설정"
|
@@ -434,8 +446,8 @@ msgstr "요청에 대한 현재 조직 컨텍스트 설정"
|
|
434
446
|
msgid "Settings"
|
435
447
|
msgstr "설정 "
|
436
448
|
|
437
|
-
msgid "Should import include parameter tags from Foreman?"
|
438
|
-
msgstr "
|
449
|
+
msgid "Should import include parameter tags from Foreman? Ignored when using local Insights."
|
450
|
+
msgstr ""
|
439
451
|
|
440
452
|
msgid "Show Advanced Settings"
|
441
453
|
msgstr "고급 설정 표시"
|
@@ -443,6 +455,12 @@ msgstr "고급 설정 표시"
|
|
443
455
|
msgid "Show if system is configured to use local iop-advisor-engine."
|
444
456
|
msgstr "시스템이 로컬 iop-advisor-engine을 사용하도록 구성되어 있는지 표시하십시오."
|
445
457
|
|
458
|
+
msgid "Single-host report job"
|
459
|
+
msgstr ""
|
460
|
+
|
461
|
+
msgid "Single-host report job for host %s"
|
462
|
+
msgstr ""
|
463
|
+
|
446
464
|
msgid "Start inventory synchronization"
|
447
465
|
msgstr "인벤토리 동기화 시작"
|
448
466
|
|
@@ -474,7 +492,7 @@ msgid "The report file %{filename} doesn't exist"
|
|
474
492
|
msgstr "보고서 파일%{filename}이/가 존재하지 않습니다"
|
475
493
|
|
476
494
|
msgid "The scheduled process is disabled because this Foreman is configured with a local IoP Smart Proxy."
|
477
|
-
msgstr ""
|
495
|
+
msgstr "이 Foreman이 로컬 IoP Smart Proxy로 구성되어 있어 예정된 프로세스가 비활성화되었습니다."
|
478
496
|
|
479
497
|
msgid "The server returned the following error: %s"
|
480
498
|
msgstr "서버에서 다음 오류가 반환되었습니다. %s"
|
@@ -485,6 +503,9 @@ msgstr "다음 오류로 인해 작업이 실패했습니다."
|
|
485
503
|
msgid "There are no recommendations for your hosts"
|
486
504
|
msgstr "호스트에 대한 권장 사항이 없음"
|
487
505
|
|
506
|
+
msgid "There were no missing Insights facets"
|
507
|
+
msgstr ""
|
508
|
+
|
488
509
|
msgid "This action will also enable automatic reports upload"
|
489
510
|
msgstr "이 작업을 수행하면 자동 보고서 업로드도 활성화됩니다."
|
490
511
|
|
@@ -495,7 +516,7 @@ msgid "To manually upload the data for a specific organization, select an organi
|
|
495
516
|
msgstr "특정 조직에 대한 데이터를 수동으로 업로드하려면 조직을 선택하고 {restartButtonName}를 클릭하십시오."
|
496
517
|
|
497
518
|
msgid "Total CVEs"
|
498
|
-
msgstr ""
|
519
|
+
msgstr "총 CVE"
|
499
520
|
|
500
521
|
msgid "Total risk"
|
501
522
|
msgstr "총 위험"
|
@@ -525,10 +546,10 @@ msgid "View in Red Hat Insights"
|
|
525
546
|
msgstr "Red Hat Insights에서 보기"
|
526
547
|
|
527
548
|
msgid "Vulnerabilities"
|
528
|
-
msgstr ""
|
549
|
+
msgstr "취약점"
|
529
550
|
|
530
551
|
msgid "Vulnerability"
|
531
|
-
msgstr ""
|
552
|
+
msgstr "취약성"
|
532
553
|
|
533
554
|
msgid "Wait and %s"
|
534
555
|
msgstr "대기 및 %s"
|
@@ -597,7 +618,7 @@ msgid "rule title"
|
|
597
618
|
msgstr "규칙 제목"
|
598
619
|
|
599
620
|
msgid "setting minimal data collection"
|
600
|
-
msgstr ""
|
621
|
+
msgstr "최소 데이터 수집 설정"
|
601
622
|
|
602
623
|
msgid "solution url"
|
603
624
|
msgstr "솔루션 URL"
|
@@ -9,14 +9,14 @@
|
|
9
9
|
# 0868a4d1af5275b3f70b0a6dac4c99a4, 2023
|
10
10
|
# Amit Upadhye <aupadhye@redhat.com>, 2023
|
11
11
|
# Ewoud Kohl van Wijngaarden <ewoud+transifex@kohlvanwijngaarden.nl>, 2025
|
12
|
+
# Ondřej Gajdušek, 2025
|
12
13
|
#
|
13
14
|
msgid ""
|
14
15
|
msgstr ""
|
15
|
-
"Project-Id-Version: foreman_rh_cloud
|
16
|
+
"Project-Id-Version: foreman_rh_cloud 13.0.5\n"
|
16
17
|
"Report-Msgid-Bugs-To: \n"
|
17
18
|
"PO-Revision-Date: 2023-01-20 13:26+0000\n"
|
18
|
-
"Last-Translator:
|
19
|
-
"n.nl>, 2025\n"
|
19
|
+
"Last-Translator: Ondřej Gajdušek, 2025\n"
|
20
20
|
"Language-Team: Chinese (China) (https://app.transifex.com/foreman/teams/114/zh"
|
21
21
|
"_CN/)\n"
|
22
22
|
"MIME-Version: 1.0\n"
|
@@ -44,7 +44,7 @@ msgid "All recommendations are now selected."
|
|
44
44
|
msgstr "现在选择了所有建议。"
|
45
45
|
|
46
46
|
msgid "Analytics data collection"
|
47
|
-
msgstr ""
|
47
|
+
msgstr "数据收集分析"
|
48
48
|
|
49
49
|
msgid "Any Organization"
|
50
50
|
msgstr "任意机构"
|
@@ -127,11 +127,17 @@ msgstr "下载最新的报告"
|
|
127
127
|
msgid "Enable automatic deletion of mismatched host records from the Red Hat cloud"
|
128
128
|
msgstr "启用自动删除来自红帽云的主机记录"
|
129
129
|
|
130
|
+
msgid "Enable automatic deletion of mismatched host records from the Red Hat cloud. Ignored when using local Insights."
|
131
|
+
msgstr ""
|
132
|
+
|
130
133
|
msgid "Enable automatic synchronization of Insights recommendations from the Red Hat cloud"
|
131
134
|
msgstr "启用来自红帽云的 Insights 建议自动同步"
|
132
135
|
|
133
|
-
msgid "Enable automatic
|
134
|
-
msgstr "
|
136
|
+
msgid "Enable automatic synchronization of Insights recommendations from the Red Hat cloud. Ignored when using local Insights."
|
137
|
+
msgstr ""
|
138
|
+
|
139
|
+
msgid "Enable automatic upload of your host inventory to the Red Hat cloud. Ignored when using local Insights."
|
140
|
+
msgstr ""
|
135
141
|
|
136
142
|
msgid "Enable automatic upload of your hosts inventory to the Red Hat cloud"
|
137
143
|
msgstr "启用自动将主机清单上传到红帽云"
|
@@ -146,12 +152,12 @@ msgid "Encountered an error while trying to access the server:"
|
|
146
152
|
msgstr "在尝试访问服务器时遇到错误:"
|
147
153
|
|
148
154
|
msgid "Exclude installed packages"
|
149
|
-
msgstr ""
|
155
|
+
msgstr "排除安装的软件包"
|
150
156
|
|
151
157
|
msgid "Exclude installed packages from being uploaded to the Red Hat cloud"
|
152
158
|
msgstr "将安装的软件包上传到红帽云"
|
153
159
|
|
154
|
-
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.)"
|
160
|
+
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.) Ignored when using local Insights."
|
155
161
|
msgstr ""
|
156
162
|
|
157
163
|
msgid "Exit Code: %s"
|
@@ -188,7 +194,7 @@ msgid "Generate and upload report"
|
|
188
194
|
msgstr "生成并上传报告"
|
189
195
|
|
190
196
|
msgid "Generate report"
|
191
|
-
msgstr ""
|
197
|
+
msgstr "生成报告"
|
192
198
|
|
193
199
|
msgid "Generate the report, but do not upload"
|
194
200
|
msgstr "生成报告,但不上传"
|
@@ -217,6 +223,9 @@ msgstr "获取 RH Cloud 中缺少的主机"
|
|
217
223
|
msgid "Host Insights recommendations"
|
218
224
|
msgstr "主机 Insights 建议"
|
219
225
|
|
226
|
+
msgid "Host inventory report job"
|
227
|
+
msgstr ""
|
228
|
+
|
220
229
|
msgid "Host was not uploaded to your RH cloud inventory"
|
221
230
|
msgstr "主机没有上传到您的 RH 云清单"
|
222
231
|
|
@@ -260,7 +269,7 @@ msgid "Knowledgebase article"
|
|
260
269
|
msgstr "知识库文章"
|
261
270
|
|
262
271
|
msgid "Learn more about {minimalDataCollectionSetting}."
|
263
|
-
msgstr ""
|
272
|
+
msgstr "了解有关 {minimalDataCollectionSetting} 的更多信息。"
|
264
273
|
|
265
274
|
msgid "List of host UUIDs"
|
266
275
|
msgstr "主机 UUID 列表"
|
@@ -278,6 +287,9 @@ msgid "Manual"
|
|
278
287
|
msgstr "手册"
|
279
288
|
|
280
289
|
msgid "Minimal data collection"
|
290
|
+
msgstr "最小数据收集"
|
291
|
+
|
292
|
+
msgid "Missing Insights facets created: %s"
|
281
293
|
msgstr ""
|
282
294
|
|
283
295
|
msgid "Moderate"
|
@@ -314,7 +326,7 @@ msgid "Obfuscate host ipv4 addresses"
|
|
314
326
|
msgstr "模糊的主机 ipv4 地址"
|
315
327
|
|
316
328
|
msgid "Obfuscate host ipv4 addresses."
|
317
|
-
msgstr ""
|
329
|
+
msgstr "对主机 ipv4 地址进行模糊化处理"
|
318
330
|
|
319
331
|
msgid "Obfuscate host names"
|
320
332
|
msgstr "模糊主机名"
|
@@ -322,20 +334,20 @@ msgstr "模糊主机名"
|
|
322
334
|
msgid "Obfuscate host names sent to the Red Hat cloud"
|
323
335
|
msgstr "发送到红帽云的模糊主机名"
|
324
336
|
|
325
|
-
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.)"
|
337
|
+
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.) Ignored when using local Insights."
|
326
338
|
msgstr ""
|
327
339
|
|
328
340
|
msgid "Obfuscate ipv4 addresses sent to the Red Hat cloud"
|
329
341
|
msgstr "发送到红帽云的模糊 ipv4 地址"
|
330
342
|
|
331
|
-
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.)"
|
343
|
+
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.) Ignored when using local Insights."
|
332
344
|
msgstr ""
|
333
345
|
|
334
|
-
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."
|
346
|
+
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. Ignored when using local Insights."
|
335
347
|
msgstr ""
|
336
348
|
|
337
349
|
msgid "Only send the minimum required data to Red Hat cloud, obfuscation settings are disabled"
|
338
|
-
msgstr ""
|
350
|
+
msgstr "仅将最低所需的数据发送到红帽云,禁用模糊设置"
|
339
351
|
|
340
352
|
msgid "Oops! Couldn't find organization that matches your query"
|
341
353
|
msgstr "未找到与您的查询匹配的机构"
|
@@ -352,8 +364,8 @@ msgstr "运行 playbook"
|
|
352
364
|
msgid "RH Cloud"
|
353
365
|
msgstr "RH Cloud"
|
354
366
|
|
355
|
-
msgid "RHC daemon id"
|
356
|
-
msgstr "
|
367
|
+
msgid "RHC daemon id. Ignored when using local Insights."
|
368
|
+
msgstr ""
|
357
369
|
|
358
370
|
msgid "Read more about it in RH cloud insights"
|
359
371
|
msgstr "在 RH Cloud insights 中了解更多有关它的信息"
|
@@ -413,7 +425,7 @@ msgid "Run RH Cloud playbook"
|
|
413
425
|
msgstr "运行 RH Cloud playbook"
|
414
426
|
|
415
427
|
msgid "Run playbook generated by Red Hat remediations app"
|
416
|
-
msgstr ""
|
428
|
+
msgstr "运行由红帽补救应用生成的 playbook"
|
417
429
|
|
418
430
|
msgid "Run remediation playbook generated by Insights"
|
419
431
|
msgstr "运行 Insights 生成的补救 playbook"
|
@@ -428,7 +440,7 @@ msgid "Select recommendations from all pages"
|
|
428
440
|
msgstr "在所有页面中选择建议"
|
429
441
|
|
430
442
|
msgid "Send additional data to enhance Insights services, as per the settings"
|
431
|
-
msgstr ""
|
443
|
+
msgstr "根据设置,发送额外数据以增强 Insights 服务"
|
432
444
|
|
433
445
|
msgid "Set the current organization context for the request"
|
434
446
|
msgstr "设置请求的当前机构上下文"
|
@@ -436,8 +448,8 @@ msgstr "设置请求的当前机构上下文"
|
|
436
448
|
msgid "Settings"
|
437
449
|
msgstr "设置"
|
438
450
|
|
439
|
-
msgid "Should import include parameter tags from Foreman?"
|
440
|
-
msgstr "
|
451
|
+
msgid "Should import include parameter tags from Foreman? Ignored when using local Insights."
|
452
|
+
msgstr ""
|
441
453
|
|
442
454
|
msgid "Show Advanced Settings"
|
443
455
|
msgstr "显示高级设置"
|
@@ -445,6 +457,12 @@ msgstr "显示高级设置"
|
|
445
457
|
msgid "Show if system is configured to use local iop-advisor-engine."
|
446
458
|
msgstr "显示系统是否被配置为使用本地 iop-advisor-engine。"
|
447
459
|
|
460
|
+
msgid "Single-host report job"
|
461
|
+
msgstr ""
|
462
|
+
|
463
|
+
msgid "Single-host report job for host %s"
|
464
|
+
msgstr ""
|
465
|
+
|
448
466
|
msgid "Start inventory synchronization"
|
449
467
|
msgstr "启动清单同步"
|
450
468
|
|
@@ -476,7 +494,7 @@ msgid "The report file %{filename} doesn't exist"
|
|
476
494
|
msgstr "报告文件 %{filename} 不存在"
|
477
495
|
|
478
496
|
msgid "The scheduled process is disabled because this Foreman is configured with a local IoP Smart Proxy."
|
479
|
-
msgstr ""
|
497
|
+
msgstr "调度的进程被禁用,因为此 Foreman 配置了一个本地 IoP Smart Proxy。"
|
480
498
|
|
481
499
|
msgid "The server returned the following error: %s"
|
482
500
|
msgstr "服务器返回以下错误:%s"
|
@@ -487,6 +505,9 @@ msgstr "任务失败,错误为:"
|
|
487
505
|
msgid "There are no recommendations for your hosts"
|
488
506
|
msgstr "没有适用于您的主机的建议"
|
489
507
|
|
508
|
+
msgid "There were no missing Insights facets"
|
509
|
+
msgstr ""
|
510
|
+
|
490
511
|
msgid "This action will also enable automatic reports upload"
|
491
512
|
msgstr "此操作还会启用自动报告上传"
|
492
513
|
|
@@ -497,7 +518,7 @@ msgid "To manually upload the data for a specific organization, select an organi
|
|
497
518
|
msgstr "要手动上传特定机构的数据,请选择机构并点 {restartButtonName}。"
|
498
519
|
|
499
520
|
msgid "Total CVEs"
|
500
|
-
msgstr ""
|
521
|
+
msgstr "CVE 总数"
|
501
522
|
|
502
523
|
msgid "Total risk"
|
503
524
|
msgstr "总风险"
|
@@ -527,10 +548,10 @@ msgid "View in Red Hat Insights"
|
|
527
548
|
msgstr "禁用 Red Hat Insights"
|
528
549
|
|
529
550
|
msgid "Vulnerabilities"
|
530
|
-
msgstr ""
|
551
|
+
msgstr "安全漏洞"
|
531
552
|
|
532
553
|
msgid "Vulnerability"
|
533
|
-
msgstr ""
|
554
|
+
msgstr "安全漏洞"
|
534
555
|
|
535
556
|
msgid "Wait and %s"
|
536
557
|
msgstr "等待和 %s"
|
@@ -599,7 +620,7 @@ msgid "rule title"
|
|
599
620
|
msgstr "rule 标题"
|
600
621
|
|
601
622
|
msgid "setting minimal data collection"
|
602
|
-
msgstr ""
|
623
|
+
msgstr "设置最小数据收集"
|
603
624
|
|
604
625
|
msgid "solution url"
|
605
626
|
msgstr "solution url"
|
data/package.json
CHANGED
@@ -313,4 +313,51 @@ class FactHelpersTest < ActiveSupport::TestCase
|
|
313
313
|
assert_equal '10.230.230.3', ip3
|
314
314
|
end
|
315
315
|
end
|
316
|
+
|
317
|
+
describe 'IoP smart proxy checks' do
|
318
|
+
test 'obfuscate_hostname? returns false when global setting is enabled but IoP is present' do
|
319
|
+
Setting.expects(:[]).with(:obfuscate_inventory_hostnames).returns(true)
|
320
|
+
ForemanRhCloud.expects(:with_iop_smart_proxy?).returns(true)
|
321
|
+
host = mock('host')
|
322
|
+
# When IoP is present, it falls back to checking host-specific facts
|
323
|
+
@instance.expects(:fact_value).with(host, 'insights_client::obfuscate_hostname_enabled').returns(nil)
|
324
|
+
|
325
|
+
result = @instance.obfuscate_hostname?(host)
|
326
|
+
|
327
|
+
refute result
|
328
|
+
end
|
329
|
+
|
330
|
+
test 'obfuscate_hostname? returns true when global setting is enabled and IoP is not present' do
|
331
|
+
Setting.expects(:[]).with(:obfuscate_inventory_hostnames).returns(true)
|
332
|
+
ForemanRhCloud.expects(:with_iop_smart_proxy?).returns(false)
|
333
|
+
host = mock('host')
|
334
|
+
|
335
|
+
result = @instance.obfuscate_hostname?(host)
|
336
|
+
|
337
|
+
assert result
|
338
|
+
end
|
339
|
+
|
340
|
+
test 'obfuscate_ips? returns false when global setting is enabled but IoP is present' do
|
341
|
+
Setting.expects(:[]).with(:obfuscate_inventory_ips).returns(true)
|
342
|
+
ForemanRhCloud.expects(:with_iop_smart_proxy?).returns(true)
|
343
|
+
host = mock('host')
|
344
|
+
# When IoP is present, it falls back to checking host-specific facts
|
345
|
+
@instance.expects(:fact_value).with(host, 'insights_client::obfuscate_ipv4_enabled').returns(nil)
|
346
|
+
@instance.expects(:fact_value).with(host, 'insights_client::obfuscate_ipv6_enabled').returns(nil)
|
347
|
+
|
348
|
+
result = @instance.obfuscate_ips?(host)
|
349
|
+
|
350
|
+
refute result
|
351
|
+
end
|
352
|
+
|
353
|
+
test 'obfuscate_ips? returns true when global setting is enabled and IoP is not present' do
|
354
|
+
Setting.expects(:[]).with(:obfuscate_inventory_ips).returns(true)
|
355
|
+
ForemanRhCloud.expects(:with_iop_smart_proxy?).returns(false)
|
356
|
+
host = mock('host')
|
357
|
+
|
358
|
+
result = @instance.obfuscate_ips?(host)
|
359
|
+
|
360
|
+
assert result
|
361
|
+
end
|
362
|
+
end
|
316
363
|
end
|
@@ -5,7 +5,16 @@ class VmaasReposcanSyncTest < ActiveSupport::TestCase
|
|
5
5
|
include ForemanTasks::TestHelpers::WithInThreadExecutor
|
6
6
|
|
7
7
|
setup do
|
8
|
-
@
|
8
|
+
@root = FactoryBot.build(:katello_root_repository, :fedora_17_x86_64_dev_root)
|
9
|
+
@root.save(validate: false)
|
10
|
+
@repo = FactoryBot.create(
|
11
|
+
:katello_repository,
|
12
|
+
:with_product,
|
13
|
+
distribution_family: 'Red Hat',
|
14
|
+
distribution_version: '7.5',
|
15
|
+
root: @root
|
16
|
+
)
|
17
|
+
@repo_payload = { id: @repo.id }
|
9
18
|
@expected_url = 'https://example.com/api/v1/vmaas/reposcan/sync'
|
10
19
|
InsightsCloud.stubs(:vmaas_reposcan_sync_url).returns(@expected_url)
|
11
20
|
ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(true)
|
@@ -68,7 +77,8 @@ class VmaasReposcanSyncTest < ActiveSupport::TestCase
|
|
68
77
|
params[:method] == :put &&
|
69
78
|
params[:url] == @expected_url &&
|
70
79
|
params[:headers].is_a?(Hash) &&
|
71
|
-
params[:headers]['Content-Type'] == 'application/json'
|
80
|
+
params[:headers]['Content-Type'] == 'application/json' &&
|
81
|
+
params[:organization] == @repo.organization
|
72
82
|
end
|
73
83
|
.returns(mock_response)
|
74
84
|
|
@@ -107,6 +107,36 @@ class SliceGeneratorTest < ActiveSupport::TestCase
|
|
107
107
|
assert_equal 'test_nic1', actual_nic['name']
|
108
108
|
end
|
109
109
|
|
110
|
+
test 'does not generate a report with minimal data collection when iop is present' do
|
111
|
+
Setting[:insights_minimal_data_collection] = true
|
112
|
+
ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(true)
|
113
|
+
|
114
|
+
batch = Host.where(id: @host.id).in_batches.first
|
115
|
+
generator = create_generator(batch)
|
116
|
+
|
117
|
+
json_str = generator.render
|
118
|
+
actual = JSON.parse(json_str.join("\n"))
|
119
|
+
|
120
|
+
assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
|
121
|
+
assert_not_nil(actual_host = actual['hosts'].first)
|
122
|
+
assert_nil actual_host['ip_addresses']
|
123
|
+
assert_nil actual_host['mac_addresses']
|
124
|
+
assert_equal @host.fqdn, actual_host['fqdn']
|
125
|
+
assert_equal '1234', actual_host['account']
|
126
|
+
assert_equal 1, generator.hosts_count
|
127
|
+
assert_not_nil(actual_system_profile = actual_host['system_profile'])
|
128
|
+
assert_nil actual_system_profile['number_of_cpus']
|
129
|
+
assert_nil actual_system_profile['number_of_sockets']
|
130
|
+
assert_nil actual_system_profile['cores_per_socket']
|
131
|
+
assert_nil actual_system_profile['system_memory_bytes']
|
132
|
+
assert_nil actual_system_profile['os_release']
|
133
|
+
assert_not_nil(actual_network_interfaces = actual_system_profile['network_interfaces'])
|
134
|
+
assert_not_nil(actual_nic = actual_network_interfaces.first)
|
135
|
+
refute actual_nic.key?('mtu')
|
136
|
+
refute actual_nic.key?('mac_address')
|
137
|
+
assert_equal 'test_nic1', actual_nic['name']
|
138
|
+
end
|
139
|
+
|
110
140
|
test 'generates a report with minimal data collection' do
|
111
141
|
Setting[:insights_minimal_data_collection] = true
|
112
142
|
create_fact_values(@host,
|
@@ -930,6 +960,33 @@ class SliceGeneratorTest < ActiveSupport::TestCase
|
|
930
960
|
assert_equal 'alibaba', actual_profile['cloud_provider']
|
931
961
|
end
|
932
962
|
|
963
|
+
test 'do not exclude packages when iop is present' do
|
964
|
+
Setting[:exclude_installed_packages] = true
|
965
|
+
ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(true)
|
966
|
+
installed_package = ::Katello::InstalledPackage.create(name: 'test-package', nvrea: 'test-package-1.0.x86_64', nvra: 'test-package-1.0.x86_64')
|
967
|
+
|
968
|
+
another_host = FactoryBot.create(
|
969
|
+
:host,
|
970
|
+
:with_subscription,
|
971
|
+
:with_content,
|
972
|
+
content_view: @host.content_views.first,
|
973
|
+
lifecycle_environment: @host.lifecycle_environments.first,
|
974
|
+
organization: @host.organization,
|
975
|
+
installed_packages: [installed_package]
|
976
|
+
)
|
977
|
+
|
978
|
+
batch = Host.where(id: another_host.id).in_batches.first
|
979
|
+
generator = create_generator(batch)
|
980
|
+
|
981
|
+
json_str = generator.render
|
982
|
+
actual = JSON.parse(json_str.join("\n"))
|
983
|
+
|
984
|
+
assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
|
985
|
+
assert_not_nil(actual_host = actual['hosts'].first)
|
986
|
+
assert_not_nil(actual_profile = actual_host['system_profile'])
|
987
|
+
assert_not_nil(actual_profile['installed_packages'])
|
988
|
+
end
|
989
|
+
|
933
990
|
test 'include packages installed in the report' do
|
934
991
|
Setting[:exclude_installed_packages] = false
|
935
992
|
installed_package = ::Katello::InstalledPackage.create(name: 'test-package', nvrea: 'test-package-1.0.x86_64', nvra: 'test-package-1.0.x86_64')
|