Skip to content

Commit

Permalink
[manager] remove useless judgment (#582)
Browse files Browse the repository at this point in the history
* [web-app] fix history echarts chart tooltip only show one instance (#365)

* [workflow] upgrade issues-translator version 2.7 (#367)

* [manger] add mockito unit test

* [manger] add globalExceptionHandler mockito unit test (#368)

* [manager] impl appController unit test case (#370)

* 英文注释的补充

* Supplement of English notes

* Supplementary English notes

* Supplement of English notes

* AppControllerTest Implementation of unit tests

Co-authored-by: gaoxingcun <gxc01514416@alibaba-inc.com>

* [warehouse] support Iotdb metrics data storage (#372)

* add iotdb storage (saveData part)

* implement getHistoryMetricData

* save multiple instances at the same time
implement getHistoryIntervalMetricData

* [warehouse] reformat code

* [warehouse] refactor code

* [warehouse] refactor code

* [warehouse] refactor code

* [warehouse] fix insert node path container " '  parsed error

* [warehouse] fix insert node path container " ' *  parsed error

* [warehouse] support iotdb rpc-port

* support iotdb version 0.12
fix save data and select bug

* replace Session with SessionPool

* rule fix, 修复魔法值问题

Co-authored-by: tomsun28 <tomsun28@outlook.com>
Co-authored-by: hujiaofen <hujiaofen@2dfire.com>

* [webapp,warehouse] support historical interval aggregate data chart (#373)

* [manger] add mockito unit test

* [manger] impl unit test ParamDaoTest #360

* [manager] fix NoticeRuleDaoTest

* [manger] impl unit test ParamDefineDaoTest #361

* [manger] impl unit test TagDaoTest #362

* [manger] add manger sql dao mockito unit test (#375)

* [manger] add mockito unit test

* [manger] add mockito unit test

* [manger] impl unit test ParamDaoTest #360

* [manager] fix NoticeRuleDaoTest

* [manger] impl unit test ParamDefineDaoTest #361

* [manger] impl unit test TagDaoTest #362

* [manager] I18nControllerTest and MonitorControllerTest Unit tests are written (#376)

* I18ControllerTest Completion of the test class

* MonitorControllerTest Unit tests are written

* [manger] impl unit test AppServiceTest #355

* [hertzbeat] update use PromQL to collect metrics from promethues server (#456)

* [manager] enhancement manager-monitors-page added gmtUpdate desc (#455)

* [manager-monitors](增强)应用服务检测-网站检测-分页:添加默认name升序 (enhancement)manager-monitors-page added name asc

* [manager-monitors](增强)应用服务检测-网站检测-分页:添加默认gmtUpdate降序 (enhancement)manager-monitors-page added gmtUpdate desc

* [webapp] support monitors list sort by name, date (#458)

* [manager] bugfix the gmtUpdate time not change when update monitor params (#459)

* [alerter,collector,common,warehouse] refactor auto import component

* [manager] Notification type supports telegram

* [web-app] Notification type supports telegram

* fix PMD Failure LowerCamelCaseVariableNamingRule

* fix PMD check

* fix ESLint Error

* [manager] remove useless judgment

Co-authored-by: tomsun28 <tomsun28@outlook.com>
Co-authored-by: 铁甲小宝 <85919258+TJxiaobao@users.noreply.github.com>
Co-authored-by: gaoxingcun <gxc01514416@alibaba-inc.com>
Co-authored-by: zcx <48920254+Ceilzcx@users.noreply.github.com>
Co-authored-by: hujiaofen <hujiaofen@2dfire.com>
Co-authored-by: luxx <58515565+luxx-lq@users.noreply.github.com>
  • Loading branch information
7 people committed Jan 16, 2023
1 parent a6b9f10 commit 66e2fad
Showing 1 changed file with 2 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,8 @@ private String buildMessage(Alert alert) {
content.append(bundle.getString("alerter.notify.monitorName")).append(" : ")
.append(monitorName).append("\n");
}
if (alert.getPriority() < CommonConstants.ALERT_PRIORITY_CODE_WARNING) {
content.append(bundle.getString("alerter.notify.priority")).append(" : ")
.append(bundle.getString("alerter.priority." + alert.getPriority())).append("\n");
} else {
content.append(bundle.getString("alerter.notify.priority")).append(" : ")
.append(bundle.getString("alerter.priority." + alert.getPriority())).append("\n");
}
content.append(bundle.getString("alerter.notify.priority")).append(" : ")
.append(bundle.getString("alerter.priority." + alert.getPriority())).append("\n");
String triggerTime = DTF.format(Instant.ofEpochMilli(alert.getLastTriggerTime()).atZone(ZoneId.systemDefault()).toLocalDateTime());
content.append(bundle.getString("alerter.notify.triggerTime")).append(" : ")
.append(triggerTime).append("\n");
Expand Down

0 comments on commit 66e2fad

Please sign in to comment.