Buriburizaemon/nezha_domains
1
0
Fork 0
mirror of https://github.com/Buriburizaem0n/nezha_domains.git synced 2026-02-04 12:40:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

✨ 优化忽略规则配置和 Agent 获取 IP

Browse Source
This commit is contained in:
naiba
2021-06-21 21:30:42 +08:00
parent c4f36d17d5
commit 4b0c0ad288
20 changed files with 370 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
model/alertrule.go
View File

@@ -1,79 +1,11 @@
package model
import (
"bytes"
"encoding/json"
"fmt"
"time"
"gorm.io/gorm"
)
const (
RuleCheckPass = 1
RuleCheckFail = 0
)
type Rule struct {
// 指标类型，cpu、memory、swap、disk、net_in_speed、net_out_speed
// net_all_speed、transfer_in、transfer_out、transfer_all、offline
Type string `json:"type,omitempty"`
Min uint64 `json:"min,omitempty"` // 最小阈值 (百分比、字节 kb ÷ 1024)
Max uint64 `json:"max,omitempty"` // 最大阈值 (百分比、字节 kb ÷ 1024)
Duration uint64 `json:"duration,omitempty"` // 持续时间 (秒)
Ignore map[uint64]bool `json:"ignore,omitempty"` //忽略此规则的ID列表
}
func percentage(used, total uint64) uint64 {
if total == 0 {
return 0
}
return used * 100 / total
}
// Snapshot 未通过规则返回 struct{}{}, 通过返回 nil
func (u *Rule) Snapshot(server *Server) interface{} {
if u.Ignore[server.ID] {
return nil
}
var src uint64
switch u.Type {
case "cpu":
src = uint64(server.State.CPU)
case "memory":
src = percentage(server.State.MemUsed, server.Host.MemTotal)
case "swap":
src = percentage(server.State.SwapUsed, server.Host.SwapTotal)
case "disk":
src = percentage(server.State.DiskUsed, server.Host.DiskTotal)
case "net_in_speed":
src = server.State.NetInSpeed
case "net_out_speed":
src = server.State.NetOutSpeed
case "net_all_speed":
src = server.State.NetOutSpeed + server.State.NetOutSpeed
case "transfer_in":
src = server.State.NetInTransfer
case "transfer_out":
src = server.State.NetOutTransfer
case "transfer_all":
src = server.State.NetOutTransfer + server.State.NetInTransfer
case "offline":
if server.LastActive.IsZero() {
src = 0
} else {
src = uint64(server.LastActive.Unix())
}
}
if u.Type == "offline" && uint64(time.Now().Unix())-src > 6 {
return struct{}{}
} else if (u.Max > 0 && src > u.Max) || (u.Min > 0 && src < u.Min) {
return struct{}{}
}
return nil
}
type AlertRule struct {
Common
Name string
@@ -103,8 +35,7 @@ func (r *AlertRule) Snapshot(server *Server) []interface{} {
return point
}
func (r *AlertRule) Check(points [][]interface{}) (int, string) {
var dist bytes.Buffer
func (r *AlertRule) Check(points [][]interface{}) (int, bool) {
var max int
var count int
for i := 0; i < len(r.Rules); i++ {
@@ -125,11 +56,11 @@ func (r *AlertRule) Check(points [][]interface{}) (int, string) {
}
if fail/total > 0.7 {
count++
dist.WriteString(fmt.Sprintf("%+v\n", r.Rules[i]))
break
}
}
if count == len(r.Rules) {
return max, dist.String()
return max, false
}
return max, ""
return max, true
}

6
model/cron.go
View File

@@ -8,6 +8,11 @@ import (
"gorm.io/gorm"
)
const (
CronCoverIgnoreAll = iota
CronCoverAll
)
type Cron struct {
Common
Name string
@@ -17,6 +22,7 @@ type Cron struct {
PushSuccessful bool // 推送成功的通知
LastExecutedAt time.Time // 最后一次执行时间
LastResult bool // 最后一次执行结果
Cover uint8
CronID cron.EntryID `gorn:"-"`
ServersRaw string

9
model/monitor.go
View File

@@ -15,6 +15,11 @@ const (
TaskTypeCommand
)
const (
MonitorCoverAll = iota
MonitorCoverIgnoreAll
)
type Monitor struct {
Common
Name string
@@ -22,8 +27,8 @@ type Monitor struct {
Target string
SkipServersRaw string
Notify bool
SkipServers map[uint64]bool `gorm:"-" json:"-"`
Cover uint8
SkipServers map[uint64]bool `gorm:"-" json:"-"`
}
func (m *Monitor) PB() *pb.Task {

77
model/rule.go Normal file
View File

@@ -0,0 +1,77 @@
package model
import "time"
const (
RuleCoverAll = iota
RuleCoverIgnoreAll
)
type Rule struct {
// 指标类型，cpu、memory、swap、disk、net_in_speed、net_out_speed
// net_all_speed、transfer_in、transfer_out、transfer_all、offline
Type string `json:"type,omitempty"`
Min uint64 `json:"min,omitempty"` // 最小阈值 (百分比、字节 kb ÷ 1024)
Max uint64 `json:"max,omitempty"` // 最大阈值 (百分比、字节 kb ÷ 1024)
Duration uint64 `json:"duration,omitempty"` // 持续时间 (秒)
Cover uint64 `json:"cover,omitempty"` // 覆盖范围 RuleCoverAll/IgnoreAll
Ignore map[uint64]bool `json:"ignore,omitempty"` // 覆盖范围的排除
}
func percentage(used, total uint64) uint64 {
if total == 0 {
return 0
}
return used * 100 / total
}
// Snapshot 未通过规则返回 struct{}{}, 通过返回 nil
func (u *Rule) Snapshot(server *Server) interface{} {
// 监控全部但是排除了此服务器
if u.Cover == RuleCoverAll && u.Ignore[server.ID] {
return nil
}
// 忽略全部但是指定监控了此服务器
if u.Cover == RuleCoverIgnoreAll && !u.Ignore[server.ID] {
return nil
}
var src uint64
switch u.Type {
case "cpu":
src = uint64(server.State.CPU)
case "memory":
src = percentage(server.State.MemUsed, server.Host.MemTotal)
case "swap":
src = percentage(server.State.SwapUsed, server.Host.SwapTotal)
case "disk":
src = percentage(server.State.DiskUsed, server.Host.DiskTotal)
case "net_in_speed":
src = server.State.NetInSpeed
case "net_out_speed":
src = server.State.NetOutSpeed
case "net_all_speed":
src = server.State.NetOutSpeed + server.State.NetOutSpeed
case "transfer_in":
src = server.State.NetInTransfer
case "transfer_out":
src = server.State.NetOutTransfer
case "transfer_all":
src = server.State.NetOutTransfer + server.State.NetInTransfer
case "offline":
if server.LastActive.IsZero() {
src = 0
} else {
src = uint64(server.LastActive.Unix())
}
}
if u.Type == "offline" && uint64(time.Now().Unix())-src > 6 {
return struct{}{}
} else if (u.Max > 0 && src > u.Max) || (u.Min > 0 && src < u.Min) {
return struct{}{}
}
return nil
}