This is an automated email from the ASF dual-hosted git repository.
duansg pushed a change to branch yuluo-yx-patch-1
in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
from 038d1ee1db Add .editorconfig for consistent coding style
add 625dbe9624 [bugfix] redis cluster monitor master-slave relationship is
inconsistent (#3874)
add e3e7377d86 [refactor] Refactor Monitor host field to instance and
update related logic (#3863)
add 7fa14a1655 Merge branch 'master' into yuluo-yx-patch-1
No new revisions were added by this update.
Summary of changes:
e2e/data/monitor-ftp.json | 2 +-
e2e/data/monitor-http.json | 2 +-
e2e/data/monitor-ping.json | 2 +-
e2e/data/monitor-port.json | 2 +-
e2e/data/monitor-sitemap.json | 2 +-
e2e/data/monitor-ssl.json | 2 +-
e2e/data/monitor-udp.json | 2 +-
e2e/data/monitor-website.json | 2 +-
e2e/k8s/data/create_k8s_monitor_data.json | 2 +-
.../apache/hertzbeat/ai/tools/MetricsTools.java | 15 +--
.../hertzbeat/ai/tools/impl/MetricsToolsImpl.java | 12 +-
.../hertzbeat/ai/tools/impl/MonitorToolsImpl.java | 9 +-
.../realtime/MetricsRealTimeAlertCalculator.java | 4 +-
.../service/impl/NoticeConfigServiceImpl.java | 3 +-
.../MetricsRealTimeAlertCalculatorMatchTest.java | 6 +-
.../controller/AlertDefineControllerTest.java | 2 +-
.../collect/redis/RedisCommonCollectImpl.java | 21 +++-
.../collect/redis/RedisClusterCollectImplTest.java | 42 +++++--
.../common/constants/CommonConstants.java | 5 -
.../common/constants/MetricDataConstants.java | 2 +-
.../common/entity/dto/MetricsHistoryData.java | 9 +-
.../hertzbeat/common/entity/manager/Monitor.java | 6 +-
.../common/entity/message/CollectRep.java | 8 +-
.../hertzbeat/common/entity/warehouse/History.java | 8 +-
.../common/support/valid/HostParamValidator.java | 16 ++-
.../component/sd/ServiceDiscoveryWorker.java | 3 +-
.../manager/scheduler/CollectorJobScheduler.java | 2 +-
.../hertzbeat/manager/scheduler/SchedulerInit.java | 8 +-
.../manager/service/impl/BulletinServiceImpl.java | 3 +-
.../manager/service/impl/MonitorServiceImpl.java | 40 +++++--
.../manager/controller/MonitorControllerTest.java | 6 +-
.../scheduler/CollectorJobSchedulerTest.java | 4 +-
.../manager/service/MonitorServiceTest.java | 64 +++++-----
.../push/service/impl/PushGatewayServiceImpl.java | 2 +-
.../db/migration/h2/V180__update_column.sql | 65 +++++++++++
.../db/migration/mysql/V180__update_column.sql | 82 +++++++++++++
.../migration/postgresql/V180__update_column.sql | 44 +++++++
.../hertzbeat/startup/dao/MonitorDaoTest.java | 2 +-
.../controller/MetricsDataController.java | 10 +-
.../warehouse/service/MetricsDataService.java | 18 +--
.../service/impl/MetricsDataServiceImpl.java | 8 +-
.../store/history/tsdb/HistoryDataReader.java | 30 +++--
.../tsdb/greptime/GreptimeDbDataStorage.java | 24 ++--
.../history/tsdb/influxdb/InfluxdbDataStorage.java | 63 +++++-----
.../store/history/tsdb/iotdb/IotDbDataStorage.java | 130 +++++++++++----------
.../history/tsdb/jpa/JpaDatabaseDataStorage.java | 54 ++++-----
.../history/tsdb/questdb/QuestdbDataStorage.java | 88 +++++++-------
.../history/tsdb/tdengine/TdEngineDataStorage.java | 106 +++++++++--------
.../tsdb/vm/VictoriaMetricsClusterDataStorage.java | 23 ++--
.../tsdb/vm/VictoriaMetricsDataStorage.java | 21 ++--
.../controller/MetricsDataControllerTest.java | 14 +--
.../warehouse/service/MetricsDataServiceTest.java | 14 +--
.../tsdb/greptime/GreptimeDbDataStorageTest.java | 4 +-
web-app/src/app/pojo/Monitor.ts | 2 +-
.../alert/alert-setting/alert-setting.component.ts | 2 +-
.../monitor-data-chart.component.ts | 4 +-
.../monitor-data-table.component.html | 3 +-
.../monitor-detail/monitor-detail.component.html | 2 +
.../monitor/monitor-edit/monitor-edit.component.ts | 4 +-
.../monitor-form/monitor-form.component.html | 6 +-
.../monitor/monitor-form/monitor-form.component.ts | 29 +++--
.../monitor-list/monitor-list.component.html | 4 +-
web-app/src/app/service/monitor.service.ts | 4 +-
63 files changed, 731 insertions(+), 447 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
