This is an automated email from the ASF dual-hosted git repository.
zhaoqingran pushed a change to branch remove-avaitor
in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
from 9cb78cd44 Update
common/src/main/java/org/apache/hertzbeat/common/util/JexlExpressionRunner.java
add 63562421a [docs] Optimize: add help docs for UDP port & Springboot3
help doc (#1832)
add 54c163abf [refactor] code simplification, structure changes and
translation (#1827)
add 690eade95 [doc] add help document for mongodb monitoring (#1834)
add 381ad50b1 [collector] fix: inverts the compareTo sort of
MetricsCollect run queue (#1837)
add 2fa3b5aed [doc]Doc add debian system (#1842)
add 4a3e27382 [feature] add Apache Hbase RegionServer monitoring (#1833)
add c0c9ff079 [improve] optimize websocket monitor (#1838)
add 41de1b9b5 [refactor] split the WarehouseProperties class (#1830)
add 997c958ae [test] add test for HttpsdImpl (#1840)
add d4bc3f93c [fix] fix the wrong comment (#1843)
add 49db98ade [refactor] trans and use assert (#1841)
add 4da1110ca [bugfix] modify the command in the mongodb monitoring
template (#1844)
add 7951e1da0 [bigfix]Fix Debian system Top10 monitoring bug (#1846)
add 8ffe0dae5 [cleanup] delete the corresponding chinese comments (#1847)
add 9545c8de1 [doc] translates chinese comment to english. (#1853)
add 1905d83db [doc] fix error and add help document for prometheus task
(#1852)
add 72ff8c34a [feature] Add Linux process monitoring (#1857)
add 025a7d925 [test] add test for FtpCollectImpl (#1856)
add 1808a0922 Merge branch 'master' into remove-avaitor
No new revisions were added by this update.
Summary of changes:
.../collector/collect/ftp/FtpCollectImpl.java | 7 +-
.../collector/collect/httpsd/HttpsdImpl.java | 7 +-
.../collector/collect/icmp/IcmpCollectImpl.java | 29 +-
.../collector/collect/jmx/JmxCollectImpl.java | 17 +-
.../collect/memcached/MemcachedCollectImpl.java | 8 +-
.../collect/mongodb/MongodbSingleCollectImpl.java | 4 +-
.../collect/mq/RocketmqSingleCollectImpl.java | 7 +-
.../nebulagraph/NebulaGraphCollectImpl.java | 16 +-
.../collector/collect/nginx/NginxCollectImpl.java | 26 +-
.../collector/collect/ntp/NtpCollectImpl.java | 2 +-
.../prometheus/PrometheusAutoCollectImpl.java | 6 +-
.../collect/prometheus/parser/TextParser.java | 32 +-
.../collector/collect/push/PushCollectImpl.java | 3 +-
.../collector/collect/smtp/SmtpCollectImpl.java | 4 +-
.../collect/websocket/WebsocketCollectImpl.java | 41 +-
.../collector/dispatch/MetricsCollect.java | 2 +-
.../collector/collect/ftp/FtpCollectImplTest.java | 149 ++++++
.../collector/collect/httpsd/HttpsdImplTest.java | 137 +++++
.../entity/job/protocol/WebsocketProtocol.java | 5 +
home/docs/help/debian.md | 101 ++++
home/docs/help/guide.md | 1 +
home/docs/help/hbase_regionserver.md | 96 ++++
home/docs/help/mongodb.md | 96 ++++
home/docs/help/port.md | 6 +-
home/docs/help/process.md | 91 ++++
home/docs/help/prometheus.md | 44 ++
home/docs/help/springboot3.md | 87 ++++
home/docs/help/udp_port.md | 34 ++
.../current/help/debian.md | 105 ++++
.../current/help/guide.md | 2 +
.../current/help/hbase_master.md | 2 +-
.../current/help/hbase_regionserver.md | 97 ++++
.../current/help/mongodb.md | 96 ++++
.../current/help/port.md | 4 +-
.../current/help/process.md | 91 ++++
.../current/help/prometheus.md | 44 ++
.../current/help/springboot3.md | 87 ++++
.../current/help/udp_port.md | 31 ++
home/sidebars.json | 11 +-
.../component/alerter/AlertNotifyHandler.java | 12 +-
.../component/alerter/AlertStoreHandler.java | 5 +-
.../manager/component/alerter/DispatcherAlarm.java | 9 +-
.../impl/AbstractAlertNotifyHandlerImpl.java | 2 +-
.../alerter/impl/DbAlertStoreHandlerImpl.java | 3 -
.../impl/DingTalkRobotAlertNotifyHandlerImpl.java | 14 +-
.../alerter/impl/EmailAlertNotifyHandlerImpl.java | 14 +-
.../impl/FlyBookAlertNotifyHandlerImpl.java | 18 +-
.../alerter/impl/GotifyAlertNotifyHandlerImpl.java | 12 +-
.../impl/ServerChanAlertNotifyHandlerImpl.java | 17 +-
.../alerter/impl/SlackAlertNotifyHandlerImpl.java | 1 -
.../alerter/impl/SmsAlertNotifyHandlerImpl.java | 2 +-
.../impl/TelegramBotAlertNotifyHandlerImpl.java | 1 -
.../alerter/impl/WeChatAlertNotifyHandlerImpl.java | 14 +-
.../impl/WeWorkAppAlertNotifyHandlerImpl.java | 10 +-
.../impl/WeWorkRobotAlertNotifyHandlerImpl.java | 14 +-
.../manager/config/AngularErrorViewResolver.java | 1 -
.../manager/config/HeaderRequestInterceptor.java | 4 +-
.../manager/config/RestTemplateConfig.java | 2 +-
.../manager/controller/AccountController.java | 10 +-
.../manager/controller/AppController.java | 40 +-
.../manager/controller/CollectorController.java | 10 +-
.../controller/GeneralConfigController.java | 7 +-
.../manager/controller/I18nController.java | 6 +-
.../manager/controller/MetricsController.java | 2 +-
.../manager/controller/MonitorController.java | 33 +-
.../manager/controller/MonitorsController.java | 52 +-
.../manager/controller/NoticeConfigController.java | 43 +-
.../manager/controller/StatusPageController.java | 2 +-
.../controller/StatusPagePublicController.java | 2 +-
.../manager/controller/SummaryController.java | 5 +-
.../manager/controller/TagController.java | 25 +-
.../hertzbeat/manager/dao/GeneralConfigDao.java | 6 +-
.../apache/hertzbeat/manager/dao/MonitorDao.java | 34 +-
.../hertzbeat/manager/dao/NoticeReceiverDao.java | 2 +-
.../hertzbeat/manager/dao/NoticeRuleDao.java | 2 -
.../hertzbeat/manager/dao/NoticeTemplateDao.java | 1 -
.../org/apache/hertzbeat/manager/dao/ParamDao.java | 12 +-
.../hertzbeat/manager/dao/ParamDefineDao.java | 6 +-
.../hertzbeat/manager/pojo/dto/AppCount.java | 19 +-
.../hertzbeat/manager/pojo/dto/Dashboard.java | 1 -
.../manager/pojo/dto/EmailNoticeSender.java | 15 +-
.../apache/hertzbeat/manager/pojo/dto/FileDTO.java | 2 -
.../hertzbeat/manager/pojo/dto/Hierarchy.java | 4 +-
.../hertzbeat/manager/pojo/dto/LoginDto.java | 9 +-
.../manager/pojo/dto/MonitorDefineDto.java | 2 +-
.../hertzbeat/manager/pojo/dto/MonitorDto.java | 2 +-
.../hertzbeat/manager/pojo/dto/ObjectStoreDTO.java | 15 +-
.../hertzbeat/manager/pojo/dto/ParamDefineDto.java | 1 -
.../manager/pojo/dto/RefreshTokenResponse.java | 2 +-
.../hertzbeat/manager/pojo/dto/SystemConfig.java | 2 -
.../hertzbeat/manager/scheduler/AssignJobs.java | 2 +-
.../manager/scheduler/CollectJobScheduling.java | 29 +-
.../scheduler/CollectorAndJobScheduler.java | 4 +-
.../manager/scheduler/ConsistentHash.java | 93 ++--
.../hertzbeat/manager/scheduler/SchedulerInit.java | 2 +-
.../hertzbeat/manager/service/AppService.java | 25 +-
.../manager/service/GeneralConfigService.java | 9 +-
.../hertzbeat/manager/service/ImExportService.java | 15 +-
.../hertzbeat/manager/service/MailService.java | 13 +-
.../hertzbeat/manager/service/MonitorService.java | 97 ++--
.../manager/service/NoticeConfigService.java | 73 +--
.../manager/service/NoticeDispatchService.java | 1 -
.../manager/service/ObjectStoreService.java | 19 +-
.../hertzbeat/manager/service/TagService.java | 5 +-
.../impl/AbstractGeneralConfigServiceImpl.java | 17 +-
.../service/impl/AbstractImExportServiceImpl.java | 12 +-
.../manager/service/impl/AppServiceImpl.java | 19 +-
.../service/impl/ExcelImExportServiceImpl.java | 37 +-
.../service/impl/JsonImExportServiceImpl.java | 1 -
.../service/impl/MailGeneralConfigServiceImpl.java | 11 +-
.../manager/service/impl/MailServiceImpl.java | 1 -
.../manager/service/impl/MonitorServiceImpl.java | 29 +-
.../service/impl/NoticeConfigServiceImpl.java | 2 -
.../service/impl/ObjectStoreConfigServiceImpl.java | 13 +-
.../service/impl/ObsObjectStoreServiceImpl.java | 1 -
.../impl/SystemGeneralConfigServiceImpl.java | 5 +-
.../service/impl/TemplateConfigServiceImpl.java | 5 +-
.../service/impl/YamlImExportServiceImpl.java | 18 +-
.../manager/support/GlobalExceptionHandler.java | 22 +-
.../support/exception/AlertNoticeException.java | 1 -
.../exception/MonitorDatabaseException.java | 1 -
.../support/exception/MonitorDetectException.java | 1 -
.../support/exception/MonitorMetricsException.java | 1 -
.../src/main/resources/define/app-a_example.yml | 51 --
manager/src/main/resources/define/app-activemq.yml | 38 --
manager/src/main/resources/define/app-airflow.yml | 26 +-
.../src/main/resources/define/app-almalinux.yml | 47 --
manager/src/main/resources/define/app-api.yml | 97 +---
manager/src/main/resources/define/app-api_code.yml | 99 +---
manager/src/main/resources/define/app-centos.yml | 46 --
.../src/main/resources/define/app-cisco_switch.yml | 74 ---
.../src/main/resources/define/app-clickhouse.yml | 48 --
manager/src/main/resources/define/app-coreos.yml | 47 --
manager/src/main/resources/define/app-debian.yml | 51 +-
manager/src/main/resources/define/app-dm.yml | 40 --
manager/src/main/resources/define/app-dns.yml | 96 +---
manager/src/main/resources/define/app-docker.yml | 48 +-
manager/src/main/resources/define/app-doris_be.yml | 11 -
manager/src/main/resources/define/app-doris_fe.yml | 150 +++---
.../src/main/resources/define/app-dynamic_tp.yml | 42 --
.../main/resources/define/app-elasticsearch.yml | 48 --
manager/src/main/resources/define/app-emqx.yml | 64 +--
manager/src/main/resources/define/app-euleros.yml | 47 --
manager/src/main/resources/define/app-flink.yml | 38 +-
manager/src/main/resources/define/app-freebsd.yml | 46 --
manager/src/main/resources/define/app-ftp.yml | 22 -
manager/src/main/resources/define/app-fullsite.yml | 21 -
.../src/main/resources/define/app-h3c_switch.yml | 75 ---
manager/src/main/resources/define/app-hadoop.yml | 52 --
.../resources/define/app-hbase_regionserver.yml | 578 +++++++++++++++++++++
.../src/main/resources/define/app-hertzbeat.yml | 19 +-
.../main/resources/define/app-hertzbeat_token.yml | 25 -
manager/src/main/resources/define/app-hive.yml | 53 --
.../src/main/resources/define/app-hpe_switch.yml | 74 ---
manager/src/main/resources/define/app-http_sd.yml | 21 +-
.../main/resources/define/app-huawei_switch.yml | 76 ---
.../main/resources/define/app-influxdb_promql.yml | 75 +--
manager/src/main/resources/define/app-iotdb.yml | 21 -
manager/src/main/resources/define/app-jetty.yml | 96 +---
manager/src/main/resources/define/app-jvm.yml | 52 --
manager/src/main/resources/define/app-kafka.yml | 27 -
.../src/main/resources/define/app-kafka_promql.yml | 101 ++--
.../src/main/resources/define/app-kubernetes.yml | 28 -
manager/src/main/resources/define/app-linux.yml | 47 --
manager/src/main/resources/define/app-mariadb.yml | 50 --
.../src/main/resources/define/app-memcached.yml | 25 +-
manager/src/main/resources/define/app-mongodb.yml | 34 +-
manager/src/main/resources/define/app-mysql.yml | 76 +--
manager/src/main/resources/define/app-nacos.yml | 43 +-
.../src/main/resources/define/app-nebulaGraph.yml | 47 +-
manager/src/main/resources/define/app-nginx.yml | 46 +-
manager/src/main/resources/define/app-ntp.yml | 26 +-
.../src/main/resources/define/app-opengauss.yml | 31 +-
manager/src/main/resources/define/app-opensuse.yml | 47 --
manager/src/main/resources/define/app-oracle.yml | 27 -
manager/src/main/resources/define/app-ping.yml | 25 +-
manager/src/main/resources/define/app-pop3.yml | 59 +--
manager/src/main/resources/define/app-port.yml | 33 +-
.../src/main/resources/define/app-postgresql.yml | 25 -
manager/src/main/resources/define/app-process.yml | 342 ++++++++++++
.../src/main/resources/define/app-prometheus.yml | 65 +--
manager/src/main/resources/define/app-push.yml | 23 +-
manager/src/main/resources/define/app-rabbitmq.yml | 114 ++--
manager/src/main/resources/define/app-redhat.yml | 47 --
manager/src/main/resources/define/app-redis.yml | 145 ------
.../main/resources/define/app-redis_cluster.yml | 146 ------
.../main/resources/define/app-redis_sentinel.yml | 85 ---
manager/src/main/resources/define/app-rocketmq.yml | 13 +-
.../src/main/resources/define/app-rockylinux.yml | 47 --
manager/src/main/resources/define/app-shenyu.yml | 131 +++--
manager/src/main/resources/define/app-smtp.yml | 36 +-
manager/src/main/resources/define/app-spark.yml | 52 --
.../main/resources/define/app-spring_gateway.yml | 51 --
.../src/main/resources/define/app-springboot2.yml | 68 +--
.../src/main/resources/define/app-springboot3.yml | 45 +-
.../src/main/resources/define/app-sqlserver.yml | 48 --
manager/src/main/resources/define/app-ssl_cert.yml | 29 --
manager/src/main/resources/define/app-storm.yml | 25 -
manager/src/main/resources/define/app-tidb.yml | 36 +-
manager/src/main/resources/define/app-tomcat.yml | 46 --
.../main/resources/define/app-tplink_switch.yml | 76 ---
manager/src/main/resources/define/app-ubuntu.yml | 47 --
manager/src/main/resources/define/app-udp_port.yml | 35 +-
manager/src/main/resources/define/app-website.yml | 60 ---
.../src/main/resources/define/app-websocket.yml | 40 +-
manager/src/main/resources/define/app-windows.yml | 41 +-
.../src/main/resources/define/app-zookeeper.yml | 27 -
.../org/apache/hertzbeat/manager/ManagerTest.java | 3 -
.../impl/DiscordBotAlertNotifyHandlerImplTest.java | 3 -
.../HuaweiCloudSmnAlertNotifyHandlerImplTest.java | 1 -
.../impl/SlackAlertNotifyHandlerImplTest.java | 2 -
.../TelegramBotAlertNotifyHandlerImplTest.java | 1 -
.../impl/WeChatAppAlertNotifyHandlerImplTest.java | 2 -
.../manager/controller/AppControllerTest.java | 18 +-
.../manager/controller/I18nControllerTest.java | 4 +-
.../manager/service/MonitorServiceTest.java | 28 +-
.../config/WarehouseAutoConfiguration.java | 2 -
.../warehouse/config/WarehouseProperties.java | 176 -------
.../warehouse/config/entrance/KafkaProperties.java | 28 +-
.../warehouse/config/store/StoreProperties.java | 44 ++
.../config/store/greptime/GreptimeProperties.java | 17 +-
.../config/store/influxdb/InfluxdbProperties.java | 16 +-
.../config/store/iotdb/IotDbProperties.java | 48 ++
.../config/{ => store/iotdb}/IotDbVersion.java | 2 +-
.../warehouse/config/store/jpa/JpaProperties.java | 30 +-
.../config/store/memory/MemoryProperties.java | 17 +-
.../config/store/redis/RedisProperties.java | 15 +-
.../config/store/tdengine/TdEngineProperties.java | 38 ++
.../config/store/vm/VictoriaMetricsProperties.java | 14 +-
.../store/HistoryGrepTimeDbDataStorage.java | 8 +-
.../store/HistoryInfluxdbDataStorage.java | 11 +-
.../warehouse/store/HistoryIotDbDataStorage.java | 10 +-
.../store/HistoryJpaDatabaseDataStorage.java | 8 +-
.../store/HistoryTdEngineDataStorage.java | 12 +-
.../store/HistoryVictoriaMetricsDataStorage.java | 12 +-
.../warehouse/store/RealTimeMemoryDataStorage.java | 10 +-
.../warehouse/store/RealTimeRedisDataStorage.java | 18 +-
237 files changed, 3531 insertions(+), 5039 deletions(-)
create mode 100644
collector/src/test/java/org/apache/hertzbeat/collector/collect/ftp/FtpCollectImplTest.java
create mode 100644
collector/src/test/java/org/apache/hertzbeat/collector/collect/httpsd/HttpsdImplTest.java
create mode 100644 home/docs/help/debian.md
create mode 100644 home/docs/help/hbase_regionserver.md
create mode 100644 home/docs/help/mongodb.md
create mode 100644 home/docs/help/process.md
create mode 100755 home/docs/help/prometheus.md
create mode 100644 home/docs/help/springboot3.md
create mode 100644 home/docs/help/udp_port.md
create mode 100644
home/i18n/zh-cn/docusaurus-plugin-content-docs/current/help/debian.md
create mode 100644
home/i18n/zh-cn/docusaurus-plugin-content-docs/current/help/hbase_regionserver.md
create mode 100644
home/i18n/zh-cn/docusaurus-plugin-content-docs/current/help/mongodb.md
create mode 100644
home/i18n/zh-cn/docusaurus-plugin-content-docs/current/help/process.md
create mode 100755
home/i18n/zh-cn/docusaurus-plugin-content-docs/current/help/prometheus.md
create mode 100644
home/i18n/zh-cn/docusaurus-plugin-content-docs/current/help/springboot3.md
create mode 100644
home/i18n/zh-cn/docusaurus-plugin-content-docs/current/help/udp_port.md
mode change 100644 => 100755 home/sidebars.json
create mode 100644 manager/src/main/resources/define/app-hbase_regionserver.yml
create mode 100644 manager/src/main/resources/define/app-process.yml
delete mode 100644
warehouse/src/main/java/org/apache/hertzbeat/warehouse/config/WarehouseProperties.java
copy collector/src/main/java/org/apache/hertzbeat/collector/Collector.java =>
warehouse/src/main/java/org/apache/hertzbeat/warehouse/config/entrance/KafkaProperties.java
(55%)
create mode 100644
warehouse/src/main/java/org/apache/hertzbeat/warehouse/config/store/StoreProperties.java
copy
collector/src/main/java/org/apache/hertzbeat/collector/collect/http/promethus/ParseException.java
=>
warehouse/src/main/java/org/apache/hertzbeat/warehouse/config/store/greptime/GreptimeProperties.java
(58%)
copy
alerter/src/main/java/org/apache/hertzbeat/alert/config/AlerterAutoConfiguration.java
=>
warehouse/src/main/java/org/apache/hertzbeat/warehouse/config/store/influxdb/InfluxdbProperties.java
(54%)
create mode 100644
warehouse/src/main/java/org/apache/hertzbeat/warehouse/config/store/iotdb/IotDbProperties.java
rename warehouse/src/main/java/org/apache/hertzbeat/warehouse/config/{ =>
store/iotdb}/IotDbVersion.java (94%)
copy collector/src/main/java/org/apache/hertzbeat/collector/Collector.java =>
warehouse/src/main/java/org/apache/hertzbeat/warehouse/config/store/jpa/JpaProperties.java
(54%)
copy
collector/src/main/java/org/apache/hertzbeat/collector/collect/http/promethus/ParseException.java
=>
warehouse/src/main/java/org/apache/hertzbeat/warehouse/config/store/memory/MemoryProperties.java
(58%)
copy
alerter/src/main/java/org/apache/hertzbeat/alert/config/AlerterAutoConfiguration.java
=>
warehouse/src/main/java/org/apache/hertzbeat/warehouse/config/store/redis/RedisProperties.java
(56%)
create mode 100644
warehouse/src/main/java/org/apache/hertzbeat/warehouse/config/store/tdengine/TdEngineProperties.java
copy
alerter/src/main/java/org/apache/hertzbeat/alert/config/AlerterAutoConfiguration.java
=>
warehouse/src/main/java/org/apache/hertzbeat/warehouse/config/store/vm/VictoriaMetricsProperties.java
(57%)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
