This is an automated email from the ASF dual-hosted git repository. gongchao pushed a commit to branch bugfix-alarm-query in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
commit 800a2e9b3b5a8b3eeb4aa9e8394d40c590c61631 Author: tomsun28 <[email protected]> AuthorDate: Thu Jul 25 20:52:57 2024 +0800 [bugfix] fix monitors alarms some query filter not work, update link Signed-off-by: tomsun28 <[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 +- .../app/routes/alert/alert-center/alert-center.component.html | 6 +++--- .../routes/monitor/monitor-list/monitor-list.component.html | 2 +- 16 files changed, 20 insertions(+), 26 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 329e50a17..eddf01431 100644 --- a/manager/src/main/resources/application.yml +++ b/manager/src/main/resources/application.yml @@ -179,7 +179,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 @@ -210,4 +210,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/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> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
