This is an automated email from the ASF dual-hosted git repository.
zhengqiwei 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 9e305f7a5 [bugfix] fix monitors alarms some query filter not work,
update link (#2382)
9e305f7a5 is described below
commit 9e305f7a59a43eef7afc2f7a76db2c2f42ca52ee
Author: tomsun28 <[email protected]>
AuthorDate: Fri Jul 26 00:03:47 2024 +0800
[bugfix] fix monitors alarms some query filter not work, update link (#2382)
Signed-off-by: tomsun28 <[email protected]>
Co-authored-by: Calvin <[email protected]>
---
.../java/org/apache/hertzbeat/alert/AlerterProperties.java | 2 +-
.../current/start/custom-config.md | 2 +-
.../version-v1.4.x/start/custom-config.md | 2 +-
.../version-v1.5.x/start/custom-config.md | 2 +-
home/versioned_docs/version-v1.4.x/start/custom-config.md | 2 +-
home/versioned_docs/version-v1.5.x/start/custom-config.md | 2 +-
manager/src/main/resources/application.yml | 4 ++--
manager/src/main/resources/templates/1-EmailTemplate.html | 10 ++--------
script/application.yml | 2 +-
.../docker-compose/hertzbeat-mysql-iotdb/conf/application.yml | 2 +-
.../hertzbeat-mysql-tdengine/conf/application.yml | 2 +-
.../hertzbeat-mysql-victoria-metrics/conf/application.yml | 2 +-
.../hertzbeat-postgresql-victoria-metrics/conf/application.yml | 2 +-
script/helm/hertzbeat/templates/manager/configmap.yaml | 2 +-
web-app/src/app/layout/passport/passport.component.ts | 6 ------
.../app/routes/alert/alert-center/alert-center.component.html | 6 +++---
.../routes/monitor/monitor-list/monitor-list.component.html | 2 +-
web-app/src/app/routes/passport/login/login.component.html | 10 ----------
web-app/src/assets/i18n/en-US.json | 2 +-
web-app/src/assets/i18n/zh-CN.json | 3 +--
web-app/src/assets/i18n/zh-TW.json | 3 +--
21 files changed, 23 insertions(+), 47 deletions(-)
diff --git
a/alerter/src/main/java/org/apache/hertzbeat/alert/AlerterProperties.java
b/alerter/src/main/java/org/apache/hertzbeat/alert/AlerterProperties.java
index 486dbaef3..3e7607649 100644
--- a/alerter/src/main/java/org/apache/hertzbeat/alert/AlerterProperties.java
+++ b/alerter/src/main/java/org/apache/hertzbeat/alert/AlerterProperties.java
@@ -34,7 +34,7 @@ public class AlerterProperties {
/**
* Alarm content console link
*/
- private String consoleUrl = "https://console.tancloud.cn";;
+ private String consoleUrl = "https://console.tancloud.io";;
/**
* WeWork webhook url
diff --git
a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/custom-config.md
b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/custom-config.md
index 27ebbf495..7dde7ec14 100644
---
a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/custom-config.md
+++
b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/custom-config.md
@@ -50,7 +50,7 @@ common:
```yaml
alerter:
# 自定义控制台地址
- console-url: https://console.tancloud.cn
+ console-url: https://console.tancloud.io
```
3. 使用外置redis代替内存存储实时指标数据
diff --git
a/home/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.4.x/start/custom-config.md
b/home/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.4.x/start/custom-config.md
index 27ebbf495..7dde7ec14 100644
---
a/home/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.4.x/start/custom-config.md
+++
b/home/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.4.x/start/custom-config.md
@@ -50,7 +50,7 @@ common:
```yaml
alerter:
# 自定义控制台地址
- console-url: https://console.tancloud.cn
+ console-url: https://console.tancloud.io
```
3. 使用外置redis代替内存存储实时指标数据
diff --git
a/home/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.5.x/start/custom-config.md
b/home/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.5.x/start/custom-config.md
index 27ebbf495..7dde7ec14 100644
---
a/home/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.5.x/start/custom-config.md
+++
b/home/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.5.x/start/custom-config.md
@@ -50,7 +50,7 @@ common:
```yaml
alerter:
# 自定义控制台地址
- console-url: https://console.tancloud.cn
+ console-url: https://console.tancloud.io
```
3. 使用外置redis代替内存存储实时指标数据
diff --git a/home/versioned_docs/version-v1.4.x/start/custom-config.md
b/home/versioned_docs/version-v1.4.x/start/custom-config.md
index 91282bf50..5a60d6b02 100644
--- a/home/versioned_docs/version-v1.4.x/start/custom-config.md
+++ b/home/versioned_docs/version-v1.4.x/start/custom-config.md
@@ -36,7 +36,7 @@ common:
```yaml
alerter:
# Custom console address
- console-url: https://console.tancloud.cn
+ console-url: https://console.tancloud.io
```
3. Use external redis instead of memory to store real-time metric data
diff --git a/home/versioned_docs/version-v1.5.x/start/custom-config.md
b/home/versioned_docs/version-v1.5.x/start/custom-config.md
index 91282bf50..5a60d6b02 100644
--- a/home/versioned_docs/version-v1.5.x/start/custom-config.md
+++ b/home/versioned_docs/version-v1.5.x/start/custom-config.md
@@ -36,7 +36,7 @@ common:
```yaml
alerter:
# Custom console address
- console-url: https://console.tancloud.cn
+ console-url: https://console.tancloud.io
```
3. Use external redis instead of memory to store real-time metric data
diff --git a/manager/src/main/resources/application.yml
b/manager/src/main/resources/application.yml
index 62eacf362..619e52b1c 100644
--- a/manager/src/main/resources/application.yml
+++ b/manager/src/main/resources/application.yml
@@ -181,7 +181,7 @@ warehouse:
alerter:
# custom console url
- console-url: https://console.tancloud.cn
+ console-url: https://console.tancloud.io
# we work
we-work-webhook-url: https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=
# ding ding talk
@@ -212,4 +212,4 @@ ai:
# api key
api-key:
#At present, only IFLYTEK large model needs to be filled in
- api-secret:
\ No newline at end of file
+ api-secret:
diff --git a/manager/src/main/resources/templates/1-EmailTemplate.html
b/manager/src/main/resources/templates/1-EmailTemplate.html
index b793521a6..573aa6351 100644
--- a/manager/src/main/resources/templates/1-EmailTemplate.html
+++ b/manager/src/main/resources/templates/1-EmailTemplate.html
@@ -848,13 +848,7 @@
valign="middle"
class="bmeFollowItemText"
style="padding-right:10px;font-family: Arial, Helvetica,
sans-serif; font-size: 14px; font-weight: normal; text-align: left;">
-
<a
href="https://clt1416649.bmetrack.com/c/l?u=D77E008&e=13E20B0&c=159DC9&t=1&l=77D3334A&email=JYL7PF5c87g0WhC3NaLnunzBjzlZ2TJR&seq=2";
-
target="_blank"
-
style="text-decoration:none;">
-
<div style="font-family:Arial, Verdana;
font-size:14px; font-weight:400; font-style:normal; text-decoration:none solid
rgb(150,63,250);color:rgb(150,63,250);">
-
tancloud.cn
-
</div>
-
</a></td>
+
</td>
</tr>
</tbody>
</table>
@@ -874,7 +868,7 @@
valign="middle"
class="bmeFollowItemText"
style="font-family: Arial, Helvetica, sans-serif;
font-size: 14px; font-weight: normal; text-align: left;">
-
<a
href="https://clt1416649.bmetrack.com/c/l?u=D77E009&e=13E20B0&c=159DC9&t=1&l=77D3334A&email=JYL7PF5c87g0WhC3NaLnunzBjzlZ2TJR&seq=2";
+
<a href="https://hertzbeat.apache.org/";
target="_blank"
style="text-decoration:none;">
<div style="font-family:Arial, Verdana;
font-size:14px; font-weight:400; font-style:normal; text-decoration:none solid
rgb(150,63,250);color:rgb(150,63,250);">
diff --git a/script/application.yml b/script/application.yml
index d5118623c..a96a85293 100644
--- a/script/application.yml
+++ b/script/application.yml
@@ -174,7 +174,7 @@ warehouse:
alerter:
# custom console url
- console-url: https://console.tancloud.cn
+ console-url: https://console.tancloud.io
# we work
we-work-webhook-url: https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=
# ding ding talk
diff --git a/script/docker-compose/hertzbeat-mysql-iotdb/conf/application.yml
b/script/docker-compose/hertzbeat-mysql-iotdb/conf/application.yml
index 436f2d99b..e849ffd50 100644
--- a/script/docker-compose/hertzbeat-mysql-iotdb/conf/application.yml
+++ b/script/docker-compose/hertzbeat-mysql-iotdb/conf/application.yml
@@ -144,7 +144,7 @@ common:
alerter:
# custom console url
- console-url: https://console.tancloud.cn
+ console-url: https://console.tancloud.io
# we work
we-work-webhook-url: https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=
# ding ding talk
diff --git
a/script/docker-compose/hertzbeat-mysql-tdengine/conf/application.yml
b/script/docker-compose/hertzbeat-mysql-tdengine/conf/application.yml
index c3eaece64..f44da6164 100644
--- a/script/docker-compose/hertzbeat-mysql-tdengine/conf/application.yml
+++ b/script/docker-compose/hertzbeat-mysql-tdengine/conf/application.yml
@@ -138,7 +138,7 @@ common:
alerter:
# custom console url
- console-url: https://console.tancloud.cn
+ console-url: https://console.tancloud.io
# we work
we-work-webhook-url: https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=
# ding ding talk
diff --git
a/script/docker-compose/hertzbeat-mysql-victoria-metrics/conf/application.yml
b/script/docker-compose/hertzbeat-mysql-victoria-metrics/conf/application.yml
index c48a28dae..b506c55ad 100644
---
a/script/docker-compose/hertzbeat-mysql-victoria-metrics/conf/application.yml
+++
b/script/docker-compose/hertzbeat-mysql-victoria-metrics/conf/application.yml
@@ -139,7 +139,7 @@ common:
alerter:
# custom console url
- console-url: https://console.tancloud.cn
+ console-url: https://console.tancloud.io
# we work
we-work-webhook-url: https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=
# ding ding talk
diff --git
a/script/docker-compose/hertzbeat-postgresql-victoria-metrics/conf/application.yml
b/script/docker-compose/hertzbeat-postgresql-victoria-metrics/conf/application.yml
index 4a084aa5c..c4aeefdce 100644
---
a/script/docker-compose/hertzbeat-postgresql-victoria-metrics/conf/application.yml
+++
b/script/docker-compose/hertzbeat-postgresql-victoria-metrics/conf/application.yml
@@ -138,7 +138,7 @@ common:
alerter:
# custom console url
- console-url: https://console.tancloud.cn
+ console-url: https://console.tancloud.io
# we work
we-work-webhook-url: https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=
# ding ding talk
diff --git a/script/helm/hertzbeat/templates/manager/configmap.yaml
b/script/helm/hertzbeat/templates/manager/configmap.yaml
index b7f1fa7be..f96c2f7d5 100644
--- a/script/helm/hertzbeat/templates/manager/configmap.yaml
+++ b/script/helm/hertzbeat/templates/manager/configmap.yaml
@@ -176,7 +176,7 @@ data:
alerter:
# custom console url
- console-url: https://console.tancloud.cn
+ console-url: https://console.tancloud.io
# we work
we-work-webhook-url:
https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=
# ding ding talk
diff --git a/web-app/src/app/layout/passport/passport.component.ts
b/web-app/src/app/layout/passport/passport.component.ts
index 86638d337..4a0c6428f 100644
--- a/web-app/src/app/layout/passport/passport.component.ts
+++ b/web-app/src/app/layout/passport/passport.component.ts
@@ -12,12 +12,6 @@ import { CONSTANTS } from '../../shared/constants';
})
export class LayoutPassportComponent implements OnInit {
version = CONSTANTS.VERSION;
- links = [
- {
- title: this.i18nSvc.fanyi('app.passport.welcome'),
- href: 'https://console.tancloud.cn'
- }
- ];
currentYear = new Date().getFullYear();
diff --git
a/web-app/src/app/routes/alert/alert-center/alert-center.component.html
b/web-app/src/app/routes/alert/alert-center/alert-center.component.html
index 84203ac8b..16b4381e6 100644
--- a/web-app/src/app/routes/alert/alert-center/alert-center.component.html
+++ b/web-app/src/app/routes/alert/alert-center/alert-center.component.html
@@ -54,8 +54,8 @@
class="mobile-hide"
nzAllowClear
[nzPlaceHolder]="'alert.center.filter-priority' | i18n"
- (ngModelChange)="loadAlertsTable()"
[(ngModel)]="filterPriority"
+ (ngModelChange)="loadAlertsTable()"
>
<nz-option [nzLabel]="'alert.priority.all' | i18n"
[nzValue]="9"></nz-option>
<nz-option [nzLabel]="'alert.priority.2' | i18n"
[nzValue]="2"></nz-option>
@@ -66,8 +66,8 @@
class="mobile-hide"
nzAllowClear
[nzPlaceHolder]="'alert.center.filter-status' | i18n"
- (ngModelChange)="loadAlertsTable()"
[(ngModel)]="filterStatus"
+ (ngModelChange)="loadAlertsTable()"
>
<nz-option [nzLabel]="'alert.status.all' | i18n"
[nzValue]="9"></nz-option>
<nz-option [nzLabel]="'alert.status.0' | i18n" [nzValue]="0"></nz-option>
@@ -79,7 +79,7 @@
class="mobile-hide"
[placeholder]="'alert.center.search' | i18n"
[(value)]="filterContent"
- (valueChange)="loadAlertsTable()"
+ (keydown.enter)="loadAlertsTable()"
/>
</ng-template>
</app-toolbar>
diff --git
a/web-app/src/app/routes/monitor/monitor-list/monitor-list.component.html
b/web-app/src/app/routes/monitor/monitor-list/monitor-list.component.html
index cff3aff01..35cba1480 100644
--- a/web-app/src/app/routes/monitor/monitor-list/monitor-list.component.html
+++ b/web-app/src/app/routes/monitor/monitor-list/monitor-list.component.html
@@ -93,8 +93,8 @@
class="mobile-hide"
nzAllowClear
[nzPlaceHolder]="'monitor.status' | i18n"
- (ngModelChange)="onFilterSearchMonitors()"
[(ngModel)]="filterStatus"
+ (ngModelChange)="onFilterSearchMonitors()"
>
<nz-option [nzLabel]="'monitor.status.all' | i18n"
[nzValue]="9"></nz-option>
<nz-option [nzLabel]="'monitor.status.up' | i18n"
[nzValue]="1"></nz-option>
diff --git a/web-app/src/app/routes/passport/login/login.component.html
b/web-app/src/app/routes/passport/login/login.component.html
index e3f963097..9717ed170 100644
--- a/web-app/src/app/routes/passport/login/login.component.html
+++ b/web-app/src/app/routes/passport/login/login.component.html
@@ -74,16 +74,6 @@
</button>
</nz-form-item>
</nz-tab>
- <!-- <nz-tab [nzTitle]="'app.login.explore.cloud' | i18n">-->
- <!-- <div style="margin-top: 20%; margin-bottom: 20%; text-align:
center">-->
- <!-- <a href="https://console.tancloud.cn/"; target="_blank">-->
- <!-- <div class="hoverClass br-4" style="background-color:
#3f51b5; padding: 6px; color: white">-->
- <!-- {{ 'app.login.explore.cloud.detail' | i18n }}-->
- <!-- <span nz-icon nzType="global"
nzTheme="outline"></span>-->
- <!-- </div>-->
- <!-- </a>-->
- <!-- </div>-->
- <!-- </nz-tab>-->
</nz-tabset>
</form>
</div>
diff --git a/web-app/src/assets/i18n/en-US.json
b/web-app/src/assets/i18n/en-US.json
index 6d381df04..4e8ff7630 100644
--- a/web-app/src/assets/i18n/en-US.json
+++ b/web-app/src/assets/i18n/en-US.json
@@ -613,7 +613,7 @@
"collector.deploy.docker.help.3": "# -e MANAGER_HOST=127.0.0.1 : Set the
main HertzBeat service address for connection",
"collector.deploy.docker.help.4": "# -e MODE=public : Set the running
mode(public or private), public cluster or private cloud-edge.",
"collector.deploy.docker.help.5": "# --name hertzbeat-collector: Name the
container name hertzbeat-collector",
- "collector.deploy.docker.help.6": "# apache/hertzbeat-collector: Use the
HertzBeat official application image source, or use
quay.io/tancloud/hertzbeat-collector to replace it",
+ "collector.deploy.docker.help.6": "# apache/hertzbeat-collector: Official
application image source, or use quay.io/tancloud/hertzbeat-collector when
timeout",
"collector.deploy.package": "Deploy via Package",
"collector.deploy.package.github": "Download From Github",
"collector.deploy.package.gitee": "Download From Gitee",
diff --git a/web-app/src/assets/i18n/zh-CN.json
b/web-app/src/assets/i18n/zh-CN.json
index 2d57ca805..c6b650814 100644
--- a/web-app/src/assets/i18n/zh-CN.json
+++ b/web-app/src/assets/i18n/zh-CN.json
@@ -502,7 +502,6 @@
"app.lock": "解除锁定",
"app.lock.placeholder": "输入任意解锁",
"app.passport.desc": "易用友好的开源实时监控系统",
- "app.passport.welcome": "点击探索 TanCloud 监控云服务",
"app.passport.intro-1": "开源、高性能、分布式的",
"app.passport.intro-2": "实时监控",
"app.login.message-need-identifier": "请输入用户名",
@@ -614,7 +613,7 @@
"collector.deploy.docker.help.3": "# -e MANAGER_HOST=127.0.0.1 :
设置连接的主HertzBeat服务地址",
"collector.deploy.docker.help.4": "# -e MODE=public : 配置运行模式(public or
private), 公共集群模式或私有云边模式",
"collector.deploy.docker.help.5": "# --name hertzbeat-collector : 命名容器名称
hertzbeat-collector",
- "collector.deploy.docker.help.6": "# apache/hertzbeat-collector :
使用HertzBeat官方应用镜像源,也可若使用quay.io/tancloud/hertzbeat-collector替换",
+ "collector.deploy.docker.help.6": "# apache/hertzbeat-collector :
官方应用镜像源,超时可替换为 quay.io/tancloud/hertzbeat-collector",
"collector.deploy.package": "通过 安装包 方式部署",
"collector.deploy.package.github": "下载安装包-Github",
"collector.deploy.package.gitee": "下载安装包-Gitee",
diff --git a/web-app/src/assets/i18n/zh-TW.json
b/web-app/src/assets/i18n/zh-TW.json
index 186c1696e..e0fdabfef 100644
--- a/web-app/src/assets/i18n/zh-TW.json
+++ b/web-app/src/assets/i18n/zh-TW.json
@@ -501,7 +501,6 @@
"app.lock": "解除鎖定",
"app.lock.placeholder": "輸入任意解鎖",
"app.passport.desc": "易用友好的開源實時監控系統",
- "app.passport.welcome": "點選探索 TanCloud 監控雲端服務",
"app.passport.intro-1": "開源、高效能、分散式的",
"app.passport.intro-2": "即時監控",
"app.login.message-need-identifier": "請輸入用戶名",
@@ -611,7 +610,7 @@
"collector.deploy.docker.help.3": "# -e MANAGER_HOST=127.0.0.1 :
設置連接的主HertzBeat服務地址",
"collector.deploy.docker.help.4": "# -e MODE=public : 設定運作模式(public or
private), 公有叢集模式或私有雲邊模式",
"collector.deploy.docker.help.5": "# --name hertzbeat-collector : 命名容器名稱
hertzbeat-collector",
- "collector.deploy.docker.help.6": "# apache/hertzbeat-collector :
使用HertzBeat官方應用鏡像源,也可若使用quay.io/tancloud/hertzbeat-collector替換",
+ "collector.deploy.docker.help.6": "# apache/hertzbeat-collector :
官方應用鏡像源,超时可替换为 quay.io/tancloud/hertzbeat-collector",
"collector.deploy.package": "通過 安裝包 方式部署",
"collector.deploy.package.github": "下載安裝包-Github",
"collector.deploy.package.gitee": "下載安裝包-Gitee",
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
