You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@hertzbeat.apache.org by zh...@apache.org on 2025/05/07 09:27:27 UTC
(hertzbeat) 01/03: Merge branch 'master' of github.com:apache/hertzbeat
This is an automated email from the ASF dual-hosted git repository.
zhaoqingran pushed a commit to branch traces
in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
commit 320766a48e5712391bdc2d60c160d8d737915a0e
Merge: efb2ac02df 81ad7d51b6
Author: Logic <zq...@dromara.org>
AuthorDate: Thu Apr 17 16:57:54 2025 +0800
Merge branch 'master' of github.com:apache/hertzbeat
.all-contributorsrc | 36 +
README.md | 4 +
README_CN.md | 4 +
.../alert/calculate/RealTimeAlertCalculator.java | 35 +-
.../collector/collect/http/HttpCollectImpl.java | 208 +++-
.../http/promethus/exporter/ExporterParser.java | 432 --------
.../http/promethus/exporter/MetricFamily.java | 252 -----
.../http/promethus/exporter/MetricType.java | 52 -
.../prometheus/PrometheusAutoCollectImpl.java | 37 +-
.../collect/prometheus/parser}/MetricFamily.java | 2 +-
.../collect/prometheus/parser}/OnlineParser.java | 77 +-
.../collect/prometheus/parser/TextParser.java | 4 +-
.../collector/collect/push/PushCollectImpl.java | 12 +-
.../collect/http/HttpCollectImplTest.java | 28 +-
.../promethus/exporter/ExporterParserTest.java | 79 --
.../prometheus/parser/OnlineParserTest.java | 39 +-
.../collector/dispatch/MetricsCollect.java | 2 +-
.../collector/dispatch/DispatchConstants.java | 4 +
.../collector/dispatch/timer/HashedWheelTimer.java | 10 +-
.../common/constants/ConfigConstants.java | 2 +
.../common/entity/dto/query/DatasourceQuery.java | 59 ++
...tricQueryData.java => DatasourceQueryData.java} | 43 +-
.../hertzbeat/common/entity/job/Metrics.java | 5 -
.../hertzbeat/common/util/TimePeriodUtil.java | 42 +
.../grafana/service/DashboardService.java | 12 +
.../grafana/service/DatasourceService.java | 5 +
{hertzbeat-push => hertzbeat-log}/pom.xml | 48 +-
.../hertzbeat/log/config/LogAutoConfiguration.java | 30 +-
.../hertzbeat/log/config/OpenTelemetryConfig.java | 117 +++
.../src/main/resources/META-INF/spring.factories | 17 +
hertzbeat-manager/pom.xml | 5 +
.../manager/scheduler/CollectorJobScheduler.java | 1 +
.../src/main/resources/define/app-dahua.yml | 247 +++++
.../main/resources/define/app-hikvision_isapi.yml | 100 +-
.../src/main/resources/define/app-uniview.yml | 154 +++
.../src/main/resources/logback-spring.xml | 27 +-
hertzbeat-mcp/README.md | 27 +
hertzbeat-mcp/pom.xml | 107 ++
.../hertzbeat/mcp/server/McpServerApplication.java | 57 +-
.../hertzbeat/mcp/server/service/LogService.java | 196 ++++
hertzbeat-mcp/src/main/resources/application.yml | 28 +
hertzbeat-push/pom.xml | 5 +-
.../push/service/impl/PushGatewayServiceImpl.java | 4 +-
.../warehouse/constants/WarehouseConstants.java | 4 +
.../warehouse/controller/DataQueryController.java | 53 +
.../controller/MetricsDataQueryController.java | 78 --
.../warehouse/db/GreptimePromqlQueryExecutor.java | 10 +-
.../warehouse/db/PromqlQueryExecutor.java | 147 ++-
.../hertzbeat/warehouse/db/QueryExecutor.java | 13 +-
.../hertzbeat/warehouse/db/SqlQueryExecutor.java | 39 +-
.../warehouse/db/VictoriaMetricsQueryExecutor.java | 10 +-
...eryService.java => DatasourceQueryService.java} | 21 +-
.../service/impl/DatasourceQueryServiceImpl.java | 60 ++
.../service/impl/MetricsDataQueryServiceImpl.java | 67 --
home/blog/2025-04-06-new-pmc.md | 70 ++
home/blog/2025-04-10-hertzbeat-v1.7.0.md | 316 ++++++
home/docs/advanced/extend-http-xmlpath.md | 138 ++-
.../docs/community/code-style-and-quality-guide.md | 4 +-
home/docs/download.md | 10 +-
home/docs/help/alarm_silence.md | 29 +
home/docs/help/dahua.md | 60 ++
home/docs/help/grafana_dashboard.md | 6 +-
home/docs/help/springboot2.md | 2 +-
home/docs/help/springboot3.md | 2 +-
home/docs/help/uniview.md | 47 +
.../2025-04-06-new-pmc.md | 70 ++
.../2025-04-10-hertzbeat-v1.7.0.md | 316 ++++++
.../current/advanced/extend-http-xmlpath.md | 138 ++-
.../community/code-style-and-quality-guide.md | 4 +-
.../current/download.md | 10 +-
.../current/help/alarm_silence.md | 29 +
.../current/help/dahua.md | 60 ++
.../current/help/grafana_dashboard.md | 6 +-
.../current/help/uniview.md | 47 +
home/sidebars.json | 5 +-
home/src/css/custom.css | 13 +
home/src/pages/team/index.jsx | 4 +
home/static/img/docs/help/alert-silence-1-en.png | Bin 0 -> 177689 bytes
home/static/img/docs/help/alert-silence-1.png | Bin 0 -> 62971 bytes
home/static/img/docs/help/alert-silence-2-en.png | Bin 0 -> 127627 bytes
home/static/img/docs/help/alert-silence-2.png | Bin 0 -> 40029 bytes
material/licenses/LICENSE | 12 +-
pom.xml | 39 +-
script/ci/exclude_files.txt | 4 +-
script/helm/hertzbeat-helm-chart | 2 +-
.../alert-setting/alert-setting.component.html | 139 ++-
.../alert-setting/alert-setting.component.less | 26 +-
.../alert/alert-setting/alert-setting.component.ts | 190 +++-
web-app/src/app/routes/alert/alert.module.ts | 4 +-
.../monitor-list/monitor-list.component.less | 46 +-
web-app/src/assets/i18n/en-US.json | 7 +
web-app/src/assets/i18n/ja-JP.json | 7 +
web-app/src/assets/i18n/pt-BR.json | 1064 ++++++++++++++------
web-app/src/assets/i18n/zh-CN.json | 7 +
web-app/src/assets/i18n/zh-TW.json | 7 +
95 files changed, 4284 insertions(+), 1813 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@hertzbeat.apache.org
For additional commands, e-mail: notifications-help@hertzbeat.apache.org