Merge pull request #153 from MikoyChinese/theme-mdui [skip ci]

添加统计周期单位cycle_unit

Co-authored-by: MikoyChinese <22676744+MikoyChinese@users.noreply.github.com>

README.md

@@ -140,10 +140,12 @@ URL 里面也可放置占位符，请求时会进行简单的字符串替换。
   - transfer_in_cycle 周期内的入站流量
   - transfer_out_cycle 周期内的出站流量
   - transfer_all_cycle 周期内双向流量和
-- cycle_start 周期开始日期（可以是你机器计费周期的开始日期）
+- cycle_start 统计周期开始日期（可以是你机器计费周期的开始日期），RFC3339时间格式，例如北京时间为`2022-01-11T08:00:00.00+08:00`
-- cycle_interval 小时（可以设为 1 月，30\*24）
+- cycle_interval 每隔多少个周期单位（例如，周期单位为天，该值为7，则代表每隔7天统计一次）
+- cycle_unit 统计周期单位，默认`hour`,可选(`hour`, `day`, `week`, `month`, `year`)
 - min/max、cover、ignore 参考基本规则配置
-- 示例: ID 为 3 的机器（ignore 里面定义）的每月 15 号计费的出站月流量 1T 报警 `[{"type":"transfer_out_cycle","max":1000000000000,"cycle_start":"2021-07-15T08:00:00Z","cycle_interval":730,"cover":1,"ignore":{"3":true}}]`
+- 示例: ID 为 3 的机器（ignore 里面定义）的每月 15 号计费的出站月流量 1T 报警 `[{"type":"transfer_out_cycle","max":1000000000000,"cycle_start":"2021-07-15T08:00:00Z","cycle_interval":1,"cycle_unit":"month","cover":1,"ignore":{"3":true}}]`
+- [![7QKaUx.md.png](https://s4.ax1x.com/2022/01/13/7QKaUx.md.png)](https://imgtu.com/i/7QKaUx)
 
 </details>
 

model/rule.go

@@ -25,6 +25,7 @@ type Rule struct {
 	Max           float64         `json:"max,omitempty"`            // 最大阈值 (百分比、字节 kb ÷ 1024)
 	CycleStart    time.Time       `json:"cycle_start,omitempty"`    // 流量统计的开始时间
 	CycleInterval uint64          `json:"cycle_interval,omitempty"` // 流量统计周期
+	CycleUnit			string					`json:"cycle_unit,omitempty"` 		// 流量统计周期单位，默认hour,可选(hour, day, week, month, year)
 	Duration      uint64          `json:"duration,omitempty"`       // 持续时间 (秒)
 	Cover         uint64          `json:"cover,omitempty"`          // 覆盖范围 RuleCoverAll/IgnoreAll
 	Ignore        map[uint64]bool `json:"ignore,omitempty"`         // 覆盖范围的排除
@@ -88,21 +89,21 @@ func (u *Rule) Snapshot(cycleTransferStats *CycleTransferStats, server *Server,
 		}
 	case "transfer_in_cycle":
 		src = float64(server.State.NetInTransfer - uint64(server.PrevHourlyTransferIn))
-		if u.CycleInterval != 1 {
+		if u.CycleInterval != 0 {
 			var res NResult
 			db.Model(&Transfer{}).Select("SUM(`in`) AS n").Where("created_at > ? AND server_id = ?", u.GetTransferDurationStart(), server.ID).Scan(&res)
 			src += float64(res.N)
 		}
 	case "transfer_out_cycle":
 		src = float64(server.State.NetOutTransfer - uint64(server.PrevHourlyTransferOut))
-		if u.CycleInterval != 1 {
+		if u.CycleInterval != 0 {
 			var res NResult
 			db.Model(&Transfer{}).Select("SUM(`out`) AS n").Where("created_at > ? AND server_id = ?", u.GetTransferDurationStart(), server.ID).Scan(&res)
 			src += float64(res.N)
 		}
 	case "transfer_all_cycle":
 		src = float64(server.State.NetOutTransfer - uint64(server.PrevHourlyTransferOut) + server.State.NetInTransfer - uint64(server.PrevHourlyTransferIn))
-		if u.CycleInterval != 1 {
+		if u.CycleInterval != 0 {
 			var res NResult
 			db.Model(&Transfer{}).Select("SUM(`in`+`out`) AS n").Where("created_at > ?  AND server_id = ?", u.GetTransferDurationStart(), server.ID).Scan(&res)
 			src += float64(res.N)
@@ -146,7 +147,7 @@ func (u *Rule) Snapshot(cycleTransferStats *CycleTransferStats, server *Server,
 		cycleTransferStats.NextUpdate[server.ID] = u.NextTransferAt[server.ID]
 		// 自动更新周期流量展示起止时间
 		cycleTransferStats.From = u.GetTransferDurationStart()
-		cycleTransferStats.To = cycleTransferStats.From.Add(time.Hour * time.Duration(u.CycleInterval))
+		cycleTransferStats.To = u.GetTransferDurationEnd()
 	}
 
 	if u.Type == "offline" && float64(time.Now().Unix())-src > 6 {
@@ -163,6 +164,80 @@ func (rule Rule) IsTransferDurationRule() bool {
 }
 
 func (rule Rule) GetTransferDurationStart() time.Time {
-	interval := 3600 * int64(rule.CycleInterval)
+	// Accept uppercase and lowercase
-	return time.Unix(rule.CycleStart.Unix()+(time.Now().Unix()-rule.CycleStart.Unix())/interval*interval, 0)
+	unit := strings.ToLower(rule.CycleUnit)
+	startTime := rule.CycleStart
+	var nextTime time.Time
+	switch unit {
+	case "year":
+		nextTime = startTime.AddDate(int(rule.CycleInterval), 0, 0)
+		for time.Now().After(nextTime) {
+			startTime = nextTime
+			nextTime = nextTime.AddDate(int(rule.CycleInterval), 0, 0)
+		}
+	case "month":
+		nextTime = startTime.AddDate(0, int(rule.CycleInterval), 0)
+		for time.Now().After(nextTime) {
+			startTime = nextTime
+			nextTime = nextTime.AddDate(0, int(rule.CycleInterval), 0)
+		}
+	case "week":
+		nextTime = startTime.AddDate(0, 0, 7 * int(rule.CycleInterval))
+		for time.Now().After(nextTime) {
+			startTime = nextTime
+			nextTime = nextTime.AddDate(0, 0, 7 * int(rule.CycleInterval))
+		}
+	case "day":
+		nextTime = startTime.AddDate(0, 0, int(rule.CycleInterval))
+		for time.Now().After(nextTime) {
+			startTime = nextTime
+			nextTime = nextTime.AddDate(0, 0, int(rule.CycleInterval))
+		}
+	default:
+		// For hour unit or not set.
+		interval := 3600 * int64(rule.CycleInterval)
+		startTime = time.Unix(rule.CycleStart.Unix()+(time.Now().Unix()-rule.CycleStart.Unix())/interval*interval, 0)
+	}
+
+	return startTime
+}
+
+func (rule Rule) GetTransferDurationEnd() time.Time {
+	// Accept uppercase and lowercase
+	unit := strings.ToLower(rule.CycleUnit)
+	startTime := rule.CycleStart
+	var nextTime time.Time
+	switch unit {
+	case "year":
+		nextTime = startTime.AddDate(int(rule.CycleInterval), 0, 0)
+		for time.Now().After(nextTime) {
+			startTime = nextTime
+			nextTime = nextTime.AddDate(int(rule.CycleInterval), 0, 0)
+		}
+	case "month":
+		nextTime = startTime.AddDate(0, int(rule.CycleInterval), 0)
+		for time.Now().After(nextTime) {
+			startTime = nextTime
+			nextTime = nextTime.AddDate(0, int(rule.CycleInterval), 0)
+		}
+	case "week":
+		nextTime = startTime.AddDate(0, 0, 7 * int(rule.CycleInterval))
+		for time.Now().After(nextTime) {
+			startTime = nextTime
+			nextTime = nextTime.AddDate(0, 0, 7 * int(rule.CycleInterval))
+		}
+	case "day":
+		nextTime = startTime.AddDate(0, 0, int(rule.CycleInterval))
+		for time.Now().After(nextTime) {
+			startTime = nextTime
+			nextTime = nextTime.AddDate(0, 0, int(rule.CycleInterval))
+		}
+	default:
+		// For hour unit or not set.
+		interval := 3600 * int64(rule.CycleInterval)
+		startTime = time.Unix(rule.CycleStart.Unix()+(time.Now().Unix()-rule.CycleStart.Unix())/interval*interval, 0)
+		nextTime = time.Unix(startTime.Unix() + interval, 0)
+	}
+
+	return nextTime
 }

resource/template/theme-mdui/viewpassword.html

@@ -57,7 +57,6 @@
            timeout: 2000,
          });
           mdui.mutation();
-          $input[0].focus();
         }
       }
     };

service/singleton/alertsentinel.go

@@ -38,10 +38,11 @@ func addCycleTransferStatsInfo(alert *model.AlertRule) {
 		}
 		if AlertsCycleTransferStatsStore[alert.ID] == nil {
 			from := alert.Rules[j].GetTransferDurationStart()
+			to := alert.Rules[j].GetTransferDurationEnd()
 			AlertsCycleTransferStatsStore[alert.ID] = &model.CycleTransferStats{
 				Name:       alert.Name,
 				From:       from,
-				To:         from.Add(time.Hour * time.Duration(alert.Rules[j].CycleInterval)),
+				To:         to,
 				Max:        uint64(alert.Rules[j].Max),
 				Min:        uint64(alert.Rules[j].Min),
 				ServerName: make(map[uint64]string),