This is an automated email from the ASF dual-hosted git repository. zhaoqingran pushed a commit to branch bugfix-oom in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
commit a0b41dc7bb25233d3b21801b15c41cc581dc814c Merge: 3f572a1ddc 12d1f4990d Author: Logic <[email protected]> AuthorDate: Fri Dec 27 08:24:42 2024 +0800 Merge branch 'master' of github.com:apache/hertzbeat .all-contributorsrc | 54 + .github/ISSUE_TEMPLATE/feature-request.yml | 2 +- .github/ISSUE_TEMPLATE/task.yml | 2 +- .github/ISSUE_TEMPLATE/volunteer.yml | 2 +- .github/workflows/backend-build-test-reuse.yml | 71 - .github/workflows/backend-build-test.yml | 44 +- CONTRIBUTING.md | 9 +- README.md | 10 +- README_CN.md | 10 +- SECURITY.md | 15 +- hertzbeat-alerter/pom.xml | 8 + .../hertzbeat/alert/calculate/CalculateAlarm.java | 161 +- .../hertzbeat-collector-basic/pom.xml | 14 +- .../collect/database/JdbcCommonCollect.java | 28 +- .../collector/collect/dns/DnsCollectImpl.java | 8 +- .../collector/collect/ftp/FtpCollectImpl.java | 8 +- .../collector/collect/http/HttpCollectImpl.java | 100 +- .../collect/http/SslCertificateCollectImpl.java | 20 +- .../http/promethus/PrometheusLastParser.java | 2 +- .../http/promethus/PrometheusMatrixParser.java | 14 +- .../http/promethus/PrometheusVectorParser.java | 14 +- .../collector/collect/icmp/IcmpCollectImpl.java | 8 +- .../collector/collect/imap/ImapCollectImpl.java | 6 +- .../collector/collect/ipmi2/IpmiCollectImpl.java | 2 +- .../ipmi2/client/handler/ChassisHandler.java | 6 +- .../ipmi2/client/handler/SensorHandler.java | 6 +- .../collector/collect/jmx/JmxCollectImpl.java | 6 +- .../collect/memcached/MemcachedCollectImpl.java | 6 +- .../collect/modbus/ModbusCollectImpl.java | 86 + .../collector/collect/mqtt/MqttCollectImpl.java | 8 +- .../collector/collect/nginx/NginxCollectImpl.java | 16 +- .../collector/collect/ntp/NtpCollectImpl.java | 8 +- .../collect/plc/AbstractPlcCollectImpl.java | 185 + .../collector/collect/pop3/Pop3CollectImpl.java | 10 +- .../prometheus/PrometheusAutoCollectImpl.java | 10 +- .../collector/collect/push/PushCollectImpl.java | 10 +- .../collect/redfish/RedfishCollectImpl.java | 8 +- .../collect/redis/RedisCommonCollectImpl.java | 8 +- .../collector/collect/registry/RegistryImpl.java | 10 +- .../collect/script/ScriptCollectImpl.java | 28 +- .../collector/collect/sd/HttpSdCollectImpl.java | 116 + .../collector/collect/smtp/SmtpCollectImpl.java | 6 +- .../collector/collect/snmp/SnmpCollectImpl.java | 14 +- .../collector/collect/ssh/SshCollectImpl.java | 28 +- .../collect/telnet/TelnetCollectImpl.java | 7 +- .../collector/collect/udp/UdpCollectImpl.java | 8 +- .../collect/websocket/WebsocketCollectImpl.java | 6 +- .../collect/database/JdbcCommonCollectTest.java | 6 +- .../collector/collect/dns/DnsCollectImplTest.java | 6 +- .../collector/collect/ftp/FtpCollectImplTest.java | 4 +- .../collect/http/HttpCollectImplTest.java | 4 +- .../collect/icmp/IcmpCollectImplTest.java | 10 +- .../collect/imap/ImapCollectImplTest.java | 4 +- .../collector/collect/jmx/JmxCollectImplTest.java | 2 +- .../memcached/MemcachedCollectImplTest.java | 2 +- .../collect/modbus/ModbusCollectTest.java | 227 + .../collector/collect/mqtt/MqttCollectTest.java | 4 +- .../collect/nginx/NginxCollectImplTest.java | 6 +- .../collector/collect/ntp/NtpCollectImplTest.java | 2 +- .../collector/collect/plc/PlcCollectTest.java | 253 ++ .../collect/pop3/Pop3CollectImplTest.java | 2 +- .../collect/push/PushCollectImplTest.java | 2 +- .../collect/redfish/RedfishCollectImplTest.java | 4 +- .../collect/redis/RedisClusterCollectImplTest.java | 2 +- .../collect/redis/RedisSingleCollectImplTest.java | 4 +- .../collect/registry/RegistryImplTest.java | 6 +- .../collect/script/ScriptCollectImplTest.java | 6 +- .../collect/smtp/SmtpCollectImplTest.java | 2 +- .../collect/snmp/SnmpCollectImplTest.java | 2 +- .../collector/collect/ssh/SshCollectImplTest.java | 2 +- .../collect/telnet/TelnetCollectImplTest.java | 4 +- .../collector/collect/udp/UdpCollectImplTest.java | 6 +- .../websocket/WebsocketCollectImplTest.java | 2 +- .../collector/dispatch/CommonDispatcherTest.java | 147 - .../dispatch/MetricsCollectorQueueTest.java | 68 - .../collector/dispatch/CommonDispatcher.java | 66 +- .../collector/dispatch/MetricsCollect.java | 54 +- ...che.hertzbeat.collector.collect.AbstractCollect | 2 + .../collector/collect/AbstractCollect.java | 5 +- .../collector/dispatch/DispatchConstants.java | 18 + .../collector/dispatch/entrance/CollectServer.java | 3 +- .../entrance/internal/CollectJobService.java | 31 +- .../processor/CollectCyclicDataProcessor.java | 2 +- .../processor/CollectOneTimeDataProcessor.java | 2 +- .../processor/DeleteCyclicTaskProcessor.java | 2 +- .../entrance/processor/GoCloseProcessor.java | 2 +- .../entrance/processor/GoOfflineProcessor.java | 5 +- .../entrance/processor/GoOnlineProcessor.java | 3 +- .../collector/dispatch/export/NettyDataQueue.java | 14 +- .../collector/collect/kafka/KafkaCollectImpl.java | 253 +- .../collector/collect/kafka/KafkaConnect.java | 8 +- .../InternalTopic.java} | 24 +- .../kafka/{ => constants}/SupportedCommand.java | 5 +- .../collector/collect/kafka/KafkaCollectTest.java | 4 +- .../collect/mongodb/MongodbSingleCollectImpl.java | 10 +- .../collect/mongodb/MongoCollectImplTest.java | 2 +- .../nebulagraph/NebulaGraphCollectImpl.java | 6 +- .../collect/nebulagraph/NgqlCollectImpl.java | 14 +- .../nebulagraph/NebulaGraphCollectImplTest.java | 6 +- .../collect/nebulagraph/NgqlCollectImplTest.java | 8 +- .../rocketmq/RocketmqSingleCollectImpl.java | 8 +- .../rocketmq/RocketmqSingleCollectTest.java | 4 +- hertzbeat-common/pom.xml | 9 + .../org/apache/arrow/vector/table/ArrowTable.java | 107 + .../hertzbeat/common/config/CommonProperties.java | 13 + .../CollectCodeConstants.java} | 39 +- .../common/constants/CommonConstants.java | 33 + .../MetricDataConstants.java} | 39 +- .../NtpProtocol.java => arrow/ArrowCell.java} | 36 +- .../DefaultMetadataReader.java} | 50 +- .../MetadataReader.java} | 28 +- .../hertzbeat/common/entity/arrow/RowWrapper.java | 82 + .../apache/hertzbeat/common/entity/job/Job.java | 10 +- .../hertzbeat/common/entity/job/Metrics.java | 37 +- ...cmpProtocol.java => CommonRequestProtocol.java} | 27 +- .../common/entity/job/protocol/DnsProtocol.java | 7 +- .../common/entity/job/protocol/FtpProtocol.java | 2 +- .../common/entity/job/protocol/HttpProtocol.java | 2 +- .../common/entity/job/protocol/IcmpProtocol.java | 5 +- .../common/entity/job/protocol/ImapProtocol.java | 2 +- .../common/entity/job/protocol/IpmiProtocol.java | 2 +- .../common/entity/job/protocol/JdbcProtocol.java | 2 +- .../common/entity/job/protocol/JmxProtocol.java | 2 +- .../common/entity/job/protocol/KafkaProtocol.java | 7 +- .../entity/job/protocol/MemcachedProtocol.java | 2 +- .../{KafkaProtocol.java => ModbusProtocol.java} | 22 +- .../entity/job/protocol/MongodbProtocol.java | 2 +- .../common/entity/job/protocol/MqttProtocol.java | 2 +- .../entity/job/protocol/NebulaGraphProtocol.java | 2 +- .../common/entity/job/protocol/NginxProtocol.java | 2 +- .../common/entity/job/protocol/NgqlProtocol.java | 2 +- .../common/entity/job/protocol/NtpProtocol.java | 2 +- .../{KafkaProtocol.java => PlcProtocol.java} | 24 +- .../common/entity/job/protocol/Pop3Protocol.java | 2 +- .../entity/job/protocol/PrometheusProtocol.java | 2 +- .../common/entity/job/protocol/PushProtocol.java | 2 +- .../entity/job/protocol/RedfishProtocol.java | 2 +- .../common/entity/job/protocol/RedisProtocol.java | 2 +- .../entity/job/protocol/RegistryProtocol.java | 2 +- .../entity/job/protocol/RocketmqProtocol.java | 12 +- .../common/entity/job/protocol/ScriptProtocol.java | 13 +- .../common/entity/job/protocol/SmtpProtocol.java | 2 +- .../common/entity/job/protocol/SnmpProtocol.java | 2 +- .../common/entity/job/protocol/SshProtocol.java | 2 +- .../common/entity/job/protocol/TelnetProtocol.java | 2 +- .../common/entity/job/protocol/UdpProtocol.java | 2 +- .../entity/job/protocol/WebsocketProtocol.java | 2 +- .../hertzbeat/common/entity/manager/Monitor.java | 6 + .../manager/{Param.java => MonitorBind.java} | 78 +- .../hertzbeat/common/entity/manager/Param.java | 6 + .../SdMonitorParam.java} | 23 +- .../common/entity/message/ClusterMsg.java | 2760 ++++++------ .../common/entity/message/CollectRep.java | 4640 ++------------------ .../ConnectionConfig.java} | 20 +- .../ServiceDiscoveryProtocol.java} | 52 +- .../ServiceDiscoveryResponseEntity.java} | 15 +- .../hertzbeat/common/queue/CommonDataQueue.java | 30 +- .../common/queue/impl/InMemoryCommonDataQueue.java | 39 +- .../common/queue/impl/KafkaCommonDataQueue.java | 83 +- .../common/queue/impl/RedisCommonDataQueue.java | 87 +- .../serialize/KafkaMetricsDataDeserializer.java | 19 +- .../serialize/KafkaMetricsDataSerializer.java | 21 +- .../common/serialize/RedisMetricsDataCodec.java | 79 + .../apache/hertzbeat/common/util/ArrowUtil.java | 156 + .../hertzbeat/common/util/SdMonitorOperator.java | 159 + .../src/main/message/cluster_msg.proto | 18 +- .../src/main/message/collect_rep.proto | 77 - .../apache/arrow/vector/table/ArrowTableTest.java | 188 + .../queue/impl/InMemoryCommonDataQueueTest.java | 19 +- .../queue/impl/KafkaCommonDataQueueTest.java | 169 +- .../queue/impl/RedisCommonDataQueueTest.java | 80 +- .../KafkaMetricsDataDeserializerTest.java | 31 +- .../serialize/KafkaMetricsDataSerializerTest.java | 18 +- .../{ => hertzbeat-collector-basic-e2e}/pom.xml | 35 +- .../collect/basic/ssh/SshCollectE2eTest.java | 184 + .../collect/kafka/KafkaCollectE2eTest.java | 4 +- hertzbeat-e2e/pom.xml | 7 + .../grafana/service/DashboardService.java | 5 + hertzbeat-manager/pom.xml | 9 + .../component/sd/ServiceDiscoveryWorker.java | 160 + .../hertzbeat/manager/dao/MonitorBindDao.java | 52 +- .../hertzbeat/manager/pojo/dto/MonitorDto.java | 3 - .../manager/scheduler/CollectorJobScheduler.java | 13 +- .../manager/scheduler/ManagerWorkerPool.java | 62 + .../hertzbeat/manager/scheduler/SchedulerInit.java | 22 +- .../manager/scheduler/netty/ManageServer.java | 2 + .../CollectCyclicDataResponseProcessor.java | 12 +- ...clicServiceDiscoveryDataResponseProcessor.java} | 14 +- .../CollectOneTimeDataResponseProcessor.java | 22 +- .../netty/process/CollectorOnlineProcessor.java | 3 +- .../hertzbeat/manager/service/MonitorService.java | 3 + .../service/impl/AbstractImExportServiceImpl.java | 7 - .../manager/service/impl/AppServiceImpl.java | 4 +- .../manager/service/impl/BulletinServiceImpl.java | 4 +- .../service/impl/ExcelImExportServiceImpl.java | 5 - .../manager/service/impl/MonitorServiceImpl.java | 465 +- .../src/main/resources/application.yml | 7 +- .../src/main/resources/define/app-api.yml | 4 +- .../src/main/resources/define/app-clickhouse.yml | 2 +- .../src/main/resources/define/app-flink.yml | 10 +- .../src/main/resources/define/app-greptime.yml | 2 +- .../src/main/resources/define/app-influxdb.yml | 2 +- .../src/main/resources/define/app-kafka.yml | 6 +- .../src/main/resources/define/app-kafka_client.yml | 56 +- .../src/main/resources/define/app-mariadb.yml | 1 - .../src/main/resources/define/app-modbus.yml | 236 + ...app-mongodb-atlas.yml => app-mongodb_atlas.yml} | 0 .../src/main/resources/define/app-mysql.yml | 1 - .../{app-nebulaGraph.yml => app-nebula_graph.yml} | 2 +- .../src/main/resources/define/app-oceanbase.yml | 2 +- .../src/main/resources/define/app-prestodb.yml | 2 +- .../src/main/resources/define/app-process.yml | 128 +- .../manager/controller/MonitorControllerTest.java | 1 - .../manager/service/MonitorServiceTest.java | 21 +- .../hertzbeat/remoting/RemotingServiceTest.java | 17 +- hertzbeat-warehouse/pom.xml | 14 +- .../service/impl/MetricsDataServiceImpl.java | 61 +- .../warehouse/store/DataStorageDispatch.java | 26 +- .../history/greptime/GreptimeDbDataStorage.java | 491 +-- .../store/history/greptime/GreptimeProperties.java | 8 +- .../history/influxdb/InfluxdbDataStorage.java | 62 +- .../store/history/iotdb/IotDbDataStorage.java | 85 +- .../store/history/jpa/JpaDatabaseDataStorage.java | 104 +- .../history/tdengine/TdEngineDataStorage.java | 207 +- .../store/history/vm/PromQlQueryContent.java | 99 + .../vm/VictoriaMetricsClusterDataStorage.java | 236 +- .../history/vm/VictoriaMetricsDataStorage.java | 232 +- .../realtime/redis/MetricsDataRedisCodec.java | 56 - .../store/realtime/redis/RedisDataStorage.java | 20 +- .../redis/client/RedisCommandDelegate.java | 8 +- .../redis/client/impl/RedisSentinelClientImpl.java | 4 +- .../redis/client/impl/RedisSimpleClientImpl.java | 4 +- .../warehouse/service/MetricsDataServiceTest.java | 3 - .../warehouse/store/MetricsDataRedisCodecTest.java | 101 - home/docs/community/contribution.md | 6 +- home/docs/community/development.md | 6 +- home/docs/download.md | 1 + home/docs/help/linux_script.md | 1 + home/docs/help/modbus.md | 80 + home/docs/help/plugin.md | 8 +- home/docs/help/security_model.md | 43 + home/docs/help/windows.md | 73 +- home/docs/help/windows_script.md | 1 + home/docs/introduce.md | 10 +- home/docs/start/greptime-init.md | 14 +- home/docs/start/mysql-change.md | 2 + home/docs/start/postgresql-change.md | 2 + home/docusaurus.config.js | 2 +- .../en/docusaurus-plugin-content-docs/current.json | 6 +- .../docusaurus-plugin-content-docs/current.json | 6 +- .../current/community/contribution.md | 4 +- .../current/community/development.md | 4 +- .../current/download.md | 1 + .../current/help/kafka_client.md | 22 +- .../current/help/linux_script.md | 1 + .../current/help/modbus.md | 80 + .../current/help/plugin.md | 8 +- .../current/help/security_model.md | 43 + .../current/help/windows.md | 75 +- .../current/help/windows_script.md | 1 + .../current/introduce.md | 10 +- .../current/start/greptime-init.md | 13 +- .../current/start/mysql-change.md | 4 +- .../current/start/postgresql-change.md | 2 + .../version-v1.5.x/introduce.md | 4 +- home/sidebars.json | 216 +- home/src/pages/team/index.jsx | 24 + home/versioned_docs/version-v1.5.x/introduce.md | 4 +- material/licenses/LICENSE | 2 + material/licenses/backend/LICENSE | 2 + material/licenses/collector/LICENSE | 2 + pom.xml | 17 +- script/application.yml | 39 +- script/assembly/collector/bin/entrypoint.sh | 2 +- script/assembly/collector/bin/startup.bat | 2 +- script/assembly/collector/bin/startup.sh | 2 +- script/assembly/server/bin/entrypoint.sh | 2 +- script/assembly/server/bin/startup.bat | 2 +- script/assembly/server/bin/startup.sh | 2 +- .../hertzbeat-mysql-iotdb/conf/application.yml | 2 +- .../hertzbeat-mysql-tdengine/conf/application.yml | 2 +- .../conf/application.yml | 2 +- .../conf/application.yml | 2 +- script/helm/hertzbeat-helm-chart | 2 +- script/sureness.yml | 6 +- .../app/routes/bulletin/bulletin.component.html | 2 +- .../monitor-data-chart.component.ts | 327 +- .../monitor/monitor-edit/monitor-edit.component.ts | 10 +- .../monitor/monitor-form/monitor-form.component.ts | 9 +- .../monitor/monitor-new/monitor-new.component.ts | 10 +- web-app/src/assets/app-data.json | 4 +- web-app/src/assets/i18n/en-US.json | 5 +- web-app/src/assets/i18n/zh-CN.json | 5 +- web-app/src/assets/i18n/zh-TW.json | 7 +- 294 files changed, 8057 insertions(+), 8688 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
