This is an automated email from the ASF dual-hosted git repository.
zhaoqingran pushed a change to branch greptime-grafana
in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
from e0b529f710 feat(grafana): support multiple TSDBs for Grafana datasource
new 2cfabc7da2 refactor(warehouse): rename history data storage packages
new 3ab4aa193c feat(prometheus): add proxy mode for Prometheus collector
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../prometheus/PrometheusAutoCollectImpl.java | 4 +-
.../collect/prometheus/PrometheusCollect.java | 23 +++
...ctImpl.java => PrometheusProxyCollectImpl.java} | 210 ++++++++++-----------
.../collector/dispatch/MetricsCollect.java | 2 +
.../apache/hertzbeat/common/entity/job/Job.java | 5 +
.../grafana/service/DatasourceService.java | 4 +-
.../prometheus/PrometheusCollectorFactory.java | 91 +++++++++
.../manager/scheduler/CollectorJobScheduler.java | 4 +
.../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 | 6 +-
.../{ => 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 +-
39 files changed, 266 insertions(+), 157 deletions(-)
create mode 100644
hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/prometheus/PrometheusCollect.java
copy
hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/prometheus/{PrometheusAutoCollectImpl.java
=> PrometheusProxyCollectImpl.java} (68%)
create mode 100644
hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/component/prometheus/PrometheusCollectorFactory.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 (98%)
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]
