diff --git a/common/src/main/java/com/usthe/common/entity/alerter/AlertDefineMonitorBind.java b/common/src/main/java/com/usthe/common/entity/alerter/AlertDefineMonitorBind.java
index 9e3ceea7b2d..6ebae161bd3 100644
--- a/common/src/main/java/com/usthe/common/entity/alerter/AlertDefineMonitorBind.java
+++ b/common/src/main/java/com/usthe/common/entity/alerter/AlertDefineMonitorBind.java
@@ -42,7 +42,10 @@
* @date 2021/12/8 20:41
*/
@Entity
-@Table(name = "hzb_alert_define_monitor_bind")
+@Table(name = "hzb_alert_define_monitor_bind", indexes = {
+ @Index(name = "index_alert_define_monitor", columnList = "alertDefineId"),
+ @Index(name = "index_alert_define_monitor", columnList = "monitor_id")
+})
@Data
@Builder
@AllArgsConstructor
diff --git a/common/src/main/java/com/usthe/common/entity/manager/Monitor.java b/common/src/main/java/com/usthe/common/entity/manager/Monitor.java
index f17e27fc376..e91c88c3540 100644
--- a/common/src/main/java/com/usthe/common/entity/manager/Monitor.java
+++ b/common/src/main/java/com/usthe/common/entity/manager/Monitor.java
@@ -45,7 +45,11 @@
* @date 2021/11/14 9:53
*/
@Entity
-@Table(name = "hzb_monitor")
+@Table(name = "hzb_monitor", indexes = {
+ @Index(name = "monitor_query_index", columnList = "app"),
+ @Index(name = "monitor_query_index", columnList = "host"),
+ @Index(name = "monitor_query_index", columnList = "name")
+})
@Data
@Builder
@AllArgsConstructor
diff --git a/common/src/main/java/com/usthe/common/entity/manager/Param.java b/common/src/main/java/com/usthe/common/entity/manager/Param.java
index 2cbdcc666fd..6009cded10c 100644
--- a/common/src/main/java/com/usthe/common/entity/manager/Param.java
+++ b/common/src/main/java/com/usthe/common/entity/manager/Param.java
@@ -45,7 +45,8 @@
* @date 2021/11/13 22:19
*/
@Entity
-@Table(name = "hzb_param")
+@Table(name = "hzb_param", indexes = { @Index(columnList = "monitorId") },
+ uniqueConstraints = @UniqueConstraint(columnNames = {"monitorId", "field"}))
@Data
@Builder
@AllArgsConstructor
diff --git a/common/src/main/java/com/usthe/common/entity/manager/TagMonitorBind.java b/common/src/main/java/com/usthe/common/entity/manager/TagMonitorBind.java
index 3bb757335f4..d386311c93c 100644
--- a/common/src/main/java/com/usthe/common/entity/manager/TagMonitorBind.java
+++ b/common/src/main/java/com/usthe/common/entity/manager/TagMonitorBind.java
@@ -38,7 +38,10 @@
* @date 2021/11/13 22:19
*/
@Entity
-@Table(name = "hzb_tag_monitor_bind")
+@Table(name = "hzb_tag_monitor_bind", indexes = {
+ @Index(name = "index_tag_monitor", columnList = "tag_id"),
+ @Index(name = "index_tag_monitor", columnList = "monitor_id")
+})
@Data
@Builder
@AllArgsConstructor
diff --git a/common/src/main/java/com/usthe/common/entity/warehouse/History.java b/common/src/main/java/com/usthe/common/entity/warehouse/History.java
index 0ccec1f59f0..e5f2181702e 100644
--- a/common/src/main/java/com/usthe/common/entity/warehouse/History.java
+++ b/common/src/main/java/com/usthe/common/entity/warehouse/History.java
@@ -18,7 +18,12 @@
* @date 2023/2/3 14:13
*/
@Entity
-@Table(name = "hzb_history")
+@Table(name = "hzb_history", indexes = {
+ @Index(name = "history_query_index", columnList = "monitorId"),
+ @Index(name = "history_query_index", columnList = "app"),
+ @Index(name = "history_query_index", columnList = "metrics"),
+ @Index(name = "history_query_index", columnList = "metric")
+})
@Data
@Builder
@AllArgsConstructor
diff --git a/manager/src/main/resources/logback-spring.xml b/manager/src/main/resources/logback-spring.xml
index 21d90ee62eb..9f484c1ccb9 100644
--- a/manager/src/main/resources/logback-spring.xml
+++ b/manager/src/main/resources/logback-spring.xml
@@ -82,4 +82,13 @@
+
+
+
+
+
+
+
+
+
diff --git a/warehouse/src/main/java/com/usthe/warehouse/dao/HistoryDao.java b/warehouse/src/main/java/com/usthe/warehouse/dao/HistoryDao.java
index 53ea09004f3..263a4fd8469 100644
--- a/warehouse/src/main/java/com/usthe/warehouse/dao/HistoryDao.java
+++ b/warehouse/src/main/java/com/usthe/warehouse/dao/HistoryDao.java
@@ -47,7 +47,7 @@ public interface HistoryDao extends JpaRepository, JpaSpecificati
*/
@Modifying
@Transactional(rollbackFor = Exception.class)
- @Query(value = "delete from hzb_history limit 5000", nativeQuery = true)
+ @Query(value = "delete from hzb_history limit 20000", nativeQuery = true)
int deleteOlderHistoriesRecord();
/**
diff --git a/warehouse/src/main/java/com/usthe/warehouse/store/HistoryJpaDatabaseDataStorage.java b/warehouse/src/main/java/com/usthe/warehouse/store/HistoryJpaDatabaseDataStorage.java
index 0cbc7340e45..1ac0bf19bc5 100644
--- a/warehouse/src/main/java/com/usthe/warehouse/store/HistoryJpaDatabaseDataStorage.java
+++ b/warehouse/src/main/java/com/usthe/warehouse/store/HistoryJpaDatabaseDataStorage.java
@@ -56,7 +56,7 @@ public class HistoryJpaDatabaseDataStorage extends AbstractHistoryDataStorage {
private WarehouseProperties.StoreProperties.JpaProperties jpaProperties;
private static final int STRING_MAX_LENGTH = 1024;
- private static final int MAX_HISTORY_TABLE_RECORD = 200_000;
+ private static final int MAX_HISTORY_TABLE_RECORD = 60_000;
public HistoryJpaDatabaseDataStorage(WarehouseProperties properties,
HistoryDao historyDao) {