This is an automated email from the ASF dual-hosted git repository.
gongchao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
The following commit(s) were added to refs/heads/master by this push:
new 93477a5ce [bugfix] replace monitors to alert. (#1954)
93477a5ce is described below
commit 93477a5ce8813f21f3cc068e3926d654a27395d8
Author: Logic <[email protected]>
AuthorDate: Fri May 10 08:26:08 2024 +0800
[bugfix] replace monitors to alert. (#1954)
Co-authored-by: tomsun28 <[email protected]>
---
.../app/routes/alert/alert-setting/alert-setting.component.html | 8 ++++----
web-app/src/assets/i18n/en-US.json | 2 ++
web-app/src/assets/i18n/zh-CN.json | 2 ++
web-app/src/assets/i18n/zh-TW.json | 2 ++
4 files changed, 10 insertions(+), 4 deletions(-)
diff --git
a/web-app/src/app/routes/alert/alert-setting/alert-setting.component.html
b/web-app/src/app/routes/alert/alert-setting/alert-setting.component.html
index 6fbee1287..83362d7dd 100644
--- a/web-app/src/app/routes/alert/alert-setting/alert-setting.component.html
+++ b/web-app/src/app/routes/alert/alert-setting/alert-setting.component.html
@@ -643,7 +643,7 @@
<!-- 导出告警定义弹出框 -->
<nz-modal
[(nzVisible)]="isSwitchExportTypeModalVisible"
- [nzTitle]="'monitors.export.switch-type' | i18n"
+ [nzTitle]="'alert.export.switch-type' | i18n"
nzOkDisabled="true"
[nzFooter]="switchExportTypeModalFooter"
>
@@ -651,19 +651,19 @@
<p style="text-align: center">
<button nz-button nzType="primary" nzSize="large"
(click)="exportDefines('YAML')" [nzLoading]="exportYamlButtonLoading">
<span nz-icon nzType="download"></span>
- {{ 'monitors.export.use-type' | i18n : { type: 'YAML' } }}
+ {{ 'alert.export.use-type' | i18n : { type: 'YAML' } }}
</button>
</p>
<p style="text-align: center">
<button nz-button nzType="primary" nzSize="large"
(click)="exportDefines('JSON')" [nzLoading]="exportJsonButtonLoading">
<span nz-icon nzType="download"></span>
- {{ 'monitors.export.use-type' | i18n : { type: 'JSON' } }}
+ {{ 'alert.export.use-type' | i18n : { type: 'JSON' } }}
</button>
</p>
<p style="text-align: center">
<button nz-button nzType="primary" nzSize="large"
(click)="exportDefines('EXCEL')" [nzLoading]="exportExcelButtonLoading">
<span nz-icon nzType="download"></span>
- {{ 'monitors.export.use-type' | i18n : { type: 'EXCEL' } }}
+ {{ 'alert.export.use-type' | i18n : { type: 'EXCEL' } }}
</button>
</p>
</ng-container>
diff --git a/web-app/src/assets/i18n/en-US.json
b/web-app/src/assets/i18n/en-US.json
index 4a33c8e82..89ba3dddb 100644
--- a/web-app/src/assets/i18n/en-US.json
+++ b/web-app/src/assets/i18n/en-US.json
@@ -321,6 +321,8 @@
"alert.notice.sender.mail.port": "Email Port",
"alert.notice.sender.mail.ssl": "Enable SSL",
"alert.notice.sender.mail.enable": "Enable Email Configuration",
+ "alert.export.switch-type": "Please select the export file format!",
+ "alert.export.use-type": "Export rules in {{type}} file format",
"dashboard.alerts.title": "Recently Alarms List",
"dashboard.alerts.title-no": "Recently Pending Alarms",
"dashboard.alerts.no": "No Pending Alarms",
diff --git a/web-app/src/assets/i18n/zh-CN.json
b/web-app/src/assets/i18n/zh-CN.json
index f6d0e05d1..4bde18789 100644
--- a/web-app/src/assets/i18n/zh-CN.json
+++ b/web-app/src/assets/i18n/zh-CN.json
@@ -322,6 +322,8 @@
"alert.notice.sender.mail.port": "邮箱端口",
"alert.notice.sender.mail.ssl": "是否启用SSL",
"alert.notice.sender.mail.enable": "是否启用邮箱配置",
+ "alert.export.switch-type": "请选择导出文件格式!",
+ "alert.export.use-type": "以 {{type}} 文件格式导出阈值规则",
"dashboard.alerts.title": "最近告警列表",
"dashboard.alerts.title-no": "最近未处理告警",
"dashboard.alerts.no": "暂无未处理告警",
diff --git a/web-app/src/assets/i18n/zh-TW.json
b/web-app/src/assets/i18n/zh-TW.json
index 7f9d19108..f10348a05 100644
--- a/web-app/src/assets/i18n/zh-TW.json
+++ b/web-app/src/assets/i18n/zh-TW.json
@@ -321,6 +321,8 @@
"alert.notice.sender.mail.port": "郵件端口",
"alert.notice.sender.mail.ssl": "是否啟用SSL",
"alert.notice.sender.mail.enable": "啟用郵件設定",
+ "alert.export.switch-type": "請選擇導出文件格式!",
+ "alert.export.use-type": "以 {{type}} 文件格式導出阈值規則",
"dashboard.alerts.title": "最近告警列表",
"dashboard.alerts.title-no": "最近未處理告警",
"dashboard.alerts.no": "暫無未處理告警",
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
