This is an automated email from the ASF dual-hosted git repository.
zhaoqingran pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
The following commit(s) were added to refs/heads/master by this push:
new c480d63833 [PR] [bugfix] Set the prometheus monitoring time and
correct historical da… (#3264)
c480d63833 is described below
commit c480d638337bbf5981f886e67e91ddf44d00f964
Author: Cyanty <[email protected]>
AuthorDate: Fri Apr 18 20:56:50 2025 +0800
[PR] [bugfix] Set the prometheus monitoring time and correct historical da…
(#3264)
---
.../collector/collect/prometheus/PrometheusAutoCollectImpl.java | 2 ++
.../hertzbeat/warehouse/store/history/jpa/JpaDatabaseDataStorage.java | 3 +++
2 files changed, 5 insertions(+)
diff --git
a/hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/prometheus/PrometheusAutoCollectImpl.java
b/hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/prometheus/PrometheusAutoCollectImpl.java
index 92c65ceca4..eae58d914f 100644
---
a/hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/prometheus/PrometheusAutoCollectImpl.java
+++
b/hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/prometheus/PrometheusAutoCollectImpl.java
@@ -156,6 +156,8 @@ public class PrometheusAutoCollectImpl {
}
private List<CollectRep.MetricsData>
parseResponseByPrometheusExporter(InputStream inputStream,
CollectRep.MetricsData.Builder builder) throws IOException {
+ long endTime = System.currentTimeMillis();
+ builder.setTime(endTime);
Map<String, MetricFamily> metricFamilyMap =
OnlineParser.parseMetrics(inputStream);
List<CollectRep.MetricsData> metricsDataList = new LinkedList<>();
if (metricFamilyMap == null) {
diff --git
a/hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/jpa/JpaDatabaseDataStorage.java
b/hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/jpa/JpaDatabaseDataStorage.java
index abda3eb137..f226e352ce 100644
---
a/hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/jpa/JpaDatabaseDataStorage.java
+++
b/hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/jpa/JpaDatabaseDataStorage.java
@@ -201,6 +201,9 @@ public class JpaDatabaseDataStorage extends
AbstractHistoryDataStorage {
List<Predicate> andList = new ArrayList<>();
Predicate predicateMonitorId =
criteriaBuilder.equal(root.get("monitorId"), monitorId);
Predicate predicateMonitorType =
criteriaBuilder.equal(root.get("app"), app);
+ if (CommonConstants.PROMETHEUS.equals(app)) {
+ predicateMonitorType = criteriaBuilder.like(root.get("app"),
CommonConstants.PROMETHEUS_APP_PREFIX + "%");
+ }
Predicate predicateMonitorMetrics =
criteriaBuilder.equal(root.get("metrics"), metrics);
Predicate predicateMonitorMetric =
criteriaBuilder.equal(root.get("metric"), metric);
andList.add(predicateMonitorId);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
