diff --git a/script/checkstyle/checkstyle.xml b/script/checkstyle/checkstyle.xml
index bcc783b569..dae8d09f1d 100644
--- a/script/checkstyle/checkstyle.xml
+++ b/script/checkstyle/checkstyle.xml
@@ -22,7 +22,7 @@
-
+
diff --git a/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/config/WarehouseProperties.java b/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/config/WarehouseProperties.java
index 038eb81106..4eb787c4c7 100644
--- a/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/config/WarehouseProperties.java
+++ b/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/config/WarehouseProperties.java
@@ -75,6 +75,9 @@ public class WarehouseProperties {
this.kafka = kafka;
}
+ /**
+ * kafka配置信息
+ */
public static class KafkaProperties {
/**
* kafka数据入口是否启动
@@ -233,6 +236,9 @@ public class WarehouseProperties {
this.greptime = greptime;
}
+ /**
+ * 内存存储配置信息
+ */
public static class MemoryProperties {
/**
* 内存数据存储是否启动
@@ -260,6 +266,9 @@ public class WarehouseProperties {
}
}
+ /**
+ * JPA配置信息
+ */
public static class JpaProperties {
/**
* use mysql/h2 jpa store metrics history data
@@ -301,6 +310,9 @@ public class WarehouseProperties {
}
}
+ /**
+ * Influxdb配置信息
+ */
public static class InfluxdbProperties {
/**
* influxdb数据存储是否启动
@@ -376,6 +388,9 @@ public class WarehouseProperties {
}
}
+ /**
+ * TdEngine配置信息
+ */
public static class TdEngineProperties {
/**
* Whether the TdEngine data store is enabled
@@ -451,6 +466,9 @@ public class WarehouseProperties {
}
}
+ /**
+ * VictoriaMetrics配置信息
+ */
public static class VictoriaMetricsProperties {
/**
* Whether the VictoriaMetrics data store is enabled
@@ -503,6 +521,9 @@ public class WarehouseProperties {
}
+ /**
+ * Redis配置信息
+ */
public static class RedisProperties {
/**
* redis数据存储是否启动
@@ -566,6 +587,9 @@ public class WarehouseProperties {
}
}
+ /**
+ * IoTDB配置信息
+ */
public static class IotDbProperties {
/**
* Whether the iotDB data store is enabled
@@ -698,6 +722,9 @@ public class WarehouseProperties {
}
}
+ /**
+ * GrepTimeDB配置信息
+ */
public static class GreptimeProperties {
/**
* Whether the GrepTimeDB data store is enabled
diff --git a/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/HistoryGrepTimeDbDataStorage.java b/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/HistoryGrepTimeDbDataStorage.java
index a649146a84..a1c7de17f6 100644
--- a/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/HistoryGrepTimeDbDataStorage.java
+++ b/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/HistoryGrepTimeDbDataStorage.java
@@ -63,7 +63,8 @@ public class HistoryGrepTimeDbDataStorage extends AbstractHistoryDataStorage {
private static final String QUERY_INSTANCE_SQL
= "SELECT DISTINCT instance FROM %s WHERE ts >= now() - interval '1' WEEK";
private static final String QUERY_HISTORY_INTERVAL_WITH_INSTANCE_SQL
- = "SELECT first, avg ,max, min FROM (SELECT \"%s\" as first FROM %s WHERE monitor_id = %s and ts >= %s and ts < %s ORDER BY ts LIMIT 1) LEFT JOIN (SELECT avg(\"%s\") as avg, min(\"%s\") as min, max(\"%s\") as max FROM %s WHERE ts >= %s and ts < %s) ON 1=1";
+ = "SELECT first, avg ,max, min FROM (SELECT \"%s\" as first FROM %s WHERE monitor_id = %s and ts >= %s" +
+ " and ts < %s ORDER BY ts LIMIT 1) LEFT JOIN (SELECT avg(\"%s\") as avg, min(\"%s\") as min, max(\"%s\") as max FROM %s WHERE ts >= %s and ts < %s) ON 1=1";
private static final String TABLE_NOT_EXIST = "not exist";
private static final String DATABASE_NOT_EXIST = "not exist";
private GreptimeDB greptimeDb;
diff --git a/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/HistoryJpaDatabaseDataStorage.java b/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/HistoryJpaDatabaseDataStorage.java
index 4a6e977e6a..4b8ee96abb 100644
--- a/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/HistoryJpaDatabaseDataStorage.java
+++ b/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/HistoryJpaDatabaseDataStorage.java
@@ -162,6 +162,9 @@ public class HistoryJpaDatabaseDataStorage extends AbstractHistoryDataStorage {
.int32(null);
break;
}
+ default:
+ historyBuilder.metricType(CommonConstants.TYPE_NUMBER);
+ break;
}
} else {
switch (fieldType) {
@@ -182,6 +185,10 @@ public class HistoryJpaDatabaseDataStorage extends AbstractHistoryDataStorage {
.int32(Integer.parseInt(columnValue));
break;
}
+ default:
+ historyBuilder.metricType(CommonConstants.TYPE_NUMBER)
+ .dou(Double.parseDouble(columnValue));
+ break;
}
if (field.getLabel()) {
diff --git a/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/HistoryVictoriaMetricsDataStorage.java b/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/HistoryVictoriaMetricsDataStorage.java
index 861e316a2b..b05d7127a8 100644
--- a/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/HistoryVictoriaMetricsDataStorage.java
+++ b/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/HistoryVictoriaMetricsDataStorage.java
@@ -446,7 +446,10 @@ public class HistoryVictoriaMetricsDataStorage extends AbstractHistoryDataStorag
}
return instanceValuesMap;
}
-
+
+ /**
+ * victoria metrics content
+ */
@Data
@Builder
@AllArgsConstructor
@@ -470,6 +473,9 @@ public class HistoryVictoriaMetricsDataStorage extends AbstractHistoryDataStorag
private Long[] timestamps;
}
+ /**
+ * victoria metrics query content
+ */
@Data
@Builder
@AllArgsConstructor
@@ -479,7 +485,10 @@ public class HistoryVictoriaMetricsDataStorage extends AbstractHistoryDataStorag
private String status;
private ContentData data;
-
+
+ /**
+ * content data
+ */
@Data
@AllArgsConstructor
@NoArgsConstructor
@@ -489,6 +498,9 @@ public class HistoryVictoriaMetricsDataStorage extends AbstractHistoryDataStorag
private List result;
+ /**
+ * content
+ */
@Data
@AllArgsConstructor
@NoArgsConstructor
diff --git a/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/RealTimeRedisDataStorage.java b/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/RealTimeRedisDataStorage.java
index cd6d4f89e7..cea2ebaafa 100644
--- a/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/RealTimeRedisDataStorage.java
+++ b/warehouse/src/main/java/org/dromara/hertzbeat/warehouse/store/RealTimeRedisDataStorage.java
@@ -56,9 +56,11 @@ public class RealTimeRedisDataStorage extends AbstractRealTimeDataStorage {
this.serverAvailable = initRedisClient(properties);
this.db = getRedisSelectDb(properties);
}
+
private Integer getRedisSelectDb(WarehouseProperties properties){
return properties.getStore().getRedis().getDb();
}
+
@Override
public CollectRep.MetricsData getCurrentMetricsData(@NonNull Long monitorId, @NonNull String metric) {
RedisCommands commands = connection.sync();