提交 926559c9 编写于 作者: N ning

refactor: motify log print

上级 136642f1
......@@ -76,9 +76,10 @@ func persist(event *models.AlertCurEvent) {
// 不管是告警还是恢复,全量告警里都要记录
if err := his.Add(); err != nil {
logger.Errorf(
"event_persist_his_fail: %v rule_id=%d hash=%s tags=%v timestamp=%d value=%s",
"event_persist_his_fail: %v rule_id=%d cluster:%s hash=%s tags=%v timestamp=%d value=%s",
err,
event.RuleId,
event.Cluster,
event.Hash,
event.TagsJSON,
event.TriggerTime,
......@@ -101,9 +102,10 @@ func persist(event *models.AlertCurEvent) {
if event.Id > 0 {
if err := event.Add(); err != nil {
logger.Errorf(
"event_persist_cur_fail: %v rule_id=%d hash=%s tags=%v timestamp=%d value=%s",
"event_persist_cur_fail: %v rule_id=%d cluster:%s hash=%s tags=%v timestamp=%d value=%s",
err,
event.RuleId,
event.Cluster,
event.Hash,
event.TagsJSON,
event.TriggerTime,
......@@ -126,9 +128,10 @@ func persist(event *models.AlertCurEvent) {
if event.Id > 0 {
if err := event.Add(); err != nil {
logger.Errorf(
"event_persist_cur_fail: %v rule_id=%d hash=%s tags=%v timestamp=%d value=%s",
"event_persist_cur_fail: %v rule_id=%d cluster:%s hash=%s tags=%v timestamp=%d value=%s",
err,
event.RuleId,
event.Cluster,
event.Hash,
event.TagsJSON,
event.TriggerTime,
......
......@@ -17,11 +17,12 @@ func LogEvent(event *models.AlertCurEvent, location string, err ...error) {
}
logger.Infof(
"event(%s %s) %s: rule_id=%d %v%s@%d %s",
"event(%s %s) %s: rule_id=%d cluster:%s %v%s@%d %s",
event.Hash,
status,
location,
event.RuleId,
event.Cluster,
event.TagsJSON,
event.TriggerValue,
event.TriggerTime,
......
......@@ -104,6 +104,8 @@ func (s *BgNotMatchMuteStrategy) IsMuted(rule *models.AlertRule, event *models.A
type EventMuteStrategy struct{}
var EventMuteStra = new(EventMuteStrategy)
func (s *EventMuteStrategy) IsMuted(rule *models.AlertRule, event *models.AlertCurEvent) bool {
mutes, has := memsto.AlertMuteCache.Gets(event.GroupId)
if !has || len(mutes) == 0 {
......
......@@ -78,12 +78,12 @@ func (arc *AlertRuleContext) Start() {
func (arc *AlertRuleContext) Eval() {
promql := strings.TrimSpace(arc.rule.PromQl)
if promql == "" {
logger.Errorf("%d promql is blank", arc.Key())
logger.Errorf("rule_eval:%s promql is blank", arc.Key())
return
}
if config.ReaderClients.IsNil(arc.cluster) {
logger.Error("reader client is nil")
logger.Errorf("rule_eval:%s error reader client is nil", arc.Key())
return
}
......@@ -117,7 +117,7 @@ func (arc *AlertRuleContext) Eval() {
logger.Errorf("rule_eval:%s promql:%s, warnings:%v", arc.Key(), promql, warnings)
return
}
logger.Debugf("rule_eval:%s cluster:%s promql:%s, value:%v", arc.Key(), promql, value)
logger.Debugf("rule_eval:%s promql:%s, value:%v", arc.Key(), promql, value)
}
arc.HandleVectors(conv.ConvertVectors(value), "inner")
}
......@@ -265,7 +265,7 @@ func (arc *AlertRuleContext) pushEventToQueue(event *models.AlertCurEvent) {
promstat.CounterAlertsTotal.WithLabelValues(event.Cluster).Inc()
LogEvent(event, "push_queue")
if !EventQueue.PushFront(event) {
logger.Warningf("event_push_queue: queue is full")
logger.Warningf("event_push_queue: queue is full, event:%+v", event)
}
}
......
......@@ -3,7 +3,6 @@ package engine
import (
"context"
"fmt"
"log"
"strings"
"time"
......@@ -73,7 +72,7 @@ func (rrc *RecordRuleContext) Eval() {
}
if config.ReaderClients.IsNil(rrc.cluster) {
log.Println("reader client is nil")
logger.Errorf("eval:%s reader client is nil", rrc.Key())
return
}
......
......@@ -46,8 +46,7 @@ func pushEventToQueue(c *gin.Context) {
event.TagsMap[arr[0]] = arr[1]
}
// isMuted only need TriggerTime RuleName and TagsMap
if engine.AlertMuteStrategies.IsMuted(rule, event) {
if engine.EventMuteStra.IsMuted(rule, event) {
logger.Infof("event_muted: rule_id=%d %s", event.RuleId, event.Hash)
ginx.NewRender(c).Message(nil)
return
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册