wkyuer 4 дней назад
Родитель
Сommit
bda045e8ad
2 измененных файлов с 12 добавлено и 6 удалено
  1. 5 5
      escheck/config.json
  2. 7 1
      escheck/main.go

+ 5 - 5
escheck/config.json

@@ -1,12 +1,12 @@
 {
     "task": [
         {
-            "cron": "0 0/10 8-20 ? * * ",
-            "tjscope": "-3,h",
-            "min": 100,
-            "max": 50000,
+            "cron": "0 0/1 8-20 ? * * ",
+            "tjscope": "-10,m",
+            "min": 6,
+            "max": 3000,
             "type": "alert",
-            "name": "es工作日预警3小时内范围100~4万"
+            "name": "es工作日预警10分钟内范围6~3000"
         },
         {
             "cron": "0 51 0-7,21-23 ? * * ",

+ 7 - 1
escheck/main.go

@@ -80,7 +80,10 @@ func main() {
 		local, _ := time.LoadLocation("Asia/Shanghai")
 		c := cron.New(cron.WithLocation(local), cron.WithSeconds())
 		for _, v := range Ts {
-			c.AddFunc(v.Cron, v.task)
+			_, err := c.AddFunc(v.Cron, v.task)
+			if err != nil {
+				panic(err)
+			}
 		}
 		c.Start()
 		defer c.Stop()
@@ -99,6 +102,9 @@ func (t *T) task() {
 	st, et := int64(0), int64(0)
 	now := time.Now()
 	switch qt[1] {
+	case "m":
+		et = now.Unix()
+		st = et + util.Int64All(qt[0])*60
 	case "h":
 		et = now.Unix()
 		st = et + util.Int64All(qt[0])*3600