This is an automated email from the ASF dual-hosted git repository.

zhaoqingran pushed a commit to branch udf
in repository https://gitbox.apache.org/repos/asf/hertzbeat.git

commit 39236d6e6656dbbf7d858801637c8ea08f5ddecc
Merge: 01fa01a3a aa3331eb1
Author: zqr10159 <[email protected]>
AuthorDate: Mon May 13 09:52:54 2024 +0800

    Merge branch 'master' of github.com:dromara/hertzbeat into udf

 .gitignore                                         |   3 +
 README_CN.md                                       |  36 ++---
 .../collector/collect/AbstractCollect.java         |   8 ++
 .../common/cache/ConnectionCommonCache.java        |   3 +
 .../collect/database/JdbcCommonCollect.java        |  35 ++---
 .../collector/collect/dns/DnsCollectImpl.java      |  10 +-
 .../collector/collect/ftp/FtpCollectImpl.java      |  37 ++----
 .../collector/collect/http/HttpCollectImpl.java    |  41 +++---
 .../collect/http/SslCertificateCollectImpl.java    |  31 +++--
 .../collector/collect/httpsd/HttpsdImpl.java       |  14 +-
 .../collector/collect/icmp/IcmpCollectImpl.java    |  14 +-
 .../collector/collect/jmx/JmxCollectImpl.java      |  20 +--
 .../collect/memcached/MemcachedCollectImpl.java    |  13 +-
 .../collect/mongodb/MongodbSingleCollectImpl.java  |  33 ++---
 .../collect/mq/RocketmqSingleCollectImpl.java      |  28 ++--
 .../nebulagraph/NebulaGraphCollectImpl.java        |  12 +-
 .../collect/nebulagraph/NgqlCollectImpl.java       |  27 ++--
 .../collector/collect/nginx/NginxCollectImpl.java  |  33 ++---
 .../collector/collect/ntp/NtpCollectImpl.java      |  12 +-
 .../collector/collect/pop3/Pop3CollectImpl.java    |  28 ++--
 .../collector/collect/push/PushCollectImpl.java    |   4 +
 .../collect/redfish/RedfishCollectImpl.java        |  30 ++---
 .../collect/redis/RedisCommonCollectImpl.java      |  21 +--
 .../collector/collect/smtp/SmtpCollectImpl.java    |  12 +-
 .../collector/collect/snmp/SnmpCollectImpl.java    |  28 ++--
 .../collector/collect/ssh/SshCollectImpl.java      |  20 +--
 .../collect/telnet/TelnetCollectImpl.java          |  11 +-
 .../collector/collect/udp/UdpCollectImpl.java      |  12 +-
 .../collect/websocket/WebsocketCollectImpl.java    |  13 +-
 .../collector/dispatch/MetricsCollect.java         |   7 +-
 .../collector/collect/ftp/FtpCollectImplTest.java  |   7 +-
 .../collector/collect/httpsd/HttpsdImplTest.java   |   4 +-
 .../collect/nebulagraph/NgqlCollectImplTest.java   |   5 +-
 .../collect/nginx/NginxCollectImplTest.java        |  12 +-
 .../collector/collect/ntp/NtpCollectImplTest.java  |   1 +
 .../collect/redfish/RedfishCollectImplTest.java    | 148 +++++++++++----------
 .../collect/redis/RedisClusterCollectImplTest.java |   1 +
 .../collect/redis/RedisSingleCollectImplTest.java  |   1 +
 .../collect/telnet/TelnetCollectImplTest.java      |   2 +
 .../collector/collect/udp/UdpCollectImplTest.java  |  15 ++-
 .../websocket/WebsocketCollectImplTest.java        |   1 +
 home/docs/help/euleros.md                          | 107 +++++++++++++++
 home/docs/help/guide.md                            |   1 +
 home/docs/help/influxdb_promql.md                  |  61 +++++++++
 home/docs/help/kafka_promql.md                     |  66 +++++++++
 .../current/help/euleros.md                        | 107 +++++++++++++++
 .../current/help/guide.md                          |   1 +
 .../current/help/influxdb_promql.md                |  63 +++++++++
 .../current/help/kafka_promql.md                   |  56 ++++++++
 home/sidebars.json                                 |  11 +-
 manager/src/main/resources/define/app-docker.yml   |   2 +-
 manager/src/main/resources/define/app-flink.yml    |  10 +-
 .../resources/define/app-hbase_regionserver.yml    |   6 +-
 .../src/main/resources/define/app-hertzbeat.yml    |   4 +-
 .../main/resources/define/app-hertzbeat_token.yml  |   4 +-
 manager/src/main/resources/define/app-hive.yml     |  36 ++---
 .../main/resources/define/app-influxdb_promql.yml  |   4 +-
 .../src/main/resources/define/app-kafka_promql.yml |   4 +-
 .../main/resources/define/app-spring_gateway.yml   |  22 +--
 .../src/main/resources/define/app-springboot2.yml  |  18 +--
 .../src/main/resources/define/app-springboot3.yml  |   4 +-
 .../alert-setting/alert-setting.component.html     |   1 +
 .../alert/alert-setting/alert-setting.component.ts |   3 +
 63 files changed, 920 insertions(+), 464 deletions(-)


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to