This is an automated email from the ASF dual-hosted git repository.
gongchao pushed a change to branch influxdb_monitors_v1
in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
from d332fa86e Merge branch 'influxdb_monitors_v1' of
https://github.com/dromara/hertzbeat into influxdb_monitors_v1
add f7fb2356c [test] Add RedisSingleCollectImplTest (#1784)
add ac2c4c0f3 [refactor] add override annotation (#1782)
add 125c30d68 '[docs]bugfix: display syntax error of ipmi protocol' (#1793)
add 0d6002db3 [doc] translate alerter moudle code chinese to english
(#1765)
add e7c627bc4 [refactor] database-related properties class, type changed
to record (#1786)
add 8ce473139 [bugfix] fix snmp template unit conversion problem (#1796)
add 12e45a703 [doc] add help documentation for clickhouse monitoring
(#1798)
add 38fb15177 [feature] update-checkstyle limit the java file header
(#1799)
add 0d17a4716 [improve] add external lib folder to store mysql and oracle
driver. (#1783)
add 5e155e0d4 [improve] when multiple lines are returned, each alarm is
triggered instead of only the first alarm (#1797)
add 3eb1e1999 [doc] add team page in website (#1800)
add 6f942bc60 [feature] Improve the import checkstyle (#1802)
add 42fff48e2 [doc] add help document for dns monitoring (#1804)
add 16cec10fa [improve] preventing NPE (#1808)
add f1ed92a52 [refactor] change the warehouse properties the type to
record (#1806)
add e7ec15f68 [refactor] upgrade syntax to jdk17 instanceof & switch
(#1807)
add 8e2ebe303 [test] add nginx collect test (#1809)
add b2f94ec1e [website] update team page (#1803)
add b3cb1b074 [test] add RedisClusterCollectImplTest (#1789)
add d88851d7e [improve] Fix typo ReqStatusResponse (#1811)
add c40405cd5 Comparing N objects for null with Assert.noNullElements().
(#1814)
add 8755c11d9 [doc] Add help document for elasticsearch monitoring and ftp
monitoring (#1815)
add 54faa0238 [doc] add help documentation for huawei switch monitoring
(#1813)
add df9ab107c chore: upgrade the api-testing (e2e) to v0.0.16 (#1817)
add ae65e7594 [remove][improve] mail config (#1819)
add 264d24ebd Remove and translate chinese to english in code (#1816)
add cbe38c792 [feature] add monitoring for Hbase Master (#1820)
add 7ae4650b9 [doc] resolve code conflicts and coverage caused by
pr(#1813) merge (#1821)
add 997bbe39c [doc] Add help document for tidb and nacos monitoring (#1823)
add fed2f538b [improve] use eclipselink orm replace of hibernate orm
(#1801)
add ab52a4972 [improve] add whitespace checkstyle (#1824)
add 024152ec3 [bugfix] dns monitoring template add query class parameter
(#1825)
add aa4d28bf3 [Refactor] Preventing Unnecessary Object Creation and Using
Utility Methods (#1818)
add 8c6ed728f [doc]Add and modify Doris FE Chinese and English
documentation (#1828)
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 6c35f57b2 [improve] use apache jexl replace of aviator (#1859)
add c4aee27f1 [bugfix] jpa data save logic repair (#1863)
add e6ce03a0b Merge branch 'master' into influxdb_monitors_v1
No new revisions were added by this update.
Summary of changes:
.all-contributorsrc | 100 +-
.github/labeler.yml | 2 +-
.gitignore | 1 +
README.md | 20 +-
README_CN.md | 20 +-
alerter/pom.xml | 17 -
.../apache/hertzbeat/alert/AlerterWorkerPool.java | 5 +-
.../hertzbeat/alert/calculate/CalculateAlarm.java | 90 +-
.../alert/config/AlerterAutoConfiguration.java | 1 -
.../alert/controller/AlertConvergeController.java | 28 +-
.../alert/controller/AlertConvergesController.java | 44 +-
.../alert/controller/AlertDefineController.java | 51 +-
.../alert/controller/AlertDefinesController.java | 61 +-
.../alert/controller/AlertReportController.java | 42 +-
.../alert/controller/AlertSilenceController.java | 29 +-
.../alert/controller/AlertSilencesController.java | 46 +-
.../alert/controller/AlertsController.java | 66 +-
.../hertzbeat/alert/dao/AlertConvergeDao.java | 3 +-
.../org/apache/hertzbeat/alert/dao/AlertDao.java | 6 +-
.../hertzbeat/alert/dao/AlertDefineBindDao.java | 5 +-
.../apache/hertzbeat/alert/dao/AlertDefineDao.java | 11 +-
.../hertzbeat/alert/dao/AlertMonitorDao.java | 3 +-
.../hertzbeat/alert/dao/AlertSilenceDao.java | 3 +-
.../apache/hertzbeat/alert/dto/AlertSummary.java | 12 +-
.../alert/dto/CloudAlertReportAbstract.java | 3 +-
.../alert/dto/GeneralCloudAlertReport.java | 12 +-
.../hertzbeat/alert/dto/TenCloudAlertReport.java | 9 +-
.../enums/CloudServiceAlarmInformationEnum.java | 3 +-
.../hertzbeat/alert/reduce/AlarmCommonReduce.java | 9 +-
.../alert/reduce/AlarmConvergeReduce.java | 11 +-
.../hertzbeat/alert/reduce/AlarmSilenceReduce.java | 23 +-
.../alert/service/AlertConvergeService.java | 3 +-
.../alert/service/AlertDefineImExportService.java | 14 +-
.../alert/service/AlertDefineService.java | 14 +-
.../hertzbeat/alert/service/AlertService.java | 7 +-
.../alert/service/AlertSilenceService.java | 3 +-
.../service/impl/AlertConvergeServiceImpl.java | 3 +-
.../AlertDefineAbstractImExportServiceImpl.java | 22 +-
.../impl/AlertDefineExcelImExportServiceImpl.java | 62 +-
.../impl/AlertDefineJsonImExportServiceImpl.java | 7 +-
.../alert/service/impl/AlertDefineServiceImpl.java | 26 +-
.../impl/AlertDefineYamlImExportServiceImpl.java | 9 +-
.../alert/service/impl/AlertServiceImpl.java | 42 +-
.../service/impl/AlertSilenceServiceImpl.java | 7 +-
.../hertzbeat/alert/util/AlertTemplateUtil.java | 5 +-
.../org/apache/hertzbeat/alert/util/DateUtil.java | 3 +-
.../controller/AlertDefineControllerTest.java | 2 -
.../controller/AlertDefinesControllerTest.java | 13 +-
.../controller/AlertReportControllerTest.java | 11 +-
.../alert/controller/AlertsControllerTest.java | 6 -
.../alert/util/AlertTemplateUtilTest.java | 6 +-
collector/pom.xml | 5 -
.../org/apache/hertzbeat/collector/Collector.java | 3 +-
.../collect/common/cache/CacheIdentifier.java | 14 +-
.../common/cache/ConnectionCommonCache.java | 26 +-
.../collect/common/cache/JdbcConnect.java | 3 +-
.../collector/collect/common/cache/JmxConnect.java | 3 +-
.../collect/common/http/CommonHttpClient.java | 23 +-
.../collect/database/JdbcCommonCollect.java | 100 +-
.../collector/collect/dns/DnsCollectImpl.java | 43 +-
.../collector/collect/ftp/FtpCollectImpl.java | 22 +-
.../collector/collect/http/HttpCollectImpl.java | 86 +-
.../collect/http/SslCertificateCollectImpl.java | 41 +-
.../http/promethus/AbstractPrometheusParse.java | 15 +-
.../http/promethus/PrometheusLastParser.java | 9 +-
.../http/promethus/PrometheusMatrixParser.java | 17 +-
.../http/promethus/PrometheusVectorParser.java | 17 +-
.../http/promethus/exporter/ExporterParser.java | 124 ++-
.../http/promethus/exporter/MetricFamily.java | 14 +-
.../http/promethus/exporter/MetricType.java | 4 +-
.../collector/collect/httpsd/HttpsdImpl.java | 20 +-
.../httpsd/constant/DiscoveryClientInstance.java | 3 +-
.../collect/httpsd/discovery/DiscoveryClient.java | 3 +-
.../discovery/DiscoveryClientManagement.java | 5 +-
.../discovery/impl/ConsulDiscoveryClient.java | 7 +-
.../discovery/impl/NacosDiscoveryClient.java | 11 +-
.../collector/collect/icmp/IcmpCollectImpl.java | 42 +-
.../collector/collect/jmx/JmxCollectImpl.java | 66 +-
.../collect/memcached/MemcachedCollectImpl.java | 27 +-
.../collect/mongodb/MongodbSingleCollectImpl.java | 22 +-
.../collector/collect/mq/RocketmqCollectData.java | 3 +-
.../collect/mq/RocketmqSingleCollectImpl.java | 50 +-
.../nebulagraph/NebulaGraphCollectImpl.java | 67 +-
.../collector/collect/nginx/NginxCollectImpl.java | 157 ++-
.../collector/collect/ntp/NtpCollectImpl.java | 25 +-
.../collector/collect/pop3/Pop3CollectImpl.java | 42 +-
.../prometheus/PrometheusAutoCollectImpl.java | 54 +-
.../collect/prometheus/parser/MetricFamily.java | 3 +-
.../collect/prometheus/parser/TextParser.java | 62 +-
.../collector/collect/push/PushCollectImpl.java | 34 +-
.../collect/redis/RedisCommonCollectImpl.java | 42 +-
.../collector/collect/smtp/SmtpCollectImpl.java | 21 +-
.../collector/collect/snmp/SnmpCollectImpl.java | 61 +-
.../collector/collect/ssh/SshCollectImpl.java | 65 +-
.../collect/strategy/CollectStrategyFactory.java | 5 +-
.../collect/telnet/TelnetCollectImpl.java | 23 +-
.../collector/collect/udp/UdpCollectImpl.java | 12 +-
.../collect/websocket/WebsocketCollectImpl.java | 62 +-
.../collector/dispatch/CollectDataDispatch.java | 3 +-
.../collector/dispatch/CommonDispatcher.java | 17 +-
.../collector/dispatch/MetricsCollect.java | 93 +-
.../collector/dispatch/MetricsCollectorQueue.java | 5 +-
.../hertzbeat/collector/dispatch/WorkerPool.java | 7 +-
.../collector/dispatch/entrance/CollectServer.java | 21 +-
.../entrance/internal/CollectJobService.java | 13 +-
.../internal/CollectResponseEventListener.java | 3 +-
.../processor/DeleteCyclicTaskProcessor.java | 3 +-
.../collector/dispatch/timer/HashedWheelTimer.java | 23 +-
.../collector/dispatch/timer/TimerDispatch.java | 5 +-
.../collector/dispatch/timer/TimerDispatcher.java | 11 +-
.../collector/dispatch/timer/WheelTimerTask.java | 13 +-
.../dispatch/unit/impl/DataSizeConvert.java | 5 +-
.../dispatch/unit/impl/TimeLengthConvert.java | 5 +-
.../hertzbeat/collector/util/CollectUtil.java | 20 +-
.../hertzbeat/collector/util/JsonPathParser.java | 11 +-
.../hertzbeat/collector/util/PrivateKeyUtils.java | 5 +-
.../collector/collect/dns/DnsCollectImplTest.java | 1 +
.../collector/collect/ftp/FtpCollectImplTest.java | 149 +++
.../collector/collect/httpsd/HttpsdImplTest.java | 137 +++
.../collect/nginx/NginxCollectImplTest.java | 274 +++++-
.../collect/redis/RedisClusterCollectImplTest.java | 109 ++-
.../collect/redis/RedisSingleCollectImplTest.java | 73 +-
common/pom.xml | 23 +-
.../common/cache/CaffeineCacheServiceImpl.java | 2 +-
.../common/config/AviatorConfiguration.java | 200 ----
.../common/config/EclipseLinkCustomizer.java | 68 ++
.../common/config/EclipseLinkJpaConfiguration.java | 61 ++
.../hertzbeat/common/entity/alerter/Alert.java | 55 +-
.../common/entity/alerter/AlertConverge.java | 34 +-
.../common/entity/alerter/AlertDefine.java | 36 +-
.../entity/alerter/AlertDefineMonitorBind.java | 28 +-
.../common/entity/alerter/AlertSilence.java | 32 +-
.../entity/alerter/JsonMapAttributeConverter.java | 9 +-
.../hertzbeat/common/entity/dto/AlertReport.java | 21 +-
.../hertzbeat/common/entity/dto/CollectorInfo.java | 2 +-
.../hertzbeat/common/entity/dto/MetricsData.java | 2 +-
.../common/entity/dto/MetricsHistoryData.java | 4 +-
.../common/entity/dto/PromVectorOrMatrix.java | 10 +-
.../hertzbeat/common/entity/dto/ValueRow.java | 4 +-
.../apache/hertzbeat/common/entity/job/Job.java | 13 +-
.../hertzbeat/common/entity/job/Metrics.java | 37 +-
.../common/entity/job/protocol/DnsProtocol.java | 3 +-
.../common/entity/job/protocol/HttpProtocol.java | 5 +-
.../common/entity/job/protocol/NginxProtocol.java | 2 +-
.../entity/job/protocol/PrometheusProtocol.java | 3 +-
.../common/entity/job/protocol/PushProtocol.java | 3 +-
.../common/entity/job/protocol/SnmpProtocol.java | 3 +-
.../entity/job/protocol/WebsocketProtocol.java | 5 +
.../hertzbeat/common/entity/manager/Collector.java | 19 +-
.../entity/manager/CollectorMonitorBind.java | 19 +-
.../common/entity/manager/GeneralConfig.java | 17 +-
.../manager/JsonByteListAttributeConverter.java | 7 +-
.../manager/JsonLongListAttributeConverter.java | 24 +-
.../manager/JsonOptionListAttributeConverter.java | 7 +-
.../manager/JsonStringListAttributeConverter.java | 19 +-
.../entity/manager/JsonTagAttributeConverter.java | 7 +-
.../manager/JsonTagListAttributeConverter.java | 7 +-
.../hertzbeat/common/entity/manager/Monitor.java | 38 +-
.../common/entity/manager/NoticeReceiver.java | 68 +-
.../common/entity/manager/NoticeRule.java | 34 +-
.../common/entity/manager/NoticeTemplate.java | 57 +-
.../hertzbeat/common/entity/manager/Param.java | 32 +-
.../common/entity/manager/ParamDefine.java | 23 +-
.../common/entity/manager/StatusPageComponent.java | 13 +-
.../common/entity/manager/StatusPageHistory.java | 15 +-
.../common/entity/manager/StatusPageIncident.java | 24 +-
.../manager/StatusPageIncidentComponentBind.java | 13 +-
.../entity/manager/StatusPageIncidentContent.java | 13 +-
.../common/entity/manager/StatusPageOrg.java | 13 +-
.../hertzbeat/common/entity/manager/Tag.java | 31 +-
.../hertzbeat/common/entity/manager/TagItem.java | 3 +-
.../common/entity/manager/TagMonitorBind.java | 16 +-
...r.java => ZonedDateTimeAttributeConverter.java} | 29 +-
.../hertzbeat/common/entity/push/PushMetrics.java | 9 +-
.../common/entity/push/PushMetricsDto.java | 7 +-
.../hertzbeat/common/entity/warehouse/History.java | 18 +-
.../common/queue/impl/InMemoryCommonDataQueue.java | 11 +-
.../common/queue/impl/KafkaCommonDataQueue.java | 13 +-
.../common/serialize/AlertDeserializer.java | 5 +-
.../common/serialize/AlertSerializer.java | 7 +-
.../serialize/KafkaMetricsDataDeserializer.java | 5 +-
.../serialize/KafkaMetricsDataSerializer.java | 5 +-
.../hertzbeat/common/service/AliYunSmsClient.java | 9 +-
.../hertzbeat/common/service/TencentSmsClient.java | 4 +-
.../hertzbeat/common/support/CommonThreadPool.java | 7 +-
.../common/support/ResourceBundleUtf8Control.java | 7 +-
.../common/support/SpringContextHolder.java | 4 +-
.../common/support/valid/EmailParamValidator.java | 3 +-
.../hertzbeat/common/support/valid/EmailValid.java | 7 +-
.../common/support/valid/HostParamValidator.java | 3 +-
.../hertzbeat/common/support/valid/HostValid.java | 7 +-
.../support/valid/PhoneNumParamValidator.java | 3 +-
.../common/support/valid/PhoneNumValid.java | 7 +-
.../org/apache/hertzbeat/common/util/AesUtil.java | 10 +-
.../apache/hertzbeat/common/util/CommonUtil.java | 6 +-
.../apache/hertzbeat/common/util/IpDomainUtil.java | 9 +-
.../hertzbeat/common/util/JexlCommonFunction.java | 98 ++
.../common/util/JexlExpressionRunner.java | 70 ++
.../org/apache/hertzbeat/common/util/JsonUtil.java | 2 +-
.../hertzbeat/common/util/ResourceBundleUtil.java | 5 +-
.../common/util/SnowFlakeIdGenerator.java | 12 +-
.../hertzbeat/common/util/SnowFlakeIdWorker.java | 2 +-
.../hertzbeat/common/util/prometheus/Metric.java | 2 +-
.../common/util/prometheus/PrometheusUtil.java | 2 +-
.../common/config/AviatorConfigurationTest.java | 134 ---
.../org/apache/hertzbeat/common/util/JexlTest.java | 565 +++++++++++
e2e/Dockerfile | 2 +-
.../docs/community/code-style-and-quality-guide.md | 15 +
home/docs/help/clickhouse.md | 73 ++
home/docs/help/debian.md | 101 ++
home/docs/help/dns.md | 70 ++
home/docs/help/doris_fe.md | 195 ++--
home/docs/help/elasticsearch.md | 63 ++
home/docs/help/ftp.md | 34 +
home/docs/help/guide.md | 299 ++++--
home/docs/help/hbase_master.md | 62 ++
home/docs/help/hbase_regionserver.md | 96 ++
home/docs/help/huawei_switch.md | 53 +
home/docs/help/mongodb.md | 96 ++
home/docs/help/nacos.md | 93 ++
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/tidb.md | 55 ++
home/docs/help/udp_port.md | 34 +
home/docs/introduce.md | 2 +-
home/docs/others/developer.md | 272 ------
home/docusaurus.config.js | 9 +-
home/i18n/en/code.json | 12 +
home/i18n/en/docusaurus-theme-classic/footer.json | 2 +-
home/i18n/en/docusaurus-theme-classic/navbar.json | 8 +
home/i18n/zh-cn/code.json | 12 +
.../community/code-style-and-quality-guide.md | 15 +
.../current/help/alert_threshold_expr.md | 2 +-
.../current/help/clickhouse.md | 73 ++
.../current/help/debian.md | 105 ++
.../current/help/dns.md | 69 ++
.../current}/help/doris_fe.md | 23 +-
.../current/help/elasticsearch.md | 63 ++
.../current/help/ftp.md | 34 +
.../current/help/guide.md | 298 ++++--
.../current/help/hbase_master.md | 62 ++
.../current/help/hbase_regionserver.md | 97 ++
.../current/help/huawei_switch.md | 53 +
.../current/help/mongodb.md | 96 ++
.../current/help/nacos.md | 93 ++
.../current/help/port.md | 4 +-
.../current/help/process.md | 91 ++
.../current/help/prometheus.md | 44 +
.../current/help/springboot3.md | 87 ++
.../current/help/tidb.md | 49 +
.../current/help/udp_port.md | 31 +
.../current/others/developer.md | 272 ------
.../zh-cn/docusaurus-theme-classic/footer.json | 2 +-
.../zh-cn/docusaurus-theme-classic/navbar.json | 4 +
home/package.json | 1 +
home/sidebars.json | 30 +-
home/src/pages/team/github.svg | 1 +
home/src/pages/team/index.css | 161 ++++
home/src/pages/team/index.jsx | 1012 ++++++++++++++++++++
home/src/pages/team/member.json | 83 ++
home/yarn.lock | 21 +-
manager/pom.xml | 10 -
.../java/org/apache/hertzbeat/manager/Manager.java | 3 +-
.../component/alerter/AlertNotifyHandler.java | 12 +-
.../component/alerter/AlertStoreHandler.java | 5 +-
.../manager/component/alerter/DispatcherAlarm.java | 16 +-
.../impl/AbstractAlertNotifyHandlerImpl.java | 21 +-
.../alerter/impl/AliYunAlertNotifyHandlerImpl.java | 3 +-
.../alerter/impl/DbAlertStoreHandlerImpl.java | 8 +-
.../impl/DingTalkRobotAlertNotifyHandlerImpl.java | 20 +-
.../impl/DiscordBotAlertNotifyHandlerImpl.java | 3 +-
.../alerter/impl/EmailAlertNotifyHandlerImpl.java | 25 +-
.../impl/FlyBookAlertNotifyHandlerImpl.java | 29 +-
.../alerter/impl/GotifyAlertNotifyHandlerImpl.java | 18 +-
.../impl/HuaweiCloudSmnAlertNotifyHandlerImpl.java | 7 +-
.../impl/ServerChanAlertNotifyHandlerImpl.java | 23 +-
.../alerter/impl/SlackAlertNotifyHandlerImpl.java | 4 +-
.../alerter/impl/SmsAlertNotifyHandlerImpl.java | 5 +-
.../impl/TelegramBotAlertNotifyHandlerImpl.java | 7 +-
.../alerter/impl/WeChatAlertNotifyHandlerImpl.java | 26 +-
.../impl/WeWorkAppAlertNotifyHandlerImpl.java | 19 +-
.../impl/WeWorkRobotAlertNotifyHandlerImpl.java | 26 +-
.../impl/WebHookAlertNotifyHandlerImpl.java | 5 +-
.../manager/component/status/CalculateStatus.java | 47 +-
.../manager/config/AngularErrorViewResolver.java | 11 +-
.../manager/config/CommonCommandLineRunner.java | 9 +-
.../manager/config/HeaderRequestInterceptor.java | 7 +-
.../hertzbeat/manager/config/JpaAuditorConfig.java | 3 +-
.../manager/config/RestTemplateConfig.java | 7 +-
.../manager/config/SecurityCorsConfiguration.java | 3 +-
.../manager/controller/AccountController.java | 33 +-
.../manager/controller/AppController.java | 62 +-
.../manager/controller/CollectorController.java | 34 +-
.../controller/GeneralConfigController.java | 28 +-
.../manager/controller/I18nController.java | 14 +-
.../manager/controller/MetricsController.java | 18 +-
.../manager/controller/MonitorController.java | 52 +-
.../manager/controller/MonitorsController.java | 92 +-
.../manager/controller/NoticeConfigController.java | 67 +-
.../manager/controller/StatusPageController.java | 19 +-
.../controller/StatusPagePublicController.java | 13 +-
.../manager/controller/SummaryController.java | 13 +-
.../manager/controller/TagController.java | 64 +-
.../apache/hertzbeat/manager/dao/CollectorDao.java | 3 +-
.../manager/dao/CollectorMonitorBindDao.java | 7 +-
.../hertzbeat/manager/dao/GeneralConfigDao.java | 6 +-
.../apache/hertzbeat/manager/dao/MonitorDao.java | 43 +-
.../hertzbeat/manager/dao/NoticeReceiverDao.java | 2 +-
.../hertzbeat/manager/dao/NoticeRuleDao.java | 5 +-
.../hertzbeat/manager/dao/NoticeTemplateDao.java | 1 -
.../org/apache/hertzbeat/manager/dao/ParamDao.java | 19 +-
.../hertzbeat/manager/dao/ParamDefineDao.java | 9 +-
.../manager/dao/StatusPageComponentDao.java | 3 +-
.../manager/dao/StatusPageHistoryDao.java | 3 +-
.../org/apache/hertzbeat/manager/dao/TagDao.java | 9 +-
.../hertzbeat/manager/dao/TagMonitorBindDao.java | 3 +-
.../nativex/HertzbeatRuntimeHintsRegistrar.java | 5 +-
.../hertzbeat/manager/pojo/dto/AppCount.java | 19 +-
.../manager/pojo/dto/ComponentStatus.java | 3 +-
.../hertzbeat/manager/pojo/dto/Dashboard.java | 4 +-
.../manager/pojo/dto/EmailNoticeSender.java | 22 +-
.../apache/hertzbeat/manager/pojo/dto/FileDTO.java | 5 +-
.../hertzbeat/manager/pojo/dto/Hierarchy.java | 10 +-
.../hertzbeat/manager/pojo/dto/LoginDto.java | 23 +-
.../manager/pojo/dto/MonitorDefineDto.java | 8 +-
.../hertzbeat/manager/pojo/dto/MonitorDto.java | 14 +-
.../pojo/dto/ObjectStoreConfigChangeEvent.java | 3 +-
.../hertzbeat/manager/pojo/dto/ObjectStoreDTO.java | 15 +-
.../hertzbeat/manager/pojo/dto/ParamDefineDto.java | 6 +-
.../manager/pojo/dto/RefreshTokenResponse.java | 2 +-
.../hertzbeat/manager/pojo/dto/SystemConfig.java | 2 -
.../hertzbeat/manager/pojo/dto/TemplateConfig.java | 3 +-
.../hertzbeat/manager/scheduler/AssignJobs.java | 7 +-
.../manager/scheduler/CollectJobScheduling.java | 32 +-
.../scheduler/CollectorAndJobScheduler.java | 31 +-
.../manager/scheduler/ConsistentHash.java | 107 ++-
.../hertzbeat/manager/scheduler/SchedulerInit.java | 17 +-
.../manager/scheduler/netty/ManageServer.java | 11 +-
.../CollectOneTimeDataResponseProcessor.java | 5 +-
.../hertzbeat/manager/service/AppService.java | 32 +-
.../manager/service/AvailableAlertDefineInit.java | 7 +-
.../manager/service/CollectorService.java | 3 +-
.../manager/service/GeneralConfigService.java | 9 +-
.../hertzbeat/manager/service/ImExportService.java | 15 +-
.../hertzbeat/manager/service/MailService.java | 16 +-
.../hertzbeat/manager/service/MonitorService.java | 106 +-
.../manager/service/NoticeConfigService.java | 78 +-
.../manager/service/NoticeDispatchService.java | 1 -
.../manager/service/ObjectStoreService.java | 24 +-
.../manager/service/StatusPageService.java | 3 +-
.../hertzbeat/manager/service/TagService.java | 12 +-
.../impl/AbstractGeneralConfigServiceImpl.java | 17 +-
.../service/impl/AbstractImExportServiceImpl.java | 50 +-
.../manager/service/impl/AppServiceImpl.java | 61 +-
.../manager/service/impl/CollectorServiceImpl.java | 5 +-
.../service/impl/ExcelImExportServiceImpl.java | 75 +-
.../service/impl/JsonImExportServiceImpl.java | 8 +-
.../service/impl/MailGeneralConfigServiceImpl.java | 14 +-
.../manager/service/impl/MailServiceImpl.java | 22 +-
.../manager/service/impl/MonitorServiceImpl.java | 148 ++-
.../service/impl/NoticeConfigServiceImpl.java | 32 +-
.../service/impl/ObjectStoreConfigServiceImpl.java | 25 +-
.../service/impl/ObsObjectStoreServiceImpl.java | 10 +-
.../service/impl/StatusPageServiceImpl.java | 23 +-
.../impl/SystemGeneralConfigServiceImpl.java | 14 +-
.../manager/service/impl/TagServiceImpl.java | 13 +-
.../service/impl/TemplateConfigServiceImpl.java | 10 +-
.../service/impl/YamlImExportServiceImpl.java | 27 +-
.../manager/support/GlobalExceptionHandler.java | 41 +-
.../support/exception/AlertNoticeException.java | 1 -
.../exception/MonitorDatabaseException.java | 1 -
.../support/exception/MonitorDetectException.java | 1 -
.../support/exception/MonitorMetricsException.java | 1 -
manager/src/main/resources/application-test.yml | 11 +-
manager/src/main/resources/application.yml | 20 +-
.../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 | 76 +-
.../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 | 121 +--
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 | 77 +-
manager/src/main/resources/define/app-hadoop.yml | 52 -
.../src/main/resources/define/app-hbase_master.yml | 265 +++++
.../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 | 76 +-
manager/src/main/resources/define/app-http_sd.yml | 21 +-
.../main/resources/define/app-huawei_switch.yml | 78 +-
.../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 | 38 +-
manager/src/main/resources/define/app-tomcat.yml | 46 -
.../main/resources/define/app-tplink_switch.yml | 78 +-
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 | 11 +-
.../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/controller/MonitorControllerTest.java | 2 +-
.../manager/controller/TagControllerTest.java | 4 +-
.../apache/hertzbeat/manager/dao/ParamDaoTest.java | 4 +-
.../apache/hertzbeat/manager/dao/TagDaoTest.java | 4 +-
.../manager/service/MonitorServiceTest.java | 51 +-
material/licenses/backend/LICENSE | 15 +-
material/licenses/backend/LICENSE-aviator.txt | 165 ----
....annotation-api.txt => LICENSE-eclipselink.txt} | 0
.../LICENSE-hibernate-commons-annotations.txt | 502 ----------
.../licenses/backend/LICENSE-hibernate-core.txt | 502 ----------
...api.txt => LICENSE-org.eclipse.persistence.txt} | 0
pom.xml | 14 +-
push/pom.xml | 5 -
.../hertzbeat/push/controller/PushController.java | 10 +-
.../push/controller/PushGatewayController.java | 5 +-
.../hertzbeat/push/service/PushGatewayService.java | 3 +-
.../apache/hertzbeat/push/service/PushService.java | 2 +-
.../push/service/impl/PushGatewayServiceImpl.java | 7 +-
.../push/service/impl/PushServiceImpl.java | 13 +-
.../apache/hertzbeat/remoting/RemotingClient.java | 6 +-
.../apache/hertzbeat/remoting/RemotingServer.java | 9 +-
.../remoting/netty/NettyRemotingAbstract.java | 7 +-
.../remoting/netty/NettyRemotingClient.java | 3 +-
.../remoting/netty/NettyRemotingServer.java | 5 +-
.../hertzbeat/remoting/netty/ResponseFuture.java | 3 +-
script/assembly/collector/assembly-linux-amd64.xml | 9 +
script/assembly/collector/assembly-linux-arm64.xml | 9 +
script/assembly/collector/assembly-macos-amd64.xml | 9 +
script/assembly/collector/assembly-macos-arm64.xml | 9 +
script/assembly/collector/assembly-windows-64.xml | 9 +
script/assembly/collector/assembly.xml | 10 +-
script/assembly/collector/bin/entrypoint.sh | 6 +-
script/assembly/collector/bin/startup.bat | 8 +-
script/assembly/collector/bin/startup.sh | 8 +-
script/assembly/server/assembly-linux-amd64.xml | 9 +
script/assembly/server/assembly-linux-arm64.xml | 9 +
script/assembly/server/assembly-macos-amd64.xml | 9 +
script/assembly/server/assembly-macos-arm64.xml | 9 +
script/assembly/server/assembly-windows-64.xml | 9 +
script/assembly/server/assembly.xml | 9 +
script/assembly/server/bin/entrypoint.sh | 6 +-
script/assembly/server/bin/startup.bat | 8 +-
script/assembly/server/bin/startup.sh | 10 +-
script/checkstyle/checkstyle.xml | 122 ++-
.../spring.factories => script/ext-lib/README | 7 +-
warehouse/pom.xml | 10 -
.../hertzbeat/warehouse/WarehouseWorkerPool.java | 5 +-
.../config/WarehouseAutoConfiguration.java | 2 -
.../warehouse/config/WarehouseProperties.java | 786 ---------------
.../warehouse/config/entrance/KafkaProperties.java | 29 +-
.../warehouse/config/store/StoreProperties.java | 44 +
.../config/store/greptime/GreptimeProperties.java | 17 +-
.../config/store/influxdb/InfluxdbProperties.java | 17 +-
.../config/store/iotdb/IotDbProperties.java | 48 +
.../config/{ => store/iotdb}/IotDbVersion.java | 2 +-
.../warehouse/config/store/jpa/JpaProperties.java | 31 +-
.../config/store/memory/MemoryProperties.java | 17 +-
.../config/store/redis/RedisProperties.java | 16 +-
.../config/store/tdengine/TdEngineProperties.java | 38 +
.../config/store/vm/VictoriaMetricsProperties.java | 15 +-
.../controller/MetricsDataController.java | 24 +-
.../warehouse/service/WarehouseService.java | 3 +-
.../warehouse/service/WarehouseServiceImpl.java | 5 +-
.../store/AbstractHistoryDataStorage.java | 7 +-
.../store/AbstractRealTimeDataStorage.java | 5 +-
.../warehouse/store/DataStorageDispatch.java | 5 +-
.../store/HistoryGrepTimeDbDataStorage.java | 84 +-
.../store/HistoryInfluxdbDataStorage.java | 49 +-
.../warehouse/store/HistoryIotDbDataStorage.java | 83 +-
.../store/HistoryJpaDatabaseDataStorage.java | 97 +-
.../store/HistoryTdEngineDataStorage.java | 82 +-
.../store/HistoryVictoriaMetricsDataStorage.java | 94 +-
.../warehouse/store/MetricsDataRedisCodec.java | 5 +-
.../warehouse/store/RealTimeMemoryDataStorage.java | 21 +-
.../warehouse/store/RealTimeRedisDataStorage.java | 39 +-
web-app/src/app/pojo/Param.ts | 2 +-
web-app/src/app/pojo/Tag.ts | 2 +-
.../alert/alert-center/alert-center.component.ts | 4 +-
.../alert-converge/alert-converge.component.ts | 4 +-
.../alert/alert-notice/alert-notice.component.ts | 4 +-
.../alert-setting/alert-setting.component.html | 6 +-
.../alert/alert-setting/alert-setting.component.ts | 4 +-
.../alert/alert-silence/alert-silence.component.ts | 4 +-
.../monitor-detail/monitor-detail.component.ts | 2 +-
.../monitor-edit/monitor-edit.component.html | 36 +-
.../monitor/monitor-edit/monitor-edit.component.ts | 44 +-
.../monitor/monitor-new/monitor-new.component.html | 36 +-
.../monitor/monitor-new/monitor-new.component.ts | 36 +-
.../app/routes/setting/status/status.component.ts | 4 +-
.../app/routes/setting/tags/tags.component.html | 10 +-
.../src/app/routes/setting/tags/tags.component.ts | 4 +-
web-app/src/app/shared/utils/common-util.ts | 4 +-
562 files changed, 11270 insertions(+), 10813 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
delete mode 100644
common/src/main/java/org/apache/hertzbeat/common/config/AviatorConfiguration.java
create mode 100644
common/src/main/java/org/apache/hertzbeat/common/config/EclipseLinkCustomizer.java
create mode 100644
common/src/main/java/org/apache/hertzbeat/common/config/EclipseLinkJpaConfiguration.java
copy
common/src/main/java/org/apache/hertzbeat/common/entity/manager/{JsonOptionListAttributeConverter.java
=> ZonedDateTimeAttributeConverter.java} (58%)
create mode 100644
common/src/main/java/org/apache/hertzbeat/common/util/JexlCommonFunction.java
create mode 100644
common/src/main/java/org/apache/hertzbeat/common/util/JexlExpressionRunner.java
delete mode 100644
common/src/test/java/org/apache/hertzbeat/common/config/AviatorConfigurationTest.java
create mode 100644
common/src/test/java/org/apache/hertzbeat/common/util/JexlTest.java
create mode 100644 home/docs/help/clickhouse.md
create mode 100644 home/docs/help/debian.md
create mode 100644 home/docs/help/dns.md
create mode 100644 home/docs/help/elasticsearch.md
create mode 100644 home/docs/help/ftp.md
create mode 100644 home/docs/help/hbase_master.md
create mode 100644 home/docs/help/hbase_regionserver.md
create mode 100644 home/docs/help/huawei_switch.md
create mode 100644 home/docs/help/mongodb.md
create mode 100644 home/docs/help/nacos.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/tidb.md
create mode 100644 home/docs/help/udp_port.md
delete mode 100644 home/docs/others/developer.md
create mode 100644
home/i18n/zh-cn/docusaurus-plugin-content-docs/current/help/clickhouse.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/dns.md
copy home/{docs =>
i18n/zh-cn/docusaurus-plugin-content-docs/current}/help/doris_fe.md (88%)
create mode 100644
home/i18n/zh-cn/docusaurus-plugin-content-docs/current/help/elasticsearch.md
create mode 100644
home/i18n/zh-cn/docusaurus-plugin-content-docs/current/help/ftp.md
create mode 100644
home/i18n/zh-cn/docusaurus-plugin-content-docs/current/help/hbase_master.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/huawei_switch.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/nacos.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/tidb.md
create mode 100644
home/i18n/zh-cn/docusaurus-plugin-content-docs/current/help/udp_port.md
delete mode 100644
home/i18n/zh-cn/docusaurus-plugin-content-docs/current/others/developer.md
mode change 100644 => 100755 home/sidebars.json
create mode 100644 home/src/pages/team/github.svg
create mode 100644 home/src/pages/team/index.css
create mode 100644 home/src/pages/team/index.jsx
create mode 100644 home/src/pages/team/member.json
create mode 100644 manager/src/main/resources/define/app-hbase_master.yml
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 material/licenses/backend/LICENSE-aviator.txt
copy material/licenses/backend/{LICENSE-jakarta.annotation-api.txt =>
LICENSE-eclipselink.txt} (100%)
delete mode 100644
material/licenses/backend/LICENSE-hibernate-commons-annotations.txt
delete mode 100644 material/licenses/backend/LICENSE-hibernate-core.txt
copy material/licenses/backend/{LICENSE-jakarta.annotation-api.txt =>
LICENSE-org.eclipse.persistence.txt} (100%)
copy common/src/main/resources/META-INF/spring.factories =>
script/ext-lib/README (86%)
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]
