🐛 fix service stats

cmd/agent/main.go

@@ -358,7 +358,7 @@ func handleHttpGetTask(task *pb.Task, result *pb.TaskResult) {
 		// 检查 SSL 证书信息
 		if resp.TLS != nil && len(resp.TLS.PeerCertificates) > 0 {
 			c := resp.TLS.PeerCertificates[0]
-			result.Data = c.Issuer.CommonName + "|" + c.NotAfter.In(time.Local).String()
+			result.Data = c.Issuer.CommonName + "|" + c.NotAfter.String()
 		}
 		result.Successful = true
 	} else {

cmd/dashboard/controller/controller.go

@@ -183,7 +183,7 @@ var funcMap = template.FuncMap{
 	},
 	"dayBefore": func(i int) string {
 		year, month, day := time.Now().Date()
-		today := time.Date(year, month, day, 0, 0, 0, 0, time.Local)
+		today := time.Date(year, month, day, 0, 0, 0, 0, singleton.Loc)
 		return today.AddDate(0, 0, i-29).Format("01/02")
 	},
 	"className": func(percent float32) string {

cmd/dashboard/main.go

@@ -13,8 +13,8 @@ import (
 
 func init() {
 	// 初始化 dao 包
-	singleton.Init()
 	singleton.InitConfigFromPath("data/config.yaml")
+	singleton.InitTimezoneAndCache()
 	singleton.InitDBFromPath("data/sqlite.db")
 	singleton.InitLocalizer()
 	initSystem()

go.mod

@@ -31,11 +31,11 @@ require (
 	github.com/spf13/viper v1.13.0
 	github.com/stretchr/testify v1.8.0
 	github.com/xanzy/go-gitlab v0.73.1
-	golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be
+	golang.org/x/crypto v0.0.0-20221012134737-56aed061732a
 	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1
 	golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0
-	golang.org/x/text v0.3.7
+	golang.org/x/text v0.3.8
-	google.golang.org/grpc v1.49.0
+	google.golang.org/grpc v1.50.0
 	google.golang.org/protobuf v1.28.1
 	gorm.io/driver/sqlite v1.4.2
 	gorm.io/gorm v1.24.0

go.sum

@@ -356,8 +356,8 @@ golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm
 golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be h1:fmw3UbQh+nxngCAHrDCCztao/kbYFnWjoqop8dHx05A=
+golang.org/x/crypto v0.0.0-20221012134737-56aed061732a h1:NmSIgad6KjE6VvHciPZuNRTKxGhlPfD6OA87W/PLkqg=
-golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.0.0-20221012134737-56aed061732a/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -518,8 +518,9 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -659,8 +660,8 @@ google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM
 google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
 google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8=
 google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
-google.golang.org/grpc v1.49.0 h1:WTLtQzmQori5FUH25Pq4WT22oCsv8USpQ+F6rqtsmxw=
+google.golang.org/grpc v1.50.0 h1:fPVVDxY9w++VjTZsYvXWqEf9Rqar/e+9zYfxKK+W+YU=
-google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI=
+google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=

model/config.go

@@ -103,6 +103,8 @@ type Config struct {
 	Cover                      uint8  // 覆盖范围（0:提醒未被 IgnoredIPNotification 包含的所有服务器; 1:仅提醒被 IgnoredIPNotification 包含的服务器;）
 	IgnoredIPNotification      string // 特定服务器IP（多个服务器用逗号分隔）
 
+	Location string // 时区，默认为 Asia/Shanghai
+
 	v                              *viper.Viper
 	IgnoredIPNotificationServerIDs map[uint64]bool // [ServerID] -> bool(值为true代表当前ServerID在特定服务器列表内）
 }
@@ -136,6 +138,9 @@ func (c *Config) Read(path string) error {
 	if c.EnableIPChangeNotification && c.IPChangeNotificationTag == "" {
 		c.IPChangeNotificationTag = "default"
 	}
+	if c.Location == "" {
+		c.Location = "Asia/Shanghai"
+	}
 
 	c.updateIgnoredIPNotificationID()
 	return nil

model/monitor_history.go

@@ -1,23 +1,11 @@
 package model
 
-import (
-	pb "github.com/naiba/nezha/proto"
-)
-
 // MonitorHistory 历史监控记录
 type MonitorHistory struct {
 	Common
-	MonitorID  uint64
+	MonitorID uint64
-	Delay      float32 // 延迟，毫秒
+	AvgDelay  float32 // 平均延迟，毫秒
-	Data       string
+	Up        uint64  // 检查状态良好计数
-	Successful bool // 是否成功
+	Down      uint64  // 检查状态异常计数
-}
+	Data      string
-
-func PB2MonitorHistory(r *pb.TaskResult) MonitorHistory {
-	return MonitorHistory{
-		Delay:      r.GetDelay(),
-		Successful: r.GetSuccessful(),
-		MonitorID:  r.GetId(),
-		Data:       r.GetData(),
-	}
 }

service/singleton/servicesentinel.go

@@ -34,15 +34,16 @@ type _TodayStatsOfMonitor struct {
 // NewServiceSentinel 创建服务监控器
 func NewServiceSentinel(serviceSentinelDispatchBus chan<- model.Monitor) {
 	ServiceSentinelShared = &ServiceSentinel{
-		serviceReportChannel:                make(chan ReportData, 200),
+		serviceReportChannel:                    make(chan ReportData, 200),
-		serviceStatusToday:                  make(map[uint64]*_TodayStatsOfMonitor),
+		serviceStatusToday:                      make(map[uint64]*_TodayStatsOfMonitor),
-		serviceCurrentStatusIndex:           make(map[uint64]int),
+		serviceCurrentStatusIndex:               make(map[uint64]int),
-		serviceCurrentStatusData:            make(map[uint64][]model.MonitorHistory),
+		serviceCurrentStatusData:                make(map[uint64][]*pb.TaskResult),
-		lastStatus:                          make(map[uint64]int),
+		lastStatus:                              make(map[uint64]int),
-		serviceResponseDataStoreCurrentUp:   make(map[uint64]uint64),
+		serviceResponseDataStoreCurrentUp:       make(map[uint64]uint64),
-		serviceResponseDataStoreCurrentDown: make(map[uint64]uint64),
+		serviceResponseDataStoreCurrentDown:     make(map[uint64]uint64),
-		monitors:                            make(map[uint64]*model.Monitor),
+		serviceResponseDataStoreCurrentAvgDelay: make(map[uint64]float32),
-		sslCertCache:                        make(map[uint64]string),
+		monitors:                                make(map[uint64]*model.Monitor),
+		sslCertCache:                            make(map[uint64]string),
 		// 30天数据缓存
 		monthlyStatus: make(map[uint64]*model.ServiceItemResponse),
 		dispatchBus:   serviceSentinelDispatchBus,
@@ -51,24 +52,23 @@ func NewServiceSentinel(serviceSentinelDispatchBus chan<- model.Monitor) {
 	ServiceSentinelShared.loadMonitorHistory()
 
 	year, month, day := time.Now().Date()
-	today := time.Date(year, month, day, 0, 0, 0, 0, time.Local)
+	today := time.Date(year, month, day, 0, 0, 0, 0, Loc)
 
 	var mhs []model.MonitorHistory
 	// 加载当日记录
 	DB.Where("created_at >= ?", today).Find(&mhs)
 	totalDelay := make(map[uint64]float32)
+	totalDelayCount := make(map[uint64]float32)
 	for i := 0; i < len(mhs); i++ {
-		if mhs[i].Successful {
+		totalDelay[mhs[i].MonitorID] += mhs[i].AvgDelay
-			ServiceSentinelShared.serviceStatusToday[mhs[i].MonitorID].Up++
+		totalDelayCount[mhs[i].MonitorID]++
-			ServiceSentinelShared.monthlyStatus[mhs[i].MonitorID].TotalUp++
+		ServiceSentinelShared.serviceStatusToday[mhs[i].MonitorID].Up += int(mhs[i].Up)
-			totalDelay[mhs[i].MonitorID] += mhs[i].Delay
+		ServiceSentinelShared.monthlyStatus[mhs[i].MonitorID].TotalUp += mhs[i].Up
-		} else {
+		ServiceSentinelShared.serviceStatusToday[mhs[i].MonitorID].Down += int(mhs[i].Down)
-			ServiceSentinelShared.serviceStatusToday[mhs[i].MonitorID].Down++
+		ServiceSentinelShared.monthlyStatus[mhs[i].MonitorID].TotalDown += mhs[i].Down
-			ServiceSentinelShared.monthlyStatus[mhs[i].MonitorID].TotalDown++
-		}
 	}
 	for id, delay := range totalDelay {
-		ServiceSentinelShared.serviceStatusToday[id].Delay = delay / float32(ServiceSentinelShared.serviceStatusToday[id].Up)
+		ServiceSentinelShared.serviceStatusToday[id].Delay = delay / float32(totalDelayCount[id])
 	}
 
 	// 启动服务监控器
@@ -93,14 +93,15 @@ type ServiceSentinel struct {
 	// 服务监控任务调度通道
 	dispatchBus chan<- model.Monitor
 
-	serviceResponseDataStoreLock        sync.RWMutex
+	serviceResponseDataStoreLock            sync.RWMutex
-	serviceStatusToday                  map[uint64]*_TodayStatsOfMonitor  // [monitor_id] -> _TodayStatsOfMonitor
+	serviceStatusToday                      map[uint64]*_TodayStatsOfMonitor // [monitor_id] -> _TodayStatsOfMonitor
-	serviceCurrentStatusIndex           map[uint64]int                    // [monitor_id] -> 该监控ID对应的 serviceCurrentStatusData 的最新索引下标
+	serviceCurrentStatusIndex               map[uint64]int                   // [monitor_id] -> 该监控ID对应的 serviceCurrentStatusData 的最新索引下标
-	serviceCurrentStatusData            map[uint64][]model.MonitorHistory // [monitor_id] -> []model.MonitorHistory
+	serviceCurrentStatusData                map[uint64][]*pb.TaskResult      // [monitor_id] -> []model.MonitorHistory
-	serviceResponseDataStoreCurrentUp   map[uint64]uint64                 // [monitor_id] -> 当前服务在线计数
+	serviceResponseDataStoreCurrentUp       map[uint64]uint64                // [monitor_id] -> 当前服务在线计数
-	serviceResponseDataStoreCurrentDown map[uint64]uint64                 // [monitor_id] -> 当前服务离线计数
+	serviceResponseDataStoreCurrentDown     map[uint64]uint64                // [monitor_id] -> 当前服务离线计数
-	lastStatus                          map[uint64]int
+	serviceResponseDataStoreCurrentAvgDelay map[uint64]float32               // [monitor_id] -> 当前服务离线计数
-	sslCertCache                        map[uint64]string
+	lastStatus                              map[uint64]int
+	sslCertCache                            map[uint64]string
 
 	monitorsLock sync.RWMutex
 	monitors     map[uint64]*model.Monitor // [monitor_id] -> model.Monitor
@@ -133,6 +134,7 @@ func (ss *ServiceSentinel) refreshMonthlyServiceStatus() {
 		// 清理前一天数据
 		ss.serviceResponseDataStoreCurrentUp[k] = 0
 		ss.serviceResponseDataStoreCurrentDown[k] = 0
+		ss.serviceResponseDataStoreCurrentAvgDelay[k] = 0
 		ss.serviceStatusToday[k].Delay = 0
 		ss.serviceStatusToday[k].Up = 0
 		ss.serviceStatusToday[k].Down = 0
@@ -187,12 +189,12 @@ func (ss *ServiceSentinel) loadMonitorHistory() {
 			panic(err)
 		}
 		ss.monitors[monitors[i].ID] = monitors[i]
-		ss.serviceCurrentStatusData[monitors[i].ID] = make([]model.MonitorHistory, _CurrentStatusSize)
+		ss.serviceCurrentStatusData[monitors[i].ID] = make([]*pb.TaskResult, _CurrentStatusSize)
 		ss.serviceStatusToday[monitors[i].ID] = &_TodayStatsOfMonitor{}
 	}
 
 	year, month, day := time.Now().Date()
-	today := time.Date(year, month, day, 0, 0, 0, 0, time.Local)
+	today := time.Date(year, month, day, 0, 0, 0, 0, Loc)
 
 	for i := 0; i < len(monitors); i++ {
 		ServiceSentinelShared.monthlyStatus[monitors[i].ID] = &model.ServiceItemResponse{
@@ -206,16 +208,15 @@ func (ss *ServiceSentinel) loadMonitorHistory() {
 	// 加载服务监控历史记录
 	var mhs []model.MonitorHistory
 	DB.Where("created_at >= ? AND created_at < ?", today.AddDate(0, 0, -29), today).Find(&mhs)
+	var delayCount = make(map[int]int)
 	for i := 0; i < len(mhs); i++ {
 		dayIndex := 28 - (int(today.Sub(mhs[i].CreatedAt).Hours()) / 24)
-		if mhs[i].Successful {
+		ServiceSentinelShared.monthlyStatus[mhs[i].MonitorID].Delay[dayIndex] = (ServiceSentinelShared.monthlyStatus[mhs[i].MonitorID].Delay[dayIndex]*float32(delayCount[dayIndex]) + mhs[i].AvgDelay) / float32(delayCount[dayIndex]+1)
-			ServiceSentinelShared.monthlyStatus[mhs[i].MonitorID].Delay[dayIndex] = (ServiceSentinelShared.monthlyStatus[mhs[i].MonitorID].Delay[dayIndex]*float32(ss.monthlyStatus[mhs[i].MonitorID].Up[dayIndex]) + mhs[i].Delay) / float32(ss.monthlyStatus[mhs[i].MonitorID].Up[dayIndex]+1)
+		delayCount[dayIndex]++
-			ServiceSentinelShared.monthlyStatus[mhs[i].MonitorID].Up[dayIndex]++
+		ServiceSentinelShared.monthlyStatus[mhs[i].MonitorID].Up[dayIndex] += int(mhs[i].Up)
-			ServiceSentinelShared.monthlyStatus[mhs[i].MonitorID].TotalUp++
+		ServiceSentinelShared.monthlyStatus[mhs[i].MonitorID].TotalUp += mhs[i].Up
-		} else {
+		ServiceSentinelShared.monthlyStatus[mhs[i].MonitorID].Down[dayIndex] += int(mhs[i].Down)
-			ServiceSentinelShared.monthlyStatus[mhs[i].MonitorID].Down[dayIndex]++
+		ServiceSentinelShared.monthlyStatus[mhs[i].MonitorID].TotalDown += mhs[i].Down
-			ServiceSentinelShared.monthlyStatus[mhs[i].MonitorID].TotalDown++
-		}
 	}
 }
 
@@ -246,7 +247,7 @@ func (ss *ServiceSentinel) OnMonitorUpdate(m model.Monitor) error {
 			Up:      &[30]int{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
 			Down:    &[30]int{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
 		}
-		ss.serviceCurrentStatusData[m.ID] = make([]model.MonitorHistory, _CurrentStatusSize)
+		ss.serviceCurrentStatusData[m.ID] = make([]*pb.TaskResult, _CurrentStatusSize)
 		ss.serviceStatusToday[m.ID] = &_TodayStatsOfMonitor{}
 	}
 	// 更新这个任务
@@ -267,6 +268,7 @@ func (ss *ServiceSentinel) OnMonitorDelete(id uint64) {
 	delete(ss.lastStatus, id)
 	delete(ss.serviceResponseDataStoreCurrentUp, id)
 	delete(ss.serviceResponseDataStoreCurrentDown, id)
+	delete(ss.serviceResponseDataStoreCurrentAvgDelay, id)
 	delete(ss.sslCertCache, id)
 	delete(ss.serviceStatusToday, id)
 
@@ -300,6 +302,7 @@ func (ss *ServiceSentinel) LoadStats() map[uint64]*model.ServiceItemResponse {
 		ss.monthlyStatus[k].Down[29] = v.Down
 		ss.monthlyStatus[k].Delay[29] = v.Delay
 	}
+
 	// 最后 5 分钟的状态 与 monitor 对象填充
 	for k, v := range ss.serviceResponseDataStoreCurrentDown {
 		ss.monthlyStatus[k].CurrentDown = v
@@ -307,6 +310,7 @@ func (ss *ServiceSentinel) LoadStats() map[uint64]*model.ServiceItemResponse {
 	for k, v := range ss.serviceResponseDataStoreCurrentUp {
 		ss.monthlyStatus[k].CurrentUp = v
 	}
+
 	return ss.monthlyStatus
 }
 
@@ -318,48 +322,49 @@ func (ss *ServiceSentinel) worker() {
 			log.Printf("NEZAH>> 错误的服务监控上报 %+v", r)
 			continue
 		}
-		mh := model.PB2MonitorHistory(r.Data)
+		mh := r.Data
 		ss.serviceResponseDataStoreLock.Lock()
 		// 写入当天状态
 		if mh.Successful {
-			ss.serviceStatusToday[mh.MonitorID].Delay = (ss.serviceStatusToday[mh.
+			ss.serviceStatusToday[mh.GetId()].Delay = (ss.serviceStatusToday[mh.
-				MonitorID].Delay*float32(ss.serviceStatusToday[mh.MonitorID].Up) +
+				GetId()].Delay*float32(ss.serviceStatusToday[mh.GetId()].Up) +
-				mh.Delay) / float32(ss.serviceStatusToday[mh.MonitorID].Up+1)
+				mh.Delay) / float32(ss.serviceStatusToday[mh.GetId()].Up+1)
-			ss.serviceStatusToday[mh.MonitorID].Up++
+			ss.serviceStatusToday[mh.GetId()].Up++
 		} else {
-			ss.serviceStatusToday[mh.MonitorID].Down++
+			ss.serviceStatusToday[mh.GetId()].Down++
-			ServerLock.RLock()
-			log.Println("NEZHA>> Services Incident:", ss.monitors[mh.MonitorID].Target, "Reporter:", ServerList[r.Reporter].Name, "Error:", mh.Data)
-			ServerLock.RUnlock()
 		}
 		// 写入当前数据
-		ss.serviceCurrentStatusData[mh.MonitorID][ss.serviceCurrentStatusIndex[mh.MonitorID]] = mh
+		ss.serviceCurrentStatusData[mh.GetId()][ss.serviceCurrentStatusIndex[mh.GetId()]] = mh
-		ss.serviceCurrentStatusIndex[mh.MonitorID]++
+		ss.serviceCurrentStatusIndex[mh.GetId()]++
 		// 更新当前状态
-		ss.serviceResponseDataStoreCurrentUp[mh.MonitorID] = 0
+		ss.serviceResponseDataStoreCurrentUp[mh.GetId()] = 0
-		ss.serviceResponseDataStoreCurrentDown[mh.MonitorID] = 0
+		ss.serviceResponseDataStoreCurrentDown[mh.GetId()] = 0
-		for i := 0; i < len(ss.serviceCurrentStatusData[mh.MonitorID]); i++ {
+		ss.serviceResponseDataStoreCurrentAvgDelay[mh.GetId()] = 0
-			if ss.serviceCurrentStatusData[mh.MonitorID][i].MonitorID > 0 {
+		// 永远是最新的 30 个数据的状态 [01:00, 02:00, 03:00] -> [04:00, 02:00, 03: 00]
-				if ss.serviceCurrentStatusData[mh.MonitorID][i].Successful {
+		for i := 0; i < len(ss.serviceCurrentStatusData[mh.GetId()]); i++ {
-					ss.serviceResponseDataStoreCurrentUp[mh.MonitorID]++
+			if ss.serviceCurrentStatusData[mh.GetId()][i].GetId() > 0 {
+				if ss.serviceCurrentStatusData[mh.GetId()][i].Successful {
+					ss.serviceResponseDataStoreCurrentUp[mh.GetId()]++
+					ss.serviceResponseDataStoreCurrentAvgDelay[mh.GetId()] = (ss.serviceResponseDataStoreCurrentAvgDelay[mh.GetId()]*float32(ss.serviceResponseDataStoreCurrentUp[mh.GetId()]-1) + ss.serviceCurrentStatusData[mh.GetId()][i].Delay) / float32(ss.serviceResponseDataStoreCurrentUp[mh.GetId()])
 				} else {
-					ss.serviceResponseDataStoreCurrentDown[mh.MonitorID]++
+					ss.serviceResponseDataStoreCurrentDown[mh.GetId()]++
 				}
 			}
 		}
 		var upPercent uint64 = 0
-		if ss.serviceResponseDataStoreCurrentDown[mh.MonitorID]+ss.serviceResponseDataStoreCurrentUp[mh.MonitorID] > 0 {
+		if ss.serviceResponseDataStoreCurrentDown[mh.GetId()]+ss.serviceResponseDataStoreCurrentUp[mh.GetId()] > 0 {
-			upPercent = ss.serviceResponseDataStoreCurrentUp[mh.MonitorID] * 100 / (ss.serviceResponseDataStoreCurrentDown[mh.MonitorID] + ss.serviceResponseDataStoreCurrentUp[mh.MonitorID])
+			upPercent = ss.serviceResponseDataStoreCurrentUp[mh.GetId()] * 100 / (ss.serviceResponseDataStoreCurrentDown[mh.GetId()] + ss.serviceResponseDataStoreCurrentUp[mh.GetId()])
 		}
 		stateCode := GetStatusCode(upPercent)
 		// 数据持久化
-		if ss.serviceCurrentStatusIndex[mh.MonitorID] == _CurrentStatusSize {
+		if ss.serviceCurrentStatusIndex[mh.GetId()] == _CurrentStatusSize {
-			ss.serviceCurrentStatusIndex[mh.MonitorID] = 0
+			ss.serviceCurrentStatusIndex[mh.GetId()] = 0
 			if err := DB.Create(&model.MonitorHistory{
-				MonitorID:  mh.MonitorID,
+				MonitorID: mh.GetId(),
-				Delay:      ss.serviceStatusToday[mh.MonitorID].Delay,
+				AvgDelay:  ss.serviceResponseDataStoreCurrentAvgDelay[mh.GetId()],
-				Successful: stateCode == StatusGood,
+				Data:      mh.Data,
-				Data:       mh.Data,
+				Up:        ss.serviceResponseDataStoreCurrentUp[mh.GetId()],
+				Down:      ss.serviceResponseDataStoreCurrentDown[mh.GetId()],
 			}).Error; err != nil {
 				log.Println("NEZHA>> 服务监控数据持久化失败：", err)
 			}
@@ -367,23 +372,29 @@ func (ss *ServiceSentinel) worker() {
 		// 延迟报警
 		if mh.Delay > 0 {
 			ss.monitorsLock.RLock()
-			if ss.monitors[mh.MonitorID].LatencyNotify {
+			if ss.monitors[mh.GetId()].LatencyNotify {
-				if mh.Delay > ss.monitors[mh.MonitorID].MaxLatency {
+				if mh.Delay > ss.monitors[mh.GetId()].MaxLatency {
-					go SendNotification(ss.monitors[mh.MonitorID].NotificationTag, fmt.Sprintf("[Latency] %s %2f > %2f", ss.monitors[mh.MonitorID].Name, mh.Delay, ss.monitors[mh.MonitorID].MaxLatency), true)
+					ServerLock.RLock()
+					go SendNotification(ss.monitors[mh.GetId()].NotificationTag, fmt.Sprintf("[Latency] %s %2f > %2f, Reporter: %s", ss.monitors[mh.GetId()].Name, mh.Delay, ss.monitors[mh.GetId()].MaxLatency, ServerList[r.Reporter].Name), true)
+					ServerLock.RUnlock()
 				}
-				if mh.Delay < ss.monitors[mh.MonitorID].MinLatency {
+				if mh.Delay < ss.monitors[mh.GetId()].MinLatency {
-					go SendNotification(ss.monitors[mh.MonitorID].NotificationTag, fmt.Sprintf("[Latency] %s %2f < %2f", ss.monitors[mh.MonitorID].Name, mh.Delay, ss.monitors[mh.MonitorID].MinLatency), true)
+					ServerLock.RLock()
+					go SendNotification(ss.monitors[mh.GetId()].NotificationTag, fmt.Sprintf("[Latency] %s %2f < %2f, Reporter: %s", ss.monitors[mh.GetId()].Name, mh.Delay, ss.monitors[mh.GetId()].MinLatency, ServerList[r.Reporter].Name), true)
+					ServerLock.RUnlock()
 				}
 			}
 			ss.monitorsLock.RUnlock()
 		}
 		// 故障报警
-		if stateCode == StatusDown || stateCode != ss.lastStatus[mh.MonitorID] {
+		if stateCode == StatusDown || stateCode != ss.lastStatus[mh.GetId()] {
 			ss.monitorsLock.RLock()
-			isNeedSendNotification := (ss.lastStatus[mh.MonitorID] != 0 || stateCode == StatusDown) && ss.monitors[mh.MonitorID].Notify
+			isNeedSendNotification := (ss.lastStatus[mh.GetId()] != 0 || stateCode == StatusDown) && ss.monitors[mh.GetId()].Notify
-			ss.lastStatus[mh.MonitorID] = stateCode
+			ss.lastStatus[mh.GetId()] = stateCode
 			if isNeedSendNotification {
-				go SendNotification(ss.monitors[mh.MonitorID].NotificationTag, fmt.Sprintf("[%s] %s", StatusCodeToString(stateCode), ss.monitors[mh.MonitorID].Name), true)
+				ServerLock.RLock()
+				go SendNotification(ss.monitors[mh.GetId()].NotificationTag, fmt.Sprintf("[%s] %s Reporter: %s, Error: %s", StatusCodeToString(stateCode), ss.monitors[mh.GetId()].Name, ServerList[r.Reporter].Name, mh.Data), true)
+				ServerLock.RUnlock()
 			}
 			ss.monitorsLock.RUnlock()
 		}
@@ -400,8 +411,8 @@ func (ss *ServiceSentinel) worker() {
 		} else {
 			var newCert = strings.Split(mh.Data, "|")
 			if len(newCert) > 1 {
-				if ss.sslCertCache[mh.MonitorID] == "" {
+				if ss.sslCertCache[mh.GetId()] == "" {
-					ss.sslCertCache[mh.MonitorID] = mh.Data
+					ss.sslCertCache[mh.GetId()] = mh.Data
 				}
 				expiresNew, _ := time.Parse("2006-01-02 15:04:05 -0700 MST", newCert[1])
 				// 证书过期提醒
@@ -411,13 +422,13 @@ func (ss *ServiceSentinel) worker() {
 						expiresNew.Format("2006-01-02 15:04:05"))
 				}
 				// 证书变更提醒
-				var oldCert = strings.Split(ss.sslCertCache[mh.MonitorID], "|")
+				var oldCert = strings.Split(ss.sslCertCache[mh.GetId()], "|")
 				var expiresOld time.Time
 				if len(oldCert) > 1 {
 					expiresOld, _ = time.Parse("2006-01-02 15:04:05 -0700 MST", oldCert[1])
 				}
 				if oldCert[0] != newCert[0] && !expiresNew.Equal(expiresOld) {
-					ss.sslCertCache[mh.MonitorID] = mh.Data
+					ss.sslCertCache[mh.GetId()] = mh.Data
 					errMsg = fmt.Sprintf(
 						"SSL certificate changed, old: %s, %s expired; new: %s, %s expired.",
 						oldCert[0], expiresOld.Format("2006-01-02 15:04:05"), newCert[0], expiresNew.Format("2006-01-02 15:04:05"))
@@ -426,8 +437,8 @@ func (ss *ServiceSentinel) worker() {
 		}
 		if errMsg != "" {
 			ss.monitorsLock.RLock()
-			if ss.monitors[mh.MonitorID].Notify {
+			if ss.monitors[mh.GetId()].Notify {
-				go SendNotification(ss.monitors[mh.MonitorID].NotificationTag, fmt.Sprintf("[SSL] %s %s", ss.monitors[mh.MonitorID].Name, errMsg), true)
+				go SendNotification(ss.monitors[mh.GetId()].NotificationTag, fmt.Sprintf("[SSL] %s %s", ss.monitors[mh.GetId()].Name, errMsg), true)
 			}
 			ss.monitorsLock.RUnlock()
 		}

service/singleton/singleton.go

@@ -21,11 +21,9 @@ var (
 	Loc   *time.Location
 )
 
-// Init 初始化singleton
+func InitTimezoneAndCache() {
-func Init() {
-	// 初始化时区至上海 UTF+8
 	var err error
-	Loc, err = time.LoadLocation("Asia/Shanghai")
+	Loc, err = time.LoadLocation(Conf.Location)
 	if err != nil {
 		panic(err)
 	}
@@ -75,7 +73,7 @@ func RecordTransferHourlyUsage() {
 	ServerLock.Lock()
 	defer ServerLock.Unlock()
 	now := time.Now()
-	nowTrimSeconds := time.Date(now.Year(), now.Month(), now.Day(), now.Hour(), 0, 0, 0, time.Local)
+	nowTrimSeconds := time.Date(now.Year(), now.Month(), now.Day(), now.Hour(), 0, 0, 0, Loc)
 	var txs []model.Transfer
 	for id, server := range ServerList {
 		tx := model.Transfer{