This is an automated email from the ASF dual-hosted git repository. zhaoqingran pushed a commit to branch web-ui in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
commit 341a67eac5bf0e30e38744b30ba7643dde152272 Merge: 9492604b66 d516b3a15d Author: Logic <[email protected]> AuthorDate: Sat Oct 11 08:44:48 2025 +0800 Merge branch 'master' of github.com:apache/hertzbeat .github/workflows/frontend-build-test.yml | 9 +- .github/workflows/nightly-build.yml | 7 +- .licenserc.yaml | 1 + .../collector/collect/dns/DnsCollectImpl.java | 2 +- .../collect/prometheus/parser/OnlineParser.java | 68 +- .../collector/collect/sd/DnsSdCollectImpl.java | 2 +- .../collector/collect/dns/DnsCollectImplTest.java | 1 + .../prometheus/parser/OnlineParserSingleTest.java | 21 + .../common/entity/job/protocol/DnsProtocol.java | 3 +- .../component/sd/ServiceDiscoveryWorker.java | 4 +- .../manager/service/impl/MonitorServiceImpl.java | 1 + ...__update_column.sql => V180__update_column.sql} | 4 +- ...__update_column.sql => V180__update_column.sql} | 26 +- ...__update_column.sql => V180__update_column.sql} | 8 +- .../src/main/resources/define/app-dns.yml | 34 + home/docs/help/dns.md | 1 + .../current/help/alarm_center.md | 2 +- .../current/help/alert_threshold.md | 4 +- .../current/help/log_manage.md | 10 +- .../current/help/log_stream.md | 6 +- .../version-v1.6.x/help/alarm_center.md | 2 +- pom.xml | 2 +- script/docker/collector/Dockerfile | 2 +- script/docker/server/Dockerfile | 2 +- web-app/package.json | 15 +- web-app/pnpm-lock.yaml | 16652 +++++++++++++++++++ .../log/log-manage/log-manage.component.html | 18 +- .../routes/log/log-manage/log-manage.component.ts | 4 +- .../log/log-stream/log-stream.component.html | 17 +- .../routes/log/log-stream/log-stream.component.ts | 2 + web-app/src/assets/i18n/en-US.json | 2 +- web-app/src/assets/i18n/zh-CN.json | 18 +- web-app/src/assets/i18n/zh-TW.json | 18 +- web-app/tsconfig.json | 4 +- web-app/yarn.lock | 13090 --------------- 35 files changed, 16902 insertions(+), 13160 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
