Merge upstream/master and resolve conflicts

service/singleton/singleton.go

@@ -87,12 +87,13 @@ func InitDBFromPath(path string) error {
 	}
 	err = DB.AutoMigrate(model.Server{}, model.User{}, model.ServerGroup{}, model.NotificationGroup{},
 		model.Notification{}, model.AlertRule{}, model.Service{}, model.NotificationGroupNotification{},
-		model.ServiceHistory{}, model.Cron{}, model.Transfer{}, model.ServerGroupServer{},
+		model.Cron{}, model.Transfer{}, model.ServerGroupServer{},
 		model.NAT{}, model.DDNSProfile{}, model.NotificationGroupNotification{},
 		model.WAF{}, model.Oauth2Bind{}, model.Domain{})
 	if err != nil {
 		return err
 	}
+
 	return nil
 }
 
@@ -130,14 +131,9 @@ func RecordTransferHourlyUsage(servers ...*model.Server) {
 	log.Printf("NEZHA>> Saved traffic metrics to database. Affected %d row(s), Error: %v", len(txs), DB.Create(txs).Error)
 }
 
-// CleanServiceHistory 清理无效或过时的 监控记录 和 流量记录
-func CleanServiceHistory() {
-	// 清理已被删除的服务器的监控记录与流量记录
-	DB.Unscoped().Delete(&model.ServiceHistory{}, "created_at < ? OR service_id NOT IN (SELECT `id` FROM services)", time.Now().AddDate(0, 0, -30))
-	// 由于网络监控记录的数据较多，并且前端仅使用了 1 天的数据
-	// 考虑到 sqlite 数据量问题，仅保留一天数据，
-	// server_id = 0 的数据会用于/service页面的可用性展示
-	DB.Unscoped().Delete(&model.ServiceHistory{}, "(created_at < ? AND server_id != 0) OR service_id NOT IN (SELECT `id` FROM services)", time.Now().AddDate(0, 0, -1))
+// CleanMonitorHistory 清理流量记录（TSDB 有自己的保留策略）
+func CleanMonitorHistory() {
+	// 清理已被删除的服务器的流量记录
 	DB.Unscoped().Delete(&model.Transfer{}, "server_id NOT IN (SELECT `id` FROM servers)")
 	// 计算可清理流量记录的时长
 	var allServerKeep time.Time
@@ -179,6 +175,28 @@ func CleanServiceHistory() {
 	}
 }
 
+// PerformMaintenance 执行系统维护（SQLite VACUUM 和 TSDB 维护）
+func PerformMaintenance() {
+	log.Println("NEZHA>> Starting system maintenance...")
+
+	// 1. SQLite 维护
+	if DB != nil {
+		log.Println("NEZHA>> SQLite: Starting VACUUM...")
+		if err := DB.Exec("VACUUM").Error; err != nil {
+			log.Printf("NEZHA>> SQLite: VACUUM failed: %v", err)
+		} else {
+			log.Println("NEZHA>> SQLite: VACUUM completed")
+		}
+	}
+
+	// 2. TSDB 维护
+	if TSDBEnabled() {
+		TSDBShared.Maintenance()
+	}
+
+	log.Println("NEZHA>> System maintenance completed")
+}
+
 // IPDesensitize 根据设置选择是否对IP进行打码处理 返回处理后的IP(关闭打码则返回原IP)
 func IPDesensitize(ip string) string {
 	if Conf.EnablePlainIPInNotification {