This is an automated email from the ASF dual-hosted git repository.
gongchao pushed a change to branch netty-worker
in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
from 1b4220f71 Merge branch 'master' into netty-worker
add 5eef247a5 [improve] enable and fix test src checkstyle (#2610)
add 5d416e855 [Feature] Supports Bulletin to view all metrics. (#2584)
add 1799e00ec [doc]markdown md046 (#2613)
add 12a53c69d [optimize]: update github action (#2608)
add 6e430bcab Add push dao unit tests (#2614)
add 525980f91 [webapp] bugfix monitors pageable not work (#2602)
add d71b9aa04 simplify the convertUnit (#2595)
add 009f5ddbe Merge branch 'master' into netty-worker
No new revisions were added by this update.
Summary of changes:
.github/workflows/backend-build-test.yml | 9 +-
.github/workflows/doc-build-test.yml | 94 +-
.github/workflows/nightly-build.yml | 5 +-
.markdownlint-cli2.jsonc | 2 +-
.../controller/AlertConvergeControllerTest.java | 131 +-
.../controller/AlertConvergesControllerTest.java | 96 +-
.../controller/AlertDefineControllerTest.java | 20 +-
.../controller/AlertDefinesControllerTest.java | 20 +-
.../controller/AlertReportControllerTest.java | 32 +-
.../controller/AlertSilenceControllerTest.java | 128 +-
.../alert/controller/AlertsControllerTest.java | 22 +-
.../alert/reduce/AlarmCommonReduceTest.java | 141 +-
.../alert/reduce/AlarmConvergeReduceTest.java | 100 +-
.../alert/reduce/AlarmSilenceReduceTest.java | 232 ++-
.../alert/service/AlertConvergeServiceTest.java | 90 +-
.../AlertDefineExcelImExportServiceTest.java | 240 ++-
.../AlertDefineJsonImExportServiceTest.java | 157 +-
.../AlertDefineYamlImExportServiceTest.java | 162 +-
.../alert/service/AlertSilenceServiceTest.java | 114 +-
.../collector/dispatch/MetricsCollect.java | 47 +-
.../collector/dispatch/unit/UnitConvert.java | 6 +-
...taSizeConvert.java => AbstractUnitConvert.java} | 57 +-
.../dispatch/unit/impl/DataSizeConvert.java | 53 +-
.../dispatch/unit/impl/TimeLengthConvert.java | 44 +-
.../collector/collect/dns/DnsCollectImplTest.java | 2 -
.../collector/collect/ftp/FtpCollectImplTest.java | 4 +-
.../collect/icmp/IcmpCollectImplTest.java | 6 +-
.../collect/imap/ImapCollectImplTest.java | 18 +-
.../memcached/MemcachedCollectImplTest.java | 8 +-
.../collect/nebulagraph/NgqlCollectImplTest.java | 50 +-
.../collect/redis/RedisClusterCollectImplTest.java | 6 +-
.../collect/redis/RedisSingleCollectImplTest.java | 14 +-
.../collect/telnet/TelnetCollectImplTest.java | 4 +-
.../collector/dispatch/CommonDispatcherTest.java | 15 +-
.../dispatch/MetricsCollectorQueueTest.java | 6 +-
.../collector/dispatch/WorkerPoolTest.java | 6 +-
.../dispatch/entrance/CollectServerTest.java | 148 +-
.../entrance/internal/CollectJobServiceTest.java | 21 +-
.../dispatch/export/NettyDataQueueTest.java | 39 +-
.../dispatch/unit/DataSizeConvertTest.java | 65 +-
.../collector/util/JsonPathParserTest.java | 78 +-
.../hertzbeat/common/entity/manager/Monitor.java | 4 +-
.../{GeneralConfig.java => bulletin/Bulletin.java} | 55 +-
.../entity/manager/bulletin/BulletinDto.java | 33 +-
.../manager/bulletin/BulletinMetricsData.java | 135 ++
.../bulletin/BulletinVo.java} | 37 +-
.../org/apache/hertzbeat/common/util/JsonUtil.java | 8 +-
.../queue/impl/InMemoryCommonDataQueueTest.java | 116 +-
.../queue/impl/KafkaCommonDataQueueTest.java | 264 ++--
.../queue/impl/RedisCommonDataQueueTest.java | 168 +-
.../common/serialize/AlertDeserializerTest.java | 88 +-
.../common/serialize/AlertSerializerTest.java | 106 +-
.../KafkaMetricsDataDeserializerTest.java | 92 +-
.../serialize/KafkaMetricsDataSerializerTest.java | 93 +-
.../support/ResourceBundleUtf8ControlTest.java | 66 +-
.../common/support/SpringContextHolderTest.java | 12 +-
.../support/vaild/EmailParamValidatorTest.java | 71 +-
.../support/vaild/HostParamValidatorTest.java | 73 +-
.../support/vaild/PhoneNumParamValidatorTest.java | 61 +-
.../apache/hertzbeat/common/util/FileUtilTest.java | 4 +-
.../common/util/IntervalExpressionUtilTest.java | 61 +-
.../hertzbeat/common/util/IpDomainUtilTest.java | 17 +-
.../org/apache/hertzbeat/common/util/JexlTest.java | 80 +-
.../apache/hertzbeat/common/util/JsonUtilTest.java | 3 +-
.../hertzbeat/common/util/LruHashMapTest.java | 3 +-
.../hertzbeat/common/util/MapCapUtilTest.java | 25 +-
.../hertzbeat/common/util/ProtoJsonUtilTest.java | 10 +-
.../common/util/ResourceBundleUtilTest.java | 25 +-
.../hertzbeat/common/util/StrBufferTest.java | 179 ++-
.../apache/hertzbeat/common/util/StrUtilTest.java | 60 +-
.../hertzbeat/common/util/TimePeriodUtilTest.java | 142 +-
.../hertzbeat/common/util/TimeZoneUtilTest.java | 76 +-
.../hertzbeat/common/util/entity/PersonTest.java | 1630 ++++++++++----------
.../common/util/prometheus/PrometheusUtilTest.java | 280 ++--
.../2024-06-11-hertzbeat-v1.6.0-update.md | 32 +-
.../current/start/update-1.6.0.md | 24 +-
.../version-v1.5.x/download.md | 2 +-
.../version-v1.5.x/start/docker-deploy.md | 9 +-
.../version-v1.5.x/start/docker-deploy.md | 10 +-
.../manager/controller/AppController.java | 33 +-
.../manager/controller/BulletinController.java | 148 ++
.../dao/{NoticeRuleDao.java => BulletinDao.java} | 18 +-
.../hertzbeat/manager/service/AppService.java | 17 +
.../hertzbeat/manager/service/BulletinService.java | 84 +
.../manager/service/impl/AppServiceImpl.java | 161 +-
.../manager/service/impl/BulletinServiceImpl.java | 258 ++++
manager/src/main/resources/sureness.yml | 4 +
.../org/apache/hertzbeat/manager/ManagerTest.java | 1 +
.../component/alerter/DispatcherAlarmTest.java | 16 +-
.../alerter/impl/DbAlertStoreHandlerImplTest.java | 167 +-
.../impl/EmailAlertNotifyHandlerImplTest.java | 14 +-
.../impl/GotifyAlertNotifyHandlerImplTest.java | 157 +-
.../impl/ServerChanAlertNotifyHandlerImplTest.java | 157 +-
.../impl/SlackAlertNotifyHandlerImplTest.java | 1 +
.../impl/SmsAlertNotifyHandlerImplTest.java | 118 +-
.../TelegramBotAlertNotifyHandlerImplTest.java | 1 +
.../impl/WeChatAppAlertNotifyHandlerImplTest.java | 2 +-
.../impl/WeComAppAlertNotifyHandlerImplTest.java | 180 ++-
.../impl/WebHookAlertNotifyHandlerImplTest.java | 23 +-
.../component/listener/TimeZoneListenerTest.java | 53 +-
.../manager/controller/AiControllerTest.java | 68 +-
.../manager/controller/AppControllerTest.java | 6 +-
.../controller/CollectorControllerTest.java | 10 +-
.../controller/GeneralConfigControllerTest.java | 93 +-
.../manager/controller/MetricsControllerTest.java | 56 +-
.../manager/controller/MonitorControllerTest.java | 18 +-
.../manager/controller/MonitorsControllerTest.java | 34 +-
.../controller/NoticeConfigControllerTest.java | 19 +-
.../manager/controller/PluginControllerTest.java | 54 +-
.../controller/StatusPageControllerTest.java | 375 +++--
.../controller/StatusPagePublicControllerTest.java | 119 +-
.../manager/controller/SummaryControllerTest.java | 4 +-
.../manager/controller/TagControllerTest.java | 4 +-
.../hertzbeat/manager/dao/CollectorDaoTest.java | 8 +-
.../manager/scheduler/ConsistentHashTest.java | 12 +-
.../manager/service/AccountServiceTest.java | 222 ++-
.../manager/service/AiServiceFactoryTest.java | 117 +-
.../hertzbeat/manager/service/AppServiceTest.java | 4 +-
.../service/AvailableAlertDefineInitTest.java | 85 +-
.../manager/service/CollectorServiceTest.java | 14 +-
.../manager/service/ConfigServiceTest.java | 5 +-
.../manager/service/ExcelImExportServiceTest.java | 139 +-
.../manager/service/JsonImExportServiceTest.java | 93 +-
.../service/MailGeneralConfigServiceTest.java | 39 +-
.../manager/service/MonitorServiceTest.java | 38 +-
.../service/ObjectStoreConfigServiceTest.java | 79 +-
.../manager/service/ObsObjectStoreServiceTest.java | 155 +-
.../manager/service/PluginServiceTest.java | 2 +-
.../service/SmsGeneralConfigServiceTest.java | 55 +-
.../manager/service/StatusPageServiceTest.java | 149 +-
.../service/SystemGeneralConfigServiceTest.java | 49 +-
.../manager/service/SystemSecretServiceTest.java | 41 +-
.../hertzbeat/manager/service/TagServiceTest.java | 2 +-
.../manager/service/TemplateConfigServiceTest.java | 81 +-
.../manager/service/YamlImExportServiceTest.java | 115 +-
package.json | 5 -
.../push/controller/PushControllerTest.java | 75 +-
.../push/controller/PushGatewayControllerTest.java | 71 +-
.../hertzbeat/push/dao/PushMetricsDaoTest.java | 77 +
.../hertzbeat/push/dao/PushMonitorDaoTest.java | 94 ++
.../push/service/PushGatewayServiceTest.java | 88 +-
.../hertzbeat/push/service/PushServiceTest.java | 127 +-
script/checkstyle/checkstyle.xml | 2 +-
script/checkstyle/suppressions.xml | 3 -
script/ci/docs/check_file_name.json | 8 +
script/ci/docs/check_file_name.py | 65 +
{.github => script/ci}/exclude_files.txt | 2 +-
.../ci/github-actions/setup-deps/action.yml | 16 +-
{.github => script/ci}/link_check.json | 0
script/sureness.yml | 6 +-
.../controller/MetricsDataControllerTest.java | 2 +-
.../warehouse/service/MetricsDataServiceTest.java | 10 +-
.../warehouse/service/WarehouseServiceTest.java | 66 +-
.../warehouse/store/MemoryDataStorageTest.java | 11 +-
.../warehouse/store/MetricsDataRedisCodecTest.java | 17 +-
.../warehouse/store/RedisDataStorageTest.java | 8 +-
.../src/app/pojo/{Plugin.ts => BulletinDefine.ts} | 9 +-
web-app/src/app/pojo/{PluginItem.ts => Fields.ts} | 4 +-
.../app/routes/bulletin/bulletin.component.html | 237 +++
.../app/routes/bulletin/bulletin.component.less | 17 +
.../bulletin/bulletin.component.spec.ts} | 12 +-
.../src/app/routes/bulletin/bulletin.component.ts | 509 ++++++
.../monitor/monitor-list/monitor-list.component.ts | 2 +-
web-app/src/app/routes/routes-routing.module.ts | 2 +
web-app/src/app/routes/routes.module.ts | 19 +-
web-app/src/app/service/app-define.service.ts | 18 +
web-app/src/app/service/bulletin-define.service.ts | 87 ++
web-app/src/app/service/monitor.service.ts | 36 +-
web-app/src/assets/app-data.json | 6 +
web-app/src/assets/i18n/en-US.json | 15 +
web-app/src/assets/i18n/zh-CN.json | 15 +
web-app/src/assets/i18n/zh-TW.json | 15 +
172 files changed, 7076 insertions(+), 5303 deletions(-)
copy
collector/src/main/java/org/apache/hertzbeat/collector/dispatch/unit/impl/{DataSizeConvert.java
=> AbstractUnitConvert.java} (55%)
copy
common/src/main/java/org/apache/hertzbeat/common/entity/manager/{GeneralConfig.java
=> bulletin/Bulletin.java} (54%)
copy
manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/ParamDefineDto.java
=>
common/src/main/java/org/apache/hertzbeat/common/entity/manager/bulletin/BulletinDto.java
(69%)
create mode 100644
common/src/main/java/org/apache/hertzbeat/common/entity/manager/bulletin/BulletinMetricsData.java
copy
common/src/main/java/org/apache/hertzbeat/common/entity/{job/protocol/FtpProtocol.java
=> manager/bulletin/BulletinVo.java} (67%)
create mode 100644
manager/src/main/java/org/apache/hertzbeat/manager/controller/BulletinController.java
copy
manager/src/main/java/org/apache/hertzbeat/manager/dao/{NoticeRuleDao.java =>
BulletinDao.java} (74%)
create mode 100644
manager/src/main/java/org/apache/hertzbeat/manager/service/BulletinService.java
create mode 100644
manager/src/main/java/org/apache/hertzbeat/manager/service/impl/BulletinServiceImpl.java
delete mode 100644 package.json
create mode 100644
push/src/test/java/org/apache/hertzbeat/push/dao/PushMetricsDaoTest.java
create mode 100644
push/src/test/java/org/apache/hertzbeat/push/dao/PushMonitorDaoTest.java
create mode 100644 script/ci/docs/check_file_name.json
create mode 100644 script/ci/docs/check_file_name.py
rename {.github => script/ci}/exclude_files.txt (99%)
copy .github/ISSUE_TEMPLATE/config.yml =>
script/ci/github-actions/setup-deps/action.yml (77%)
rename {.github => script/ci}/link_check.json (100%)
copy web-app/src/app/pojo/{Plugin.ts => BulletinDefine.ts} (86%)
copy web-app/src/app/pojo/{PluginItem.ts => Fields.ts} (93%)
create mode 100644 web-app/src/app/routes/bulletin/bulletin.component.html
create mode 100644 web-app/src/app/routes/bulletin/bulletin.component.less
copy web-app/src/app/{shared/components/toolbar/toolbar.component.spec.ts =>
routes/bulletin/bulletin.component.spec.ts} (80%)
mode change 100755 => 100644
create mode 100644 web-app/src/app/routes/bulletin/bulletin.component.ts
create mode 100644 web-app/src/app/service/bulletin-define.service.ts
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
