This is an automated email from the ASF dual-hosted git repository.
zhaoqingran pushed a change to branch xml-update
in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
from 676d8d738b refactor(manager): update Dahua and Hikvision ISAPI
configurations to use alias fields and simplify XPath expressions
add 0385892674 [feature] add pushgateway to push module (#3204)
add 93eaade19d Merge branch 'master' into xml-update
No new revisions were added by this update.
Summary of changes:
.../alert/service/DataSourceServiceTest.java | 2 +-
.../prometheus/PrometheusAutoCollectImpl.java | 2 +-
.../collect/prometheus/parser/TextParser.java | 1 +
.../prometheus/parser/OnlineParserTest.java | 2 +
.../common/constants/CommonConstants.java | 15 ++
.../hertzbeat/common/entity/dto}/MetricFamily.java | 2 +-
.../common/entity/dto/query/MetricQueryData.java | 82 ++++++++++
.../hertzbeat/common/entity/manager/Monitor.java | 3 +
.../hertzbeat/common/util}/OnlineParser.java | 101 ++++++++-----
.../java/org/apache/hertzbeat/manager/Manager.java | 2 +
.../manager/service/impl/MonitorServiceImpl.java | 2 +-
.../push/config/PushErrorRequestWrapper.java | 29 ++--
.../hertzbeat/push/config/PushFilterConfig.java | 47 ++++++
.../config/PushPrometheusStreamReadingFilter.java | 82 ++++++++++
.../push/config/PushSuccessRequestWrapper.java | 28 ++--
.../hertzbeat/push/controller/PushController.java | 62 --------
...ntroller.java => PushPrometheusController.java} | 31 ++--
.../apache/hertzbeat/push/dao/PushMetricsDao.java | 33 ----
.../apache/hertzbeat/push/dao/PushMonitorDao.java | 8 +
.../hertzbeat/push/service/PushGatewayService.java | 13 +-
.../apache/hertzbeat/push/service/PushService.java | 31 ----
.../push/service/impl/PushGatewayServiceImpl.java | 99 +++++++++++-
.../push/service/impl/PushServiceImpl.java | 143 ------------------
.../push/controller/PushControllerTest.java | 93 ------------
...Test.java => PushPrometheusControllerTest.java} | 21 ++-
.../hertzbeat/push/dao/PushMetricsDaoTest.java | 77 ----------
.../hertzbeat/push/service/PushServiceTest.java | 132 ----------------
.../warehouse/constants/WarehouseConstants.java | 4 +
.../controller/MetricsDataQueryController.java | 78 ++++++++++
.../warehouse/db/GreptimePromqlQueryExecutor.java | 81 +---------
.../warehouse/db/PromqlQueryExecutor.java | 166 +++++++++++++++++++++
.../hertzbeat/warehouse/db/QueryExecutor.java | 10 +-
.../hertzbeat/warehouse/db/SqlQueryExecutor.java | 67 +++++++++
.../warehouse/db/VictoriaMetricsQueryExecutor.java | 79 +---------
...seService.java => MetricsDataQueryService.java} | 26 +++-
.../service/impl/MetricsDataQueryServiceImpl.java | 67 +++++++++
web-app/src/app/pojo/Monitor.ts | 2 +
37 files changed, 889 insertions(+), 834 deletions(-)
rename
{hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/prometheus/parser
=>
hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto}/MetricFamily.java
(95%)
create mode 100644
hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/query/MetricQueryData.java
rename
{hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/prometheus/parser
=>
hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util}/OnlineParser.java
(82%)
copy
hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/plugin/PluginConfig.java
=>
hertzbeat-push/src/main/java/org/apache/hertzbeat/push/config/PushErrorRequestWrapper.java
(61%)
create mode 100644
hertzbeat-push/src/main/java/org/apache/hertzbeat/push/config/PushFilterConfig.java
create mode 100644
hertzbeat-push/src/main/java/org/apache/hertzbeat/push/config/PushPrometheusStreamReadingFilter.java
copy
hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/plugin/PluginConfig.java
=>
hertzbeat-push/src/main/java/org/apache/hertzbeat/push/config/PushSuccessRequestWrapper.java
(61%)
delete mode 100644
hertzbeat-push/src/main/java/org/apache/hertzbeat/push/controller/PushController.java
rename
hertzbeat-push/src/main/java/org/apache/hertzbeat/push/controller/{PushGatewayController.java
=> PushPrometheusController.java} (59%)
delete mode 100644
hertzbeat-push/src/main/java/org/apache/hertzbeat/push/dao/PushMetricsDao.java
delete mode 100644
hertzbeat-push/src/main/java/org/apache/hertzbeat/push/service/PushService.java
delete mode 100644
hertzbeat-push/src/main/java/org/apache/hertzbeat/push/service/impl/PushServiceImpl.java
delete mode 100644
hertzbeat-push/src/test/java/org/apache/hertzbeat/push/controller/PushControllerTest.java
rename
hertzbeat-push/src/test/java/org/apache/hertzbeat/push/controller/{PushGatewayControllerTest.java
=> PushPrometheusControllerTest.java} (75%)
delete mode 100644
hertzbeat-push/src/test/java/org/apache/hertzbeat/push/dao/PushMetricsDaoTest.java
delete mode 100644
hertzbeat-push/src/test/java/org/apache/hertzbeat/push/service/PushServiceTest.java
create mode 100644
hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/controller/MetricsDataQueryController.java
create mode 100644
hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/db/PromqlQueryExecutor.java
create mode 100644
hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/db/SqlQueryExecutor.java
copy
hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/service/{WarehouseService.java
=> MetricsDataQueryService.java} (59%)
create mode 100644
hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/service/impl/MetricsDataQueryServiceImpl.java
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
