Windy/server_box_monitor
1
0
Fork 0
mirror of https://github.com/lollipopkit/server_box_monitor.git synced 2025-01-08 11:47:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

#9 fix: rule check of mem & swap

Browse Source
This commit is contained in:
lollipopkit 2023-08-03 17:11:32 +08:00
parent d84ceccf28
commit 96ae29b3d7
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
model/rule.go
View File

@ -125,6 +125,9 @@ func (r *Rule) shouldNotifyMemory(s *memStatus, t *Threshold) (bool, *PushPair,
return false, nil, errors.Join(ErrInvalidRule, fmt.Errorf("invalid matcher: %s", r.Matcher))
}
// 使用百分比来对比
percent *= 100
switch t.ThresholdType {
case ThresholdTypeSize:
ok, err := t.True(size)
@ -142,7 +145,7 @@ func (r *Rule) shouldNotifyMemory(s *memStatus, t *Threshold) (bool, *PushPair,
}
return ok, NewPushPair(
"Mem "+r.Matcher,
fmt.Sprintf("%.2f%%", percent*100),
fmt.Sprintf("%.2f%%", percent),
), nil
default:
return false, nil, errors.Join(ErrInvalidRule, fmt.Errorf("invalid threshold type for memory: %s", t.ThresholdType.Name()))
@ -166,6 +169,9 @@ func (r *Rule) shouldNotifySwap(s *swapStatus, t *Threshold) (bool, *PushPair, e
return false, nil, errors.Join(ErrInvalidRule, fmt.Errorf("invalid matcher: %s", r.Matcher))
}
// 使用百分比来对比
percent *= 100
switch t.ThresholdType {
case ThresholdTypeSize:
ok, err := t.True(size)
@ -183,7 +189,7 @@ func (r *Rule) shouldNotifySwap(s *swapStatus, t *Threshold) (bool, *PushPair, e
}
return ok, NewPushPair(
"Swap "+r.Matcher,
fmt.Sprintf("%.2f%%", percent*100),
fmt.Sprintf("%.2f%%", percent),
), nil
default:
return false, nil, errors.Join(ErrInvalidRule, fmt.Errorf("invalid threshold type for swap: %s", t.ThresholdType.Name()))