foreman_rh_cloud 13.2.7 → 14.0.1
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 +61 -61
- data/app/assets/javascripts/foreman_rh_cloud/locale/ja/foreman_rh_cloud.js +68 -68
- data/app/assets/javascripts/foreman_rh_cloud/locale/ka/foreman_rh_cloud.js +9 -9
- data/app/assets/javascripts/foreman_rh_cloud/locale/ko/foreman_rh_cloud.js +60 -60
- data/app/assets/javascripts/foreman_rh_cloud/locale/zh_CN/foreman_rh_cloud.js +60 -60
- data/app/services/foreman_rh_cloud/insights_api_forwarder.rb +5 -12
- data/lib/foreman_inventory_upload/generators/fact_helpers.rb +0 -8
- data/lib/foreman_inventory_upload/generators/queries.rb +1 -1
- data/lib/foreman_inventory_upload/generators/slice.rb +1 -1
- data/lib/foreman_rh_cloud/version.rb +1 -1
- data/locale/fr/LC_MESSAGES/foreman_rh_cloud.mo +0 -0
- data/locale/fr/foreman_rh_cloud.edit.po +1032 -0
- data/locale/fr/foreman_rh_cloud.po +65 -66
- data/locale/fr/foreman_rh_cloud.po.time_stamp +0 -0
- data/locale/ja/LC_MESSAGES/foreman_rh_cloud.mo +0 -0
- data/locale/ja/foreman_rh_cloud.edit.po +1026 -0
- data/locale/ja/foreman_rh_cloud.po +70 -72
- data/locale/ja/foreman_rh_cloud.po.time_stamp +0 -0
- data/locale/ka/LC_MESSAGES/foreman_rh_cloud.mo +0 -0
- data/locale/ka/foreman_rh_cloud.edit.po +1025 -0
- data/locale/ka/foreman_rh_cloud.po +10 -11
- data/locale/ka/foreman_rh_cloud.po.time_stamp +0 -0
- data/locale/ko/LC_MESSAGES/foreman_rh_cloud.mo +0 -0
- data/locale/ko/foreman_rh_cloud.edit.po +1029 -0
- data/locale/ko/foreman_rh_cloud.po +63 -64
- data/locale/ko/foreman_rh_cloud.po.time_stamp +0 -0
- data/locale/zh_CN/LC_MESSAGES/foreman_rh_cloud.mo +0 -0
- data/locale/zh_CN/foreman_rh_cloud.edit.po +1031 -0
- data/locale/zh_CN/foreman_rh_cloud.po +64 -65
- data/locale/zh_CN/foreman_rh_cloud.po.time_stamp +0 -0
- data/package.json +1 -1
- data/test/controllers/insights_cloud/api/machine_telemetries_controller_test.rb +1 -1
- data/test/jobs/inventory_full_sync_test.rb +4 -7
- data/test/jobs/inventory_hosts_sync_test.rb +5 -7
- data/test/jobs/inventory_self_host_sync_test.rb +1 -1
- data/test/unit/archived_report_generator_test.rb +1 -2
- data/test/unit/fact_helpers_test.rb +0 -16
- data/test/unit/services/foreman_rh_cloud/branch_info_test.rb +1 -1
- data/test/unit/services/foreman_rh_cloud/cloud_request_forwarder_test.rb +1 -1
- data/test/unit/slice_generator_test.rb +2 -21
- data/webpack/CVEsHostDetailsTab/CVEsHostDetailsTab.js +1 -6
- data/webpack/CVEsHostDetailsTab/__tests__/CVEsHostDetailsTab.test.js +6 -45
- data/webpack/ForemanInventoryUpload/Components/PageHeader/components/PageDescription/PageDescription.js +1 -3
- data/webpack/ForemanInventoryUpload/ForemanInventoryHelpers.js +0 -7
- data/webpack/InsightsHostDetailsTab/NewHostDetailsTab.js +14 -44
- metadata +16 -4
- data/webpack/InsightsHostDetailsTab/__tests__/NewHostDetailsTab.test.js +0 -154
|
@@ -4,20 +4,19 @@
|
|
|
4
4
|
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
|
5
5
|
#
|
|
6
6
|
# Translators:
|
|
7
|
+
# Bryan Kearney <bryan.kearney@gmail.com>, 2023
|
|
7
8
|
# tim123, 2023
|
|
8
9
|
# 0868a4d1af5275b3f70b0a6dac4c99a4, 2023
|
|
9
|
-
# Amit Upadhye <aupadhye@redhat.com>,
|
|
10
|
-
# Ewoud Kohl van Wijngaarden <ewoud+transifex@kohlvanwijngaarden.nl>,
|
|
11
|
-
#
|
|
12
|
-
# Ondřej Gajdušek, 2026
|
|
10
|
+
# Amit Upadhye <aupadhye@redhat.com>, 2023
|
|
11
|
+
# Ewoud Kohl van Wijngaarden <ewoud+transifex@kohlvanwijngaarden.nl>, 2025
|
|
12
|
+
# Ondřej Gajdušek, 2025
|
|
13
13
|
#
|
|
14
|
-
#, fuzzy
|
|
15
14
|
msgid ""
|
|
16
15
|
msgstr ""
|
|
17
|
-
"Project-Id-Version: foreman_rh_cloud
|
|
16
|
+
"Project-Id-Version: foreman_rh_cloud 13.2.0\n"
|
|
18
17
|
"Report-Msgid-Bugs-To: \n"
|
|
19
18
|
"PO-Revision-Date: 2023-01-20 13:26+0000\n"
|
|
20
|
-
"Last-Translator: Ondřej Gajdušek,
|
|
19
|
+
"Last-Translator: Ondřej Gajdušek, 2025\n"
|
|
21
20
|
"Language-Team: Chinese (China) (https://app.transifex.com/foreman/teams/114/zh"
|
|
22
21
|
"_CN/)\n"
|
|
23
22
|
"MIME-Version: 1.0\n"
|
|
@@ -33,7 +32,7 @@ msgid "%s organizations"
|
|
|
33
32
|
msgstr "%s 机构"
|
|
34
33
|
|
|
35
34
|
msgid "A specific organization must be selected from the organization context."
|
|
36
|
-
msgstr "
|
|
35
|
+
msgstr ""
|
|
37
36
|
|
|
38
37
|
msgid "About subscription watch"
|
|
39
38
|
msgstr "订阅查看"
|
|
@@ -48,7 +47,7 @@ msgid "All recommendations are now selected."
|
|
|
48
47
|
msgstr "现在选择了所有建议。"
|
|
49
48
|
|
|
50
49
|
msgid "Analysis disabled"
|
|
51
|
-
msgstr "
|
|
50
|
+
msgstr ""
|
|
52
51
|
|
|
53
52
|
msgid "Analytics data collection"
|
|
54
53
|
msgstr "数据收集分析"
|
|
@@ -60,7 +59,7 @@ msgid "Apply Insights recommendations"
|
|
|
60
59
|
msgstr "应用 Insights 建议"
|
|
61
60
|
|
|
62
61
|
msgid "Attempted to destroy HBI host %s, but host does not exist in HBI"
|
|
63
|
-
msgstr "
|
|
62
|
+
msgstr ""
|
|
64
63
|
|
|
65
64
|
msgid "Automatic inventory upload"
|
|
66
65
|
msgstr "自动清单上传"
|
|
@@ -102,7 +101,7 @@ msgid "Completed"
|
|
|
102
101
|
msgstr "完成"
|
|
103
102
|
|
|
104
103
|
msgid "Completed with warnings"
|
|
105
|
-
msgstr "
|
|
104
|
+
msgstr ""
|
|
106
105
|
|
|
107
106
|
msgid "Configure"
|
|
108
107
|
msgstr "配置"
|
|
@@ -123,13 +122,13 @@ msgid "Current page"
|
|
|
123
122
|
msgstr "当前页"
|
|
124
123
|
|
|
125
124
|
msgid "Details"
|
|
126
|
-
msgstr "
|
|
125
|
+
msgstr ""
|
|
127
126
|
|
|
128
127
|
msgid "Disable"
|
|
129
|
-
msgstr "
|
|
128
|
+
msgstr ""
|
|
130
129
|
|
|
131
130
|
msgid "Disable vulnerability analysis"
|
|
132
|
-
msgstr "
|
|
131
|
+
msgstr ""
|
|
133
132
|
|
|
134
133
|
msgid "Disconnected hosts: "
|
|
135
134
|
msgstr "断开连接的主机:"
|
|
@@ -147,28 +146,28 @@ msgid "Download latest report"
|
|
|
147
146
|
msgstr "下载最新的报告"
|
|
148
147
|
|
|
149
148
|
msgid "Download report"
|
|
150
|
-
msgstr "
|
|
149
|
+
msgstr ""
|
|
151
150
|
|
|
152
151
|
msgid "Duration"
|
|
153
|
-
msgstr "
|
|
152
|
+
msgstr ""
|
|
154
153
|
|
|
155
154
|
msgid "Enable"
|
|
156
|
-
msgstr "
|
|
155
|
+
msgstr ""
|
|
157
156
|
|
|
158
157
|
msgid "Enable automatic deletion of mismatched host records from the Red Hat cloud"
|
|
159
158
|
msgstr "启用自动删除来自红帽云的主机记录"
|
|
160
159
|
|
|
161
160
|
msgid "Enable automatic deletion of mismatched host records from the Red Hat cloud. Ignored when using local Insights."
|
|
162
|
-
msgstr "
|
|
161
|
+
msgstr ""
|
|
163
162
|
|
|
164
163
|
msgid "Enable automatic synchronization of Insights recommendations from the Red Hat cloud"
|
|
165
164
|
msgstr "启用来自红帽云的 Insights 建议自动同步"
|
|
166
165
|
|
|
167
166
|
msgid "Enable automatic synchronization of Insights recommendations from the Red Hat cloud. Ignored when using local Insights."
|
|
168
|
-
msgstr "
|
|
167
|
+
msgstr ""
|
|
169
168
|
|
|
170
169
|
msgid "Enable automatic upload of your host inventory to the Red Hat cloud. Ignored when using local Insights."
|
|
171
|
-
msgstr "
|
|
170
|
+
msgstr ""
|
|
172
171
|
|
|
173
172
|
msgid "Enable automatic upload of your hosts inventory to the Red Hat cloud"
|
|
174
173
|
msgstr "启用自动将主机清单上传到红帽云"
|
|
@@ -180,7 +179,7 @@ msgid "Enable inventory upload"
|
|
|
180
179
|
msgstr "启用清单上传"
|
|
181
180
|
|
|
182
181
|
msgid "Enable vulnerability analysis"
|
|
183
|
-
msgstr "
|
|
182
|
+
msgstr ""
|
|
184
183
|
|
|
185
184
|
msgid "Encountered an error while trying to access the server:"
|
|
186
185
|
msgstr "在尝试访问服务器时遇到错误:"
|
|
@@ -192,22 +191,22 @@ msgid "Exclude installed packages from being uploaded to the Red Hat cloud"
|
|
|
192
191
|
msgstr "将安装的软件包上传到红帽云"
|
|
193
192
|
|
|
194
193
|
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."
|
|
195
|
-
msgstr "
|
|
194
|
+
msgstr ""
|
|
196
195
|
|
|
197
196
|
msgid "Exit Code: %s"
|
|
198
197
|
msgstr "退出代码:%s"
|
|
199
198
|
|
|
200
199
|
msgid "Failed"
|
|
201
|
-
msgstr "
|
|
200
|
+
msgstr ""
|
|
202
201
|
|
|
203
202
|
msgid "Failed to destroy HBI host %s: %s"
|
|
204
|
-
msgstr "
|
|
203
|
+
msgstr ""
|
|
205
204
|
|
|
206
205
|
msgid "Failed to fetch hosts"
|
|
207
|
-
msgstr "
|
|
206
|
+
msgstr ""
|
|
208
207
|
|
|
209
208
|
msgid "Failed to update vulnerability analysis status"
|
|
210
|
-
msgstr "
|
|
209
|
+
msgstr ""
|
|
211
210
|
|
|
212
211
|
msgid "Fetch Insights-related host details"
|
|
213
212
|
msgstr "获取与 Insights 相关的主机详情"
|
|
@@ -246,7 +245,7 @@ msgid "Generate the report, but do not upload"
|
|
|
246
245
|
msgstr "生成报告,但不上传"
|
|
247
246
|
|
|
248
247
|
msgid "Generated"
|
|
249
|
-
msgstr "
|
|
248
|
+
msgstr ""
|
|
250
249
|
|
|
251
250
|
msgid "Generating"
|
|
252
251
|
msgstr "生成中"
|
|
@@ -273,7 +272,7 @@ msgid "Host Insights recommendations"
|
|
|
273
272
|
msgstr "主机 Insights 建议"
|
|
274
273
|
|
|
275
274
|
msgid "Host inventory report job"
|
|
276
|
-
msgstr "
|
|
275
|
+
msgstr ""
|
|
277
276
|
|
|
278
277
|
msgid "Host was not uploaded to your RH cloud inventory"
|
|
279
278
|
msgstr "主机没有上传到您的 RH 云清单"
|
|
@@ -297,7 +296,7 @@ msgid "Insights"
|
|
|
297
296
|
msgstr "Insights"
|
|
298
297
|
|
|
299
298
|
msgid "Invalid response from server"
|
|
300
|
-
msgstr "
|
|
299
|
+
msgstr ""
|
|
301
300
|
|
|
302
301
|
msgid "Inventory"
|
|
303
302
|
msgstr "清单"
|
|
@@ -336,7 +335,7 @@ msgid "Low"
|
|
|
336
335
|
msgstr "低"
|
|
337
336
|
|
|
338
337
|
msgid "Manage vulnerability analysis"
|
|
339
|
-
msgstr "
|
|
338
|
+
msgstr ""
|
|
340
339
|
|
|
341
340
|
msgid "Manual"
|
|
342
341
|
msgstr "手册"
|
|
@@ -345,7 +344,7 @@ msgid "Minimal data collection"
|
|
|
345
344
|
msgstr "最小数据收集"
|
|
346
345
|
|
|
347
346
|
msgid "Missing Insights facets created: %s"
|
|
348
|
-
msgstr "
|
|
347
|
+
msgstr ""
|
|
349
348
|
|
|
350
349
|
msgid "Moderate"
|
|
351
350
|
msgstr "中等"
|
|
@@ -354,7 +353,7 @@ msgid "More details can be found in"
|
|
|
354
353
|
msgstr "如需更多详细信息,请参阅"
|
|
355
354
|
|
|
356
355
|
msgid "N/A"
|
|
357
|
-
msgstr "
|
|
356
|
+
msgstr ""
|
|
358
357
|
|
|
359
358
|
msgid "Next run: "
|
|
360
359
|
msgstr "下一次运行 :"
|
|
@@ -363,31 +362,31 @@ msgid "No"
|
|
|
363
362
|
msgstr "否"
|
|
364
363
|
|
|
365
364
|
msgid "No account data available."
|
|
366
|
-
msgstr "
|
|
365
|
+
msgstr ""
|
|
367
366
|
|
|
368
367
|
msgid "No recent tasks"
|
|
369
|
-
msgstr "
|
|
368
|
+
msgstr ""
|
|
370
369
|
|
|
371
370
|
msgid "No recommendations were found for this host!"
|
|
372
371
|
msgstr "没有找到此主机的建议!"
|
|
373
372
|
|
|
374
373
|
msgid "No report generation tasks have been run yet."
|
|
375
|
-
msgstr "
|
|
374
|
+
msgstr ""
|
|
376
375
|
|
|
377
376
|
msgid "No results found"
|
|
378
377
|
msgstr "没有找到结果"
|
|
379
378
|
|
|
380
379
|
msgid "No task history"
|
|
381
|
-
msgstr "
|
|
380
|
+
msgstr ""
|
|
382
381
|
|
|
383
382
|
msgid "No task was found"
|
|
384
383
|
msgstr "没有找到任务"
|
|
385
384
|
|
|
386
385
|
msgid "No tasks have been run yet."
|
|
387
|
-
msgstr "
|
|
386
|
+
msgstr ""
|
|
388
387
|
|
|
389
388
|
msgid "None of the selected hosts are registered"
|
|
390
|
-
msgstr "
|
|
389
|
+
msgstr ""
|
|
391
390
|
|
|
392
391
|
msgid "Not reporting"
|
|
393
392
|
msgstr "未报告"
|
|
@@ -411,16 +410,16 @@ msgid "Obfuscate host names sent to the Red Hat cloud"
|
|
|
411
410
|
msgstr "发送到红帽云的模糊主机名"
|
|
412
411
|
|
|
413
412
|
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."
|
|
414
|
-
msgstr "
|
|
413
|
+
msgstr ""
|
|
415
414
|
|
|
416
415
|
msgid "Obfuscate ipv4 addresses sent to the Red Hat cloud"
|
|
417
416
|
msgstr "发送到红帽云的模糊 ipv4 地址"
|
|
418
417
|
|
|
419
418
|
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."
|
|
420
|
-
msgstr "
|
|
419
|
+
msgstr ""
|
|
421
420
|
|
|
422
421
|
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."
|
|
423
|
-
msgstr "
|
|
422
|
+
msgstr ""
|
|
424
423
|
|
|
425
424
|
msgid "Only send the minimum required data to Red Hat cloud, obfuscation settings are disabled"
|
|
426
425
|
msgstr "仅将最低所需的数据发送到红帽云,禁用模糊设置"
|
|
@@ -435,19 +434,19 @@ msgid "Pagination"
|
|
|
435
434
|
msgstr "分页"
|
|
436
435
|
|
|
437
436
|
msgid "Paused"
|
|
438
|
-
msgstr "
|
|
437
|
+
msgstr ""
|
|
439
438
|
|
|
440
439
|
msgid "Playbook"
|
|
441
440
|
msgstr "运行 playbook"
|
|
442
441
|
|
|
443
442
|
msgid "Previous tasks will appear here."
|
|
444
|
-
msgstr "
|
|
443
|
+
msgstr ""
|
|
445
444
|
|
|
446
445
|
msgid "RH Cloud"
|
|
447
446
|
msgstr "RH Cloud"
|
|
448
447
|
|
|
449
448
|
msgid "RHC daemon id. Ignored when using local Insights."
|
|
450
|
-
msgstr "
|
|
449
|
+
msgstr ""
|
|
451
450
|
|
|
452
451
|
msgid "Read more about it in RH cloud insights"
|
|
453
452
|
msgstr "在 RH Cloud insights 中了解更多有关它的信息"
|
|
@@ -498,16 +497,16 @@ msgid "Remediation summary"
|
|
|
498
497
|
msgstr "补救概述"
|
|
499
498
|
|
|
500
499
|
msgid "Report Generation"
|
|
501
|
-
msgstr "
|
|
500
|
+
msgstr ""
|
|
502
501
|
|
|
503
502
|
msgid "Report generation and upload started"
|
|
504
|
-
msgstr "
|
|
503
|
+
msgstr ""
|
|
505
504
|
|
|
506
505
|
msgid "Report generation started"
|
|
507
|
-
msgstr "
|
|
506
|
+
msgstr ""
|
|
508
507
|
|
|
509
508
|
msgid "Report saved to"
|
|
510
|
-
msgstr "
|
|
509
|
+
msgstr ""
|
|
511
510
|
|
|
512
511
|
msgid "Reporting"
|
|
513
512
|
msgstr "报告"
|
|
@@ -525,7 +524,7 @@ msgid "Run remediation playbook generated by Insights"
|
|
|
525
524
|
msgstr "运行 Insights 生成的补救 playbook"
|
|
526
525
|
|
|
527
526
|
msgid "Running"
|
|
528
|
-
msgstr "
|
|
527
|
+
msgstr ""
|
|
529
528
|
|
|
530
529
|
msgid "Satellite server has %{hits_count} recommendations by Red Hat"
|
|
531
530
|
msgstr "Satellite 服务器有 %{hits_count} 个红帽提供的建议"
|
|
@@ -546,7 +545,7 @@ msgid "Settings"
|
|
|
546
545
|
msgstr "设置"
|
|
547
546
|
|
|
548
547
|
msgid "Should import include parameter tags from Foreman? Ignored when using local Insights."
|
|
549
|
-
msgstr "
|
|
548
|
+
msgstr ""
|
|
550
549
|
|
|
551
550
|
msgid "Show Advanced Settings"
|
|
552
551
|
msgstr "显示高级设置"
|
|
@@ -555,10 +554,10 @@ msgid "Show if system is configured to use local iop-advisor-engine."
|
|
|
555
554
|
msgstr "显示系统是否被配置为使用本地 iop-advisor-engine。"
|
|
556
555
|
|
|
557
556
|
msgid "Single-host report job"
|
|
558
|
-
msgstr "
|
|
557
|
+
msgstr ""
|
|
559
558
|
|
|
560
559
|
msgid "Single-host report job for host %s"
|
|
561
|
-
msgstr "
|
|
560
|
+
msgstr ""
|
|
562
561
|
|
|
563
562
|
msgid "Start inventory synchronization"
|
|
564
563
|
msgstr "启动清单同步"
|
|
@@ -567,13 +566,13 @@ msgid "Start report generation"
|
|
|
567
566
|
msgstr "开始报告生成"
|
|
568
567
|
|
|
569
568
|
msgid "Started"
|
|
570
|
-
msgstr "
|
|
569
|
+
msgstr ""
|
|
571
570
|
|
|
572
571
|
msgid "Stopped"
|
|
573
|
-
msgstr "
|
|
572
|
+
msgstr ""
|
|
574
573
|
|
|
575
574
|
msgid "Success"
|
|
576
|
-
msgstr "
|
|
575
|
+
msgstr ""
|
|
577
576
|
|
|
578
577
|
msgid "Successfully synced hosts: "
|
|
579
578
|
msgstr "成功同步的主机:"
|
|
@@ -612,7 +611,7 @@ msgid "There are no recommendations for your hosts"
|
|
|
612
611
|
msgstr "没有适用于您的主机的建议"
|
|
613
612
|
|
|
614
613
|
msgid "There were no missing Insights facets"
|
|
615
|
-
msgstr "
|
|
614
|
+
msgstr ""
|
|
616
615
|
|
|
617
616
|
msgid "This action will also enable automatic reports upload"
|
|
618
617
|
msgstr "此操作还会启用自动报告上传"
|
|
@@ -633,7 +632,7 @@ msgid "Total risks"
|
|
|
633
632
|
msgstr "总风险"
|
|
634
633
|
|
|
635
634
|
msgid "Unknown"
|
|
636
|
-
msgstr "
|
|
635
|
+
msgstr ""
|
|
637
636
|
|
|
638
637
|
msgid "Upload hits from iop-advisor-engine"
|
|
639
638
|
msgstr "从 iop-advisor-engine 上传 hits"
|
|
@@ -642,13 +641,13 @@ msgid "Upload hits information"
|
|
|
642
641
|
msgstr "上传 hits 信息"
|
|
643
642
|
|
|
644
643
|
msgid "Upload is disabled because subscription connection is not enabled. Enable it in Administer > Settings > Content."
|
|
645
|
-
msgstr "
|
|
644
|
+
msgstr ""
|
|
646
645
|
|
|
647
646
|
msgid "Upload rules related to the hits"
|
|
648
647
|
msgstr "上传与 hits 相关的 rule"
|
|
649
648
|
|
|
650
649
|
msgid "Uploaded"
|
|
651
|
-
msgstr "
|
|
650
|
+
msgstr ""
|
|
652
651
|
|
|
653
652
|
msgid "Uploading"
|
|
654
653
|
msgstr "上载中"
|
|
@@ -663,10 +662,10 @@ msgid "View in Red Hat Insights"
|
|
|
663
662
|
msgstr "禁用 Red Hat Insights"
|
|
664
663
|
|
|
665
664
|
msgid "View task"
|
|
666
|
-
msgstr "
|
|
665
|
+
msgstr ""
|
|
667
666
|
|
|
668
667
|
msgid "View task details"
|
|
669
|
-
msgstr "
|
|
668
|
+
msgstr ""
|
|
670
669
|
|
|
671
670
|
msgid "Vulnerabilities"
|
|
672
671
|
msgstr "安全漏洞"
|
|
@@ -675,22 +674,22 @@ msgid "Vulnerability"
|
|
|
675
674
|
msgstr "安全漏洞"
|
|
676
675
|
|
|
677
676
|
msgid "Vulnerability analysis disabled"
|
|
678
|
-
msgstr "
|
|
677
|
+
msgstr ""
|
|
679
678
|
|
|
680
679
|
msgid "Vulnerability analysis enabled"
|
|
681
|
-
msgstr "
|
|
680
|
+
msgstr ""
|
|
682
681
|
|
|
683
682
|
msgid "Wait and %s"
|
|
684
683
|
msgstr "等待和 %s"
|
|
685
684
|
|
|
686
685
|
msgid "Warning"
|
|
687
|
-
msgstr "
|
|
686
|
+
msgstr ""
|
|
688
687
|
|
|
689
688
|
msgid "Whether the resolution requires reboot"
|
|
690
689
|
msgstr "resolution 是否需要重启"
|
|
691
690
|
|
|
692
691
|
msgid "You do not have permission to perform this action"
|
|
693
|
-
msgstr "
|
|
692
|
+
msgstr ""
|
|
694
693
|
|
|
695
694
|
msgid "category name"
|
|
696
695
|
msgstr "类别名称"
|
|
File without changes
|
data/package.json
CHANGED
|
@@ -192,7 +192,7 @@ module InsightsCloud::Api
|
|
|
192
192
|
organization: env.organization
|
|
193
193
|
)
|
|
194
194
|
|
|
195
|
-
@host.
|
|
195
|
+
@host.organization.pools << FactoryBot.create(:katello_pool, account_number: '5678', cp_id: 1)
|
|
196
196
|
|
|
197
197
|
uuid = @host.subscription_facet.uuid
|
|
198
198
|
|
|
@@ -27,7 +27,7 @@ class InventoryFullSyncTest < ActiveSupport::TestCase
|
|
|
27
27
|
|
|
28
28
|
pool = FactoryBot.create(:katello_pool, account_number: '1234', cp_id: 1)
|
|
29
29
|
|
|
30
|
-
@host1.
|
|
30
|
+
@host1.organization.pools << pool
|
|
31
31
|
|
|
32
32
|
# this host would pass our plugin queries, so it could be uploaded to the cloud.
|
|
33
33
|
@host2 = FactoryBot.create(
|
|
@@ -39,7 +39,6 @@ class InventoryFullSyncTest < ActiveSupport::TestCase
|
|
|
39
39
|
organization: env.organization
|
|
40
40
|
)
|
|
41
41
|
|
|
42
|
-
@host2.subscription_facet.pools << pool
|
|
43
42
|
@host2_inventory_id = '4536bf5c-ff03-4154-a8c9-32ff4b40e40c'
|
|
44
43
|
|
|
45
44
|
# this host would pass our plugin queries, so it could be uploaded to the cloud.
|
|
@@ -52,8 +51,6 @@ class InventoryFullSyncTest < ActiveSupport::TestCase
|
|
|
52
51
|
organization: env.organization
|
|
53
52
|
)
|
|
54
53
|
|
|
55
|
-
@host3.subscription_facet.pools << pool
|
|
56
|
-
|
|
57
54
|
ForemanInventoryUpload::Generators::Queries.instance_variable_set(:@fact_names, nil)
|
|
58
55
|
|
|
59
56
|
inventory_json = <<-INVENTORY_JSON
|
|
@@ -88,7 +85,7 @@ class InventoryFullSyncTest < ActiveSupport::TestCase
|
|
|
88
85
|
"facts": {
|
|
89
86
|
"virtual_host_name": "virt-who-nobody.home-1",
|
|
90
87
|
"satellite_instance_id": "fc4d0cb0-a0b0-421e-b096-b028319b8e47",
|
|
91
|
-
"is_simple_content_access":
|
|
88
|
+
"is_simple_content_access": true,
|
|
92
89
|
"distribution_version": "7.3",
|
|
93
90
|
"satellite_version": "6.8.4",
|
|
94
91
|
"organization_id": 1,
|
|
@@ -139,7 +136,7 @@ class InventoryFullSyncTest < ActiveSupport::TestCase
|
|
|
139
136
|
"facts": {
|
|
140
137
|
"virtual_host_name": "virt-who-nobody.home-1",
|
|
141
138
|
"satellite_instance_id": "fc4d0cb0-a0b0-421e-b096-b028319b8e47",
|
|
142
|
-
"is_simple_content_access":
|
|
139
|
+
"is_simple_content_access": true,
|
|
143
140
|
"distribution_version": "8.3",
|
|
144
141
|
"satellite_version": "6.8.4",
|
|
145
142
|
"organization_id": 1,
|
|
@@ -192,7 +189,7 @@ class InventoryFullSyncTest < ActiveSupport::TestCase
|
|
|
192
189
|
"facts": {
|
|
193
190
|
"satellite_instance_id": "fb3643d8-9030-487b-b95c-684783806ffd",
|
|
194
191
|
"system_purpose_sla": "",
|
|
195
|
-
"is_simple_content_access":
|
|
192
|
+
"is_simple_content_access": true,
|
|
196
193
|
"distribution_version": "8.3",
|
|
197
194
|
"satellite_version": "6.8.1",
|
|
198
195
|
"organization_id": 1,
|
|
@@ -23,7 +23,7 @@ class InventoryHostsSyncTest < ActiveSupport::TestCase
|
|
|
23
23
|
|
|
24
24
|
pool = FactoryBot.create(:katello_pool, account_number: '1234', cp_id: 1)
|
|
25
25
|
|
|
26
|
-
@host1.
|
|
26
|
+
@host1.organization.pools << pool
|
|
27
27
|
|
|
28
28
|
# this host would pass our plugin queries, so it could be uploaded to the cloud.
|
|
29
29
|
@host2 = FactoryBot.create(
|
|
@@ -34,8 +34,6 @@ class InventoryHostsSyncTest < ActiveSupport::TestCase
|
|
|
34
34
|
lifecycle_environment: env,
|
|
35
35
|
organization: env.organization
|
|
36
36
|
)
|
|
37
|
-
|
|
38
|
-
@host2.subscription_facet.pools << pool
|
|
39
37
|
@host2_inventory_id = '4536bf5c-ff03-4154-a8c9-32ff4b40e40c'
|
|
40
38
|
|
|
41
39
|
ForemanInventoryUpload::Generators::Queries.instance_variable_set(:@fact_names, nil)
|
|
@@ -71,7 +69,7 @@ class InventoryHostsSyncTest < ActiveSupport::TestCase
|
|
|
71
69
|
"facts": {
|
|
72
70
|
"virtual_host_name": "virt-who-nobody.home-1",
|
|
73
71
|
"satellite_instance_id": "fc4d0cb0-a0b0-421e-b096-b028319b8e47",
|
|
74
|
-
"is_simple_content_access":
|
|
72
|
+
"is_simple_content_access": true,
|
|
75
73
|
"distribution_version": "7.3",
|
|
76
74
|
"satellite_version": "6.8.4",
|
|
77
75
|
"organization_id": 1,
|
|
@@ -122,7 +120,7 @@ class InventoryHostsSyncTest < ActiveSupport::TestCase
|
|
|
122
120
|
"facts": {
|
|
123
121
|
"virtual_host_name": "virt-who-nobody.home-1",
|
|
124
122
|
"satellite_instance_id": "fc4d0cb0-a0b0-421e-b096-b028319b8e47",
|
|
125
|
-
"is_simple_content_access":
|
|
123
|
+
"is_simple_content_access": true,
|
|
126
124
|
"distribution_version": "7.3",
|
|
127
125
|
"satellite_version": "6.8.4",
|
|
128
126
|
"organization_id": 1,
|
|
@@ -173,7 +171,7 @@ class InventoryHostsSyncTest < ActiveSupport::TestCase
|
|
|
173
171
|
"facts": {
|
|
174
172
|
"virtual_host_name": "virt-who-nobody.home-1",
|
|
175
173
|
"satellite_instance_id": "fc4d0cb0-a0b0-421e-b096-b028319b8e47",
|
|
176
|
-
"is_simple_content_access":
|
|
174
|
+
"is_simple_content_access": true,
|
|
177
175
|
"distribution_version": "8.3",
|
|
178
176
|
"satellite_version": "6.8.4",
|
|
179
177
|
"organization_id": 1,
|
|
@@ -226,7 +224,7 @@ class InventoryHostsSyncTest < ActiveSupport::TestCase
|
|
|
226
224
|
"facts": {
|
|
227
225
|
"satellite_instance_id": "fb3643d8-9030-487b-b95c-684783806ffd",
|
|
228
226
|
"system_purpose_sla": "",
|
|
229
|
-
"is_simple_content_access":
|
|
227
|
+
"is_simple_content_access": true,
|
|
230
228
|
"distribution_version": "8.3",
|
|
231
229
|
"satellite_version": "6.8.1",
|
|
232
230
|
"organization_id": 1,
|
|
@@ -53,7 +53,7 @@ class InventorySelfHostSyncTest < ActiveSupport::TestCase
|
|
|
53
53
|
"facts": {
|
|
54
54
|
"virtual_host_name": "virt-who-nobody.home-1",
|
|
55
55
|
"satellite_instance_id": "fc4d0cb0-a0b0-421e-b096-b028319b8e47",
|
|
56
|
-
"is_simple_content_access":
|
|
56
|
+
"is_simple_content_access": true,
|
|
57
57
|
"distribution_version": "8.3",
|
|
58
58
|
"satellite_version": "6.8.4",
|
|
59
59
|
"organization_id": 1,
|
|
@@ -18,7 +18,7 @@ class ArchivedReportGeneratorTest < ActiveSupport::TestCase
|
|
|
18
18
|
organization: env.organization
|
|
19
19
|
)
|
|
20
20
|
|
|
21
|
-
@host.
|
|
21
|
+
@host.organization.pools << FactoryBot.create(:katello_pool, account_number: '1234', cp_id: 1)
|
|
22
22
|
end
|
|
23
23
|
|
|
24
24
|
def interesting_facts
|
|
@@ -51,7 +51,6 @@ class ArchivedReportGeneratorTest < ActiveSupport::TestCase
|
|
|
51
51
|
test_org = FactoryBot.create(:organization)
|
|
52
52
|
|
|
53
53
|
ForemanInventoryUpload::Generators::Queries.expects(:for_org).with(test_org.id, hosts_query: '').returns(batches)
|
|
54
|
-
ForemanInventoryUpload::Generators::Slice.any_instance.stubs(:golden_ticket?).returns(false)
|
|
55
54
|
Dir.mktmpdir do |tmpdir|
|
|
56
55
|
target = File.join(tmpdir, 'test.tar.gz')
|
|
57
56
|
generator = ForemanInventoryUpload::Generators::ArchivedReport.new(target, Logger.new(STDOUT))
|
|
@@ -12,22 +12,6 @@ class FactHelpersTest < ActiveSupport::TestCase
|
|
|
12
12
|
@org = FactoryBot.create(:organization)
|
|
13
13
|
end
|
|
14
14
|
|
|
15
|
-
test 'golden_ticket uses golden_ticket method when defined' do
|
|
16
|
-
@org.expects(:golden_ticket?).returns(true)
|
|
17
|
-
|
|
18
|
-
actual = @instance.golden_ticket?(@org)
|
|
19
|
-
|
|
20
|
-
assert actual
|
|
21
|
-
end
|
|
22
|
-
|
|
23
|
-
test 'golden_ticket uses content_access_mode method when golden_ticket not defined' do
|
|
24
|
-
@org.expects(:content_access_mode).returns('org_environment')
|
|
25
|
-
|
|
26
|
-
actual = @instance.golden_ticket?(@org)
|
|
27
|
-
|
|
28
|
-
assert actual
|
|
29
|
-
end
|
|
30
|
-
|
|
31
15
|
test 'obfuscates ips with insights-client data' do
|
|
32
16
|
host = mock('host')
|
|
33
17
|
@instance.expects(:fact_value).with(host, 'insights_client::obfuscated_ipv4').returns(
|
|
@@ -19,7 +19,7 @@ class BranchInfoTest < ActiveSupport::TestCase
|
|
|
19
19
|
organization: env.organization
|
|
20
20
|
)
|
|
21
21
|
|
|
22
|
-
@host.
|
|
22
|
+
@host.organization.pools << FactoryBot.create(:katello_pool, account_number: '5678', cp_id: 1)
|
|
23
23
|
end
|
|
24
24
|
|
|
25
25
|
test 'should generate branch info for host' do
|
|
@@ -29,7 +29,7 @@ class CloudRequestForwarderTest < ActiveSupport::TestCase
|
|
|
29
29
|
organization: env.organization
|
|
30
30
|
)
|
|
31
31
|
|
|
32
|
-
@host.
|
|
32
|
+
@host.organization.pools << FactoryBot.create(:katello_pool, account_number: '5678', cp_id: 1)
|
|
33
33
|
end
|
|
34
34
|
|
|
35
35
|
test 'should prepare correct cloud url' do
|
|
@@ -641,6 +641,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
|
|
|
641
641
|
assert_tag('1', actual_host, 'int_param', 'satellite_parameter')
|
|
642
642
|
|
|
643
643
|
assert_equal false, satellite_facts['is_hostname_obfuscated']
|
|
644
|
+
assert_equal true, satellite_facts['is_simple_content_access']
|
|
644
645
|
|
|
645
646
|
version = satellite_facts['satellite_version']
|
|
646
647
|
if defined?(ForemanThemeSatellite)
|
|
@@ -702,22 +703,6 @@ class SliceGeneratorTest < ActiveSupport::TestCase
|
|
|
702
703
|
assert_equal 'test_sla', fact_values['system_purpose_sla']
|
|
703
704
|
end
|
|
704
705
|
|
|
705
|
-
test 'generates a report for a golden ticket' do
|
|
706
|
-
batch = Host.where(id: @host.id).in_batches.first
|
|
707
|
-
generator = create_generator(batch) do |generator|
|
|
708
|
-
generator.stubs(:golden_ticket?).returns(true)
|
|
709
|
-
end
|
|
710
|
-
|
|
711
|
-
json_str = generator.render
|
|
712
|
-
actual = JSON.parse(json_str.join("\n"))
|
|
713
|
-
|
|
714
|
-
assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
|
|
715
|
-
assert_not_nil(actual_host = actual['hosts'].first)
|
|
716
|
-
assert_equal @host.fqdn, actual_host['fqdn']
|
|
717
|
-
assert_equal '1234', actual_host['account']
|
|
718
|
-
assert_equal 1, generator.hosts_count
|
|
719
|
-
end
|
|
720
|
-
|
|
721
706
|
test 'skips hosts without subscription' do
|
|
722
707
|
a_host = FactoryBot.create(
|
|
723
708
|
:host,
|
|
@@ -1131,11 +1116,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
|
|
|
1131
1116
|
|
|
1132
1117
|
def create_generator(batch, name = '00000000-0000-0000-0000-000000000000')
|
|
1133
1118
|
generator = ForemanInventoryUpload::Generators::Slice.new(batch, [], name)
|
|
1134
|
-
if block_given?
|
|
1135
|
-
yield(generator)
|
|
1136
|
-
else
|
|
1137
|
-
generator.stubs(:golden_ticket?).returns(false)
|
|
1138
|
-
end
|
|
1119
|
+
yield(generator) if block_given?
|
|
1139
1120
|
generator
|
|
1140
1121
|
end
|
|
1141
1122
|
|