This is an automated email from the ASF dual-hosted git repository.
gongchao pushed a change to branch i18n_japanese_elasticsearch
in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
from 73dfc29736 Merge branch 'master' into i18n_japanese_elasticsearch
add e1affb169f [feature]Make GreptimeDB as a grafana data source (#3403)
add c3f32132ca [feat] support sql("...") and promql("...") expressions
including SQL condition parsing (#3410)
add 3cb4fc71f9 [doc] japanese dynamic_tp (#3419)
add 9ba094da0a Merge branch 'master' into i18n_japanese_elasticsearch
No new revisions were added by this update.
Summary of changes:
.../alert/expr/AlertExpressionBaseVisitor.java | 260 +-
.../alert/expr/AlertExpressionEvalVisitor.java | 43 +-
.../hertzbeat/alert/expr/AlertExpressionLexer.java | 462 ++-
.../alert/expr/AlertExpressionParser.java | 2934 ++++++++++++++++++--
.../alert/expr/AlertExpressionVisitor.java | 243 +-
.../alert/service/impl/DataSourceServiceImpl.java | 10 +-
.../src/main/resources/expr/AlertExpression.g4 | 277 +-
.../alert/expr/AlertExpressionEvalVisitorTest.java | 309 ++-
.../prometheus/PrometheusAutoCollectImpl.java | 4 +-
.../collect/prometheus/PrometheusCollect.java | 30 +-
...ctImpl.java => PrometheusProxyCollectImpl.java} | 210 +-
.../collector/dispatch/MetricsCollect.java | 33 +-
.../apache/hertzbeat/common/entity/job/Job.java | 5 +
.../hertzbeat/grafana/common/GrafanaConstants.java | 65 +-
.../hertzbeat/grafana/config/GrafanaInit.java | 5 +-
.../grafana/service/DashboardService.java | 139 +-
.../grafana/service/DatasourceService.java | 163 +-
.../manager/config/PrometheusProxyConfig.java | 81 +
.../hertzbeat/manager/scheduler/SchedulerInit.java | 6 +
.../src/main/resources/define/app-dynamic_tp.yml | 28 +
.../org/apache/hertzbeat/manager/ManagerTest.java | 4 +-
.../otel/config/LogAutoConfiguration.java | 2 +-
.../hertzbeat/otel/config/OpenTelemetryConfig.java | 2 +-
.../warehouse/db/GreptimePromqlQueryExecutor.java | 2 +-
.../warehouse/db/PromqlQueryExecutor.java | 2 +-
.../warehouse/db/VictoriaMetricsQueryExecutor.java | 2 +-
.../WareHouseApplicationReadyListener.java | 2 +-
.../service/impl/MetricsDataServiceImpl.java | 2 +-
.../warehouse/store/DataStorageDispatch.java | 2 +-
.../{ => tsdb}/AbstractHistoryDataStorage.java | 2 +-
.../history/{ => tsdb}/HistoryDataReader.java | 2 +-
.../history/{ => tsdb}/HistoryDataWriter.java | 2 +-
.../{ => tsdb}/greptime/GreptimeDbDataStorage.java | 18 +-
.../{ => tsdb}/greptime/GreptimeProperties.java | 2 +-
.../{ => tsdb}/influxdb/InfluxdbDataStorage.java | 4 +-
.../{ => tsdb}/influxdb/InfluxdbProperties.java | 2 +-
.../history/{ => tsdb}/iotdb/IotDbDataStorage.java | 4 +-
.../history/{ => tsdb}/iotdb/IotDbProperties.java | 2 +-
.../{ => tsdb}/jpa/JpaDatabaseDataStorage.java | 4 +-
.../history/{ => tsdb}/jpa/JpaProperties.java | 2 +-
.../{ => tsdb}/tdengine/TdEngineDataStorage.java | 4 +-
.../{ => tsdb}/tdengine/TdEngineProperties.java | 2 +-
.../history/{ => tsdb}/vm/PromQlQueryContent.java | 2 +-
.../vm/VictoriaMetricsClusterDataStorage.java | 4 +-
.../vm/VictoriaMetricsClusterProperties.java | 2 +-
.../{ => tsdb}/vm/VictoriaMetricsDataStorage.java | 4 +-
.../vm/VictoriaMetricsInsertProperties.java | 2 +-
.../{ => tsdb}/vm/VictoriaMetricsProperties.java | 2 +-
.../vm/VictoriaMetricsSelectProperties.java | 2 +-
.../warehouse/service/MetricsDataServiceTest.java | 2 +-
.../warehouse/store/TdEngineDataStorageTest.java | 2 +-
51 files changed, 4818 insertions(+), 581 deletions(-)
copy
hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/plugin/PluginConfig.java
=>
hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/prometheus/PrometheusCollect.java
(56%)
copy
hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/prometheus/{PrometheusAutoCollectImpl.java
=> PrometheusProxyCollectImpl.java} (67%)
create mode 100644
hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/config/PrometheusProxyConfig.java
rename
hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/{
=> tsdb}/AbstractHistoryDataStorage.java (95%)
rename
hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/{
=> tsdb}/HistoryDataReader.java (97%)
rename
hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/{
=> tsdb}/HistoryDataWriter.java (95%)
rename
hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/{
=> tsdb}/greptime/GreptimeDbDataStorage.java (95%)
rename
hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/{
=> tsdb}/greptime/GreptimeProperties.java (96%)
rename
hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/{
=> tsdb}/influxdb/InfluxdbDataStorage.java (99%)
rename
hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/{
=> tsdb}/influxdb/InfluxdbProperties.java (96%)
rename
hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/{
=> tsdb}/iotdb/IotDbDataStorage.java (99%)
rename
hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/{
=> tsdb}/iotdb/IotDbProperties.java (97%)
rename
hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/{
=> tsdb}/jpa/JpaDatabaseDataStorage.java (98%)
rename
hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/{
=> tsdb}/jpa/JpaProperties.java (96%)
rename
hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/{
=> tsdb}/tdengine/TdEngineDataStorage.java (99%)
rename
hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/{
=> tsdb}/tdengine/TdEngineProperties.java (96%)
rename
hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/{
=> tsdb}/vm/PromQlQueryContent.java (97%)
rename
hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/{
=> tsdb}/vm/VictoriaMetricsClusterDataStorage.java (99%)
rename
hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/{
=> tsdb}/vm/VictoriaMetricsClusterProperties.java (96%)
rename
hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/{
=> tsdb}/vm/VictoriaMetricsDataStorage.java (99%)
rename
hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/{
=> tsdb}/vm/VictoriaMetricsInsertProperties.java (94%)
rename
hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/{
=> tsdb}/vm/VictoriaMetricsProperties.java (96%)
rename
hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/{
=> tsdb}/vm/VictoriaMetricsSelectProperties.java (94%)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
