This is an automated email from the ASF dual-hosted git repository.
zhaoqingran pushed a commit to branch greptime-grafana
in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
commit fa24e5000f628b0d21cf372dd90fbbd3f6ef79e1
Merge: f242ead7a9 f31c835181
Author: Logic <zqr10...@dromara.org>
AuthorDate: Fri May 23 09:56:17 2025 +0800
Merge branch 'master' of github.com:apache/hertzbeat
README_CN.md | 8 +-
.../prometheus/PrometheusAutoCollectImpl.java | 2 +-
.../collector/collect/sd/NacosSdCollectImpl.java | 114 ++++++++++
.../collect/sd/HttpSdCollectImplTest.java | 198 +++++++++++++++++
.../collect/sd/NacosSdCollectImplTest.java | 233 +++++++++++++++++++++
...che.hertzbeat.collector.collect.AbstractCollect | 1 +
.../collector/dispatch/DispatchConstants.java | 4 +
.../hertzbeat/common/entity/job/Metrics.java | 5 +
.../entity/job/protocol/NacosSdProtocol.java | 63 ++++++
.../src/main/resources/define/app-activemq.yml | 2 +-
.../src/main/resources/define/app-airflow.yml | 2 +-
.../src/main/resources/define/app-almalinux.yml | 2 +-
.../src/main/resources/define/app-api.yml | 2 +-
.../src/main/resources/define/app-api_code.yml | 2 +-
.../src/main/resources/define/app-centos.yml | 2 +-
.../src/main/resources/define/app-cisco_switch.yml | 36 +++-
.../src/main/resources/define/app-clickhouse.yml | 22 ++
.../src/main/resources/define/app-nacos_sd.yml | 90 ++++++++
.../history/greptime/GreptimeDbDataStorage.java | 14 +-
home/blog/2024-01-18-hertzbeat-v1.4.4.md | 2 +-
home/docs/advanced/extend-http-default.md | 4 +-
home/docs/advanced/extend-http.md | 4 +-
home/docs/advanced/extend-point.md | 4 +-
.../version-v1.6.x/advanced/extend-http-default.md | 4 +-
.../version-v1.6.x/advanced/extend-http.md | 4 +-
.../version-v1.6.x/advanced/extend-point.md | 4 +-
.../monitor-form/monitor-form.component.html | 1 +
web-app/src/assets/i18n/en-US.json | 1 +
web-app/src/assets/i18n/ja-JP.json | 1 +
web-app/src/assets/i18n/pt-BR.json | 1 +
web-app/src/assets/i18n/zh-CN.json | 1 +
web-app/src/assets/i18n/zh-TW.json | 1 +
32 files changed, 802 insertions(+), 32 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscr...@hertzbeat.apache.org
For additional commands, e-mail: notifications-h...@hertzbeat.apache.org
