This is an automated email from the ASF dual-hosted git repository. zhaoqingran pushed a commit to branch bugfix-bulletin in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
commit 0a36b3df90aae6eb18d149b31fb7cc9b61a146a7 Merge: f3202133d 163a5a05e Author: Logic <[email protected]> AuthorDate: Tue Sep 24 11:20:58 2024 +0800 Merge branch 'master' of github.com:apache/hertzbeat .devcontainer/devcontainer.json | 76 +- .gitpod.yml | 106 +- README.md | 19 - README_CN.md | 19 - collector/collector-basic/pom.xml | 147 + .../collect/database/JdbcCommonCollect.java | 0 .../collector/collect/database/JdbcSpiLoader.java | 0 .../collector/collect/dns/DnsCollectImpl.java | 0 .../collector/collect/ftp/FtpCollectImpl.java | 0 .../collector/collect/http/HttpCollectImpl.java | 0 .../collect/http/SslCertificateCollectImpl.java | 0 .../http/promethus/AbstractPrometheusParse.java | 0 .../collect/http/promethus/ParseException.java | 0 .../http/promethus/PrometheusLastParser.java | 0 .../http/promethus/PrometheusMatrixParser.java | 0 .../http/promethus/PrometheusParseCreator.java | 0 .../http/promethus/PrometheusVectorParser.java | 0 .../http/promethus/exporter/ExporterParser.java | 0 .../http/promethus/exporter/MetricFamily.java | 0 .../http/promethus/exporter/MetricType.java | 0 .../collector/collect/httpsd/HttpsdImpl.java | 0 .../constant/DiscoveryClientHealthStatus.java | 0 .../httpsd/constant/DiscoveryClientInstance.java | 0 .../collect/httpsd/discovery/DiscoveryClient.java | 0 .../discovery/DiscoveryClientManagement.java | 0 .../httpsd/discovery/entity/ConnectConfig.java | 0 .../httpsd/discovery/entity/ServerInfo.java | 0 .../httpsd/discovery/entity/ServiceInstance.java | 0 .../discovery/impl/ConsulDiscoveryClient.java | 0 .../discovery/impl/NacosDiscoveryClient.java | 0 .../collector/collect/icmp/IcmpCollectImpl.java | 0 .../collector/collect/imap/ImapCollectImpl.java | 0 .../collector/collect/jmx/JmxClassLoader.java | 0 .../collector/collect/jmx/JmxCollectImpl.java | 0 .../collect/memcached/MemcachedCollectImpl.java | 0 .../collector/collect/mqtt/MqttCollectImpl.java | 0 .../collector/collect/nginx/NginxCollectImpl.java | 0 .../collector/collect/ntp/NtpCollectImpl.java | 0 .../collector/collect/pop3/Pop3CollectImpl.java | 0 .../prometheus/PrometheusAutoCollectImpl.java | 0 .../collect/prometheus/parser/MetricFamily.java | 0 .../collect/prometheus/parser/TextParser.java | 0 .../collector/collect/push/PushCollectImpl.java | 0 .../collector/collect/redfish/ConnectSession.java | 0 .../collector/collect/redfish/RedfishClient.java | 0 .../collect/redfish/RedfishCollectImpl.java | 2 +- .../collect/redfish/RedfishCollectionSchema.java | 0 .../collect/redfish/RedfishConnectSession.java | 0 .../collector/collect/redfish/Session.java | 0 .../collect/redfish}/cache/RedfishConnect.java | 3 +- .../collect/redis/RedisCommonCollectImpl.java | 0 .../collect/script/ScriptCollectImpl.java | 0 .../collector/collect/smtp/SmtpCollectImpl.java | 0 .../collector/collect/snmp/SnmpCollectImpl.java | 0 .../collector/collect/ssh/SshCollectImpl.java | 0 .../collect/telnet/TelnetCollectImpl.java | 0 .../collector/collect/udp/UdpCollectImpl.java | 0 .../collect/websocket/WebsocketCollectImpl.java | 0 .../collect/common/cache/CommonCacheTest.java | 1 + .../collect/common/http/CommonHttpClientTest.java | 0 .../collect/common/ssh/CommonSshClientTest.java | 0 .../collect/database/JdbcCommonCollectTest.java | 0 .../collect/database/JdbcSpiLoaderTest.java | 0 .../collector/collect/dns/DnsCollectImplTest.java | 0 .../collector/collect/ftp/FtpCollectImplTest.java | 0 .../collect/http/HttpCollectImplTest.java | 0 .../http/SslCertificateCollectImplTest.java | 0 .../promethus/exporter/ExporterParserTest.java | 0 .../collector/collect/httpsd/HttpsdImplTest.java | 0 .../collect/icmp/IcmpCollectImplTest.java | 0 .../collect/imap/ImapCollectImplTest.java | 0 .../collector/collect/jmx/JmxCollectImplTest.java | 0 .../memcached/MemcachedCollectImplTest.java | 0 .../collector/collect/mqtt/MqttCollectTest.java | 18 +- .../collect/nginx/NginxCollectImplTest.java | 0 .../collector/collect/ntp/NtpCollectImplTest.java | 0 .../collect/pop3/Pop3CollectImplTest.java | 0 .../collect/push/PushCollectImplTest.java | 0 .../collect/redfish/RedfishCollectImplTest.java | 0 .../collect/redis/RedisClusterCollectImplTest.java | 0 .../collect/redis/RedisSingleCollectImplTest.java | 0 .../collect/script/ScriptCollectImplTest.java | 0 .../collect/smtp/SmtpCollectImplTest.java | 0 .../collect/snmp/SnmpCollectImplTest.java | 0 .../collector/collect/ssh/SshCollectImplTest.java | 0 .../collect/telnet/TelnetCollectImplTest.java | 0 .../collector/collect/udp/UdpCollectImplTest.java | 0 .../websocket/WebsocketCollectImplTest.java | 0 .../collector/dispatch/CommonDispatcherTest.java | 147 + .../dispatch/MetricsCollectorQueueTest.java | 68 + .../collector/dispatch/WorkerPoolTest.java | 0 .../dispatch/entrance/CollectServerTest.java | 0 .../entrance/internal/CollectJobServiceTest.java | 0 .../dispatch/export/NettyDataQueueTest.java | 0 .../dispatch/unit/DataSizeConvertTest.java | 0 .../dispatch/unit/TimeLengthConvertTest.java | 0 .../hertzbeat/collector/util/CollectUtilTest.java | 0 .../collector/util/JsonPathParserTest.java | 0 .../collector/util/PrivateKeyUtilsTest.java | 0 .../collector/util/TimeExpressionUtilTest.java | 0 collector/collector-common/pom.xml | 88 + .../collector/collect/AbstractCollect.java | 0 .../collect/common/cache/AbstractConnection.java | 0 .../collect/common/cache/CacheIdentifier.java | 0 .../common/cache/ConnectionCommonCache.java | 0 .../collect/common/cache/JdbcConnect.java | 0 .../collector/collect/common/cache/JmxConnect.java | 0 .../collect/common/cache/RedisConnect.java | 0 .../collector/collect/common/cache/SshConnect.java | 0 .../collect/common/http/CommonHttpClient.java | 0 .../collect/common/ssh/CommonSshBlacklist.java | 0 .../collect/common/ssh/CommonSshClient.java | 0 .../config/CollectorAutoConfiguration.java | 0 .../collector/constants/CollectorConstants.java | 0 .../collector/dispatch/CollectDataDispatch.java | 3 +- .../dispatch/CollectorInfoProperties.java | 0 .../collector/dispatch/DispatchConstants.java | 5 + .../collector/dispatch/DispatchProperties.java | 0 .../collector/dispatch/MetricsTaskDispatch.java | 0 .../hertzbeat/collector/dispatch/WorkerPool.java | 7 +- .../collector/dispatch/entrance/CollectServer.java | 9 +- .../entrance/internal/CollectJobService.java | 13 +- .../internal/CollectResponseEventListener.java | 3 +- .../processor/CollectCyclicDataProcessor.java | 0 .../processor/CollectOneTimeDataProcessor.java | 0 .../processor/DeleteCyclicTaskProcessor.java | 3 +- .../entrance/processor/GoCloseProcessor.java | 0 .../entrance/processor/GoOfflineProcessor.java | 0 .../entrance/processor/GoOnlineProcessor.java | 0 .../entrance/processor/HeartbeatProcessor.java | 0 .../collector/dispatch/export/NettyDataQueue.java | 0 .../collector/dispatch/timer/HashedWheelTimer.java | 7 +- .../collector/dispatch/timer/Timeout.java | 0 .../hertzbeat/collector/dispatch/timer/Timer.java | 0 .../collector/dispatch/timer/TimerDispatch.java | 5 +- .../collector/dispatch/timer/TimerDispatcher.java | 11 +- .../collector/dispatch/timer/TimerTask.java | 0 .../collector/dispatch/timer/WheelTimerTask.java | 9 +- .../collector/dispatch/unit/DataUnit.java | 0 .../collector/dispatch/unit/TimeLengthUnit.java | 0 .../collector/dispatch/unit/UnitConvert.java | 0 .../dispatch/unit/impl/AbstractUnitConvert.java | 1 + .../dispatch/unit/impl/DataSizeConvert.java | 1 + .../dispatch/unit/impl/TimeLengthConvert.java | 1 + .../hertzbeat/collector/util/CollectUtil.java | 13 +- .../hertzbeat/collector/util/JsonPathParser.java | 3 +- .../hertzbeat/collector/util/PrivateKeyUtils.java | 5 +- .../collector/util/TimeExpressionUtil.java | 3 +- collector/collector-kafka/pom.xml | 50 + .../collector/collect/kafka/KafkaCollectImpl.java | 210 + .../collector/collect/kafka/KafkaConnect.java | 64 + .../collector/collect/kafka/SupportedCommand.java | 63 + .../collector/collect/kafka/KafkaCollectTest.java} | 55 +- collector/collector-mongodb/pom.xml | 49 + .../collector/collect/mongodb}/MongodbConnect.java | 3 +- .../collect/mongodb/MongodbSingleCollectImpl.java | 1 - .../collect/mongodb/MongoCollectImplTest.java | 8 +- collector/collector-nebulagraph/pom.xml | 60 + .../nebulagraph/NebulaGraphCollectImpl.java | 0 .../collect/nebulagraph/NebulaTemplate.java | 0 .../collect/nebulagraph/NgqlCollectImpl.java | 0 .../nebulagraph/NebulaGraphCollectImplTest.java | 7 +- .../collect/nebulagraph/NgqlCollectImplTest.java | 19 +- collector/collector-rocketmq/pom.xml | 50 + .../collect/rocketmq}/RocketmqCollectData.java | 2 +- .../rocketmq}/RocketmqSingleCollectImpl.java | 4 +- .../rocketmq}/RocketmqSingleCollectTest.java | 2 +- collector/{ => collector}/pom.xml | 235 +- .../org/apache/hertzbeat/collector/Collector.java | 0 .../collect/strategy/CollectStrategyFactory.java | 1 + .../config/CollectorAutoConfiguration.java | 0 .../collector/dispatch/CommonDispatcher.java | 25 +- .../collector/dispatch/MetricsCollect.java | 3 +- .../collector/dispatch/MetricsCollectorQueue.java | 3 +- ...che.hertzbeat.collector.collect.AbstractCollect | 3 +- ...rk.boot.autoconfigure.AutoConfiguration.imports | 0 .../src/main/resources/application.yml | 2 +- .../{ => collector}/src/main/resources/banner.txt | 0 .../src/main/resources/logback-spring.xml | 0 collector/pom.xml | 469 +- .../collector/dispatch/CommonDispatcherTest.java | 147 - .../dispatch/MetricsCollectorQueueTest.java | 68 - .../hertzbeat/common/entity/job/Metrics.java | 7 + .../protocol/KafkaProtocol.java} | 33 +- .../entity/manager/{bulletin => }/Bulletin.java | 17 +- .../manager/JsonMapListAttributeConverter.java | 31 +- home/blog/2024-09-10-new-committer.md | 48 + home/docs/help/kafka_client.md | 47 + .../2024-09-10-new-committer.md | 48 + .../current/help/kafka_client.md | 47 + home/static/img/home/1.png | Bin 1415895 -> 1421873 bytes home/static/img/home/2.png | Bin 1278829 -> 1261602 bytes manager/pom.xml | 2 +- .../impl/DingTalkRobotAlertNotifyHandlerImpl.java | 2 +- .../impl/WeComRobotAlertNotifyHandlerImpl.java | 2 +- ...mmandLineRunner.java => ConfigInitializer.java} | 52 +- .../manager/controller/AccountController.java | 13 +- .../manager/controller/BulletinController.java | 85 +- .../apache/hertzbeat/manager/dao/BulletinDao.java | 2 +- .../manager/pojo/dto}/BulletinMetricsData.java | 2 +- .../hertzbeat/manager/pojo/dto/TokenDto.java | 48 +- .../hertzbeat/manager/service/BulletinService.java | 54 +- .../manager/service/impl/BulletinServiceImpl.java | 150 +- .../manager/service/impl/PluginServiceImpl.java | 18 +- .../manager/service/impl/TagServiceImpl.java | 9 + .../define/{hugegraph.yml => app-hugegraph.yml} | 0 .../src/main/resources/define/app-kafka_client.yml | 168 + manager/src/main/resources/define/app-tidb.yml | 640 +- .../manager/controller/AccountControllerTest.java | 6 +- .../manager/controller/BulletinControllerTest.java | 71 +- .../manager/service/BulletinServiceTest.java | 70 +- .../hertzbeat/manager/service/TagServiceTest.java | 34 +- material/licenses/LICENSE | 60 +- material/licenses/backend/LICENSE | 11 +- material/licenses/frontend/LICENSE | 49 +- .../frontend/LICENSE-ngx-query-builder.txt | 21 + plugin/src/main/resources/define/define.yml | 28 +- pom.xml | 22 +- script/assembly/collector/assembly.xml | 10 +- script/release/release-win.ps1 | 87 + .../app/layout/basic/widgets/notify.component.ts | 15 +- .../alert-setting/alert-setting.component.less | 116 +- .../app/routes/bulletin/bulletin.component.html | 22 +- .../src/app/routes/bulletin/bulletin.component.ts | 121 +- .../monitor-form/monitor-form.component.html | 2 +- web-app/src/app/service/auth.service.ts | 7 +- web-app/src/app/service/bulletin-define.service.ts | 36 +- .../monitor-select-menu.component.less | 62 +- .../multi-func-input.component.less | 48 +- .../tags-select/tags-select.component.less | 8 +- .../tags-select/tags-select.component.ts | 6 +- .../components/toolbar/toolbar.component.less | 40 +- web-app/src/app/shared/constants.ts | 2 +- web-app/src/assets/i18n/en-US.json | 22 +- web-app/yarn.lock | 24226 +++++++++---------- 235 files changed, 14847 insertions(+), 14279 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
