This is an automated email from the ASF dual-hosted git repository.
gongchao pushed a change to branch fix-exist-error
in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
from 62186cc254 [bugfix] fix the calculator expr exist not work
add f05e91247a [refactor] refactor auto discovery http sd (#3300)
add cb7e3916ba Merge branch 'master' into fix-exist-error
No new revisions were added by this update.
Summary of changes:
.../collector/collect/sd/HttpSdCollectImpl.java | 2 +-
.../collector/dispatch/CommonDispatcher.java | 3 +-
.../collector/dispatch/DispatchConstants.java | 2 +-
.../common/constants/CommonConstants.java | 111 +----
.../hertzbeat/common/entity/job/Metrics.java | 7 +-
.../entity/job/protocol/CommonRequestProtocol.java | 3 +-
.../common/entity/job/protocol/HttpSdProtocol.java | 11 +-
.../hertzbeat/common/entity/manager/Monitor.java | 4 +
.../common/entity/manager/MonitorBind.java | 15 +-
.../common/entity/manager/SdMonitorParam.java | 37 --
.../common/entity/sd/ServiceDiscoveryProtocol.java | 67 ---
.../common/support/valid/HostParamValidator.java | 8 +-
.../hertzbeat/common/util/SdMonitorOperator.java | 151 -------
.../support/vaild/HostParamValidatorTest.java | 6 +-
.../component/sd/ServiceDiscoveryWorker.java | 118 +++---
.../manager/controller/MonitorsController.java | 12 -
.../hertzbeat/manager/dao/MonitorBindDao.java | 16 +-
.../hertzbeat/manager/pojo/dto/MonitorDto.java | 4 +-
.../hertzbeat/manager/scheduler/SchedulerInit.java | 25 +-
.../hertzbeat/manager/service/MonitorService.java | 17 +-
.../manager/service/impl/AppServiceImpl.java | 4 -
.../manager/service/impl/MonitorServiceImpl.java | 455 ++++++---------------
.../define/{app-push.yml => app-http_sd.yml} | 74 ++--
.../src/main/resources/define/app-push.yml | 2 +-
.../manager/controller/MonitorsControllerTest.java | 11 -
.../manager/service/MonitorServiceTest.java | 2 +-
web-app/src/app/pojo/Monitor.ts | 1 +
.../monitor-detail/monitor-detail.component.ts | 3 +
.../monitor-edit/monitor-edit.component.html | 3 +
.../monitor/monitor-edit/monitor-edit.component.ts | 129 +++++-
.../monitor-form/monitor-form.component.html | 41 ++
.../monitor/monitor-form/monitor-form.component.ts | 39 +-
.../monitor-list/monitor-list.component.html | 5 +
.../monitor/monitor-list/monitor-list.component.ts | 62 ++-
.../monitor/monitor-new/monitor-new.component.html | 3 +
.../monitor/monitor-new/monitor-new.component.ts | 118 +++++-
.../app/routes/setting/define/define.component.ts | 3 +
web-app/src/assets/i18n/en-US.json | 8 +-
web-app/src/assets/i18n/ja-JP.json | 2 +
web-app/src/assets/i18n/pt-BR.json | 2 +
web-app/src/assets/i18n/zh-CN.json | 2 +
web-app/src/assets/i18n/zh-TW.json | 2 +
42 files changed, 640 insertions(+), 950 deletions(-)
copy
hertzbeat-grafana/src/main/java/org/apache/hertzbeat/grafana/dto/GrafanaConfig.java
=>
hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/HttpSdProtocol.java
(86%)
delete mode 100644
hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/SdMonitorParam.java
delete mode 100644
hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/sd/ServiceDiscoveryProtocol.java
delete mode 100644
hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/SdMonitorOperator.java
copy hertzbeat-manager/src/main/resources/define/{app-push.yml =>
app-http_sd.yml} (59%)
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscr...@hertzbeat.apache.org
For additional commands, e-mail: notifications-h...@hertzbeat.apache.org
