Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
jobily
Nightingale
提交
9beef8f3
N
Nightingale
项目概览
jobily
/
Nightingale
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
N
Nightingale
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
9beef8f3
编写于
1月 29, 2022
作者:
U
UlricQin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add last_sent_time for alert_cur_event
上级
84082208
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
15 addition
and
10 deletion
+15
-10
src/models/alert_cur_event.go
src/models/alert_cur_event.go
+2
-1
src/server/engine/worker.go
src/server/engine/worker.go
+13
-9
未找到文件。
src/models/alert_cur_event.go
浏览文件 @
9beef8f3
...
...
@@ -37,7 +37,8 @@ type AlertCurEvent struct {
TagsMap
map
[
string
]
string
`json:"-" gorm:"-"`
// for internal usage
IsRecovered
bool
`json:"is_recovered" gorm:"-"`
// for notify.py
NotifyUsersObj
[]
*
User
`json:"notify_users_obj" gorm:"-"`
// for notify.py
LastEvalTime
int64
`json:"last_eval_time" gorm:"-"`
// for notify.py
LastEvalTime
int64
`json:"last_eval_time" gorm:"-"`
// for notify.py 上次计算的时间
LastSentTime
int64
`json:"last_sent_time" gorm:"-"`
// 上次发送时间
}
func
(
e
*
AlertCurEvent
)
TableName
()
string
{
...
...
src/server/engine/worker.go
浏览文件 @
9beef8f3
...
...
@@ -256,7 +256,6 @@ func (r RuleEval) judge(vectors []Vector) {
event
.
NotifyChannelsJSON
=
r
.
rule
.
NotifyChannelsJSON
event
.
NotifyGroups
=
r
.
rule
.
NotifyGroups
event
.
NotifyGroupsJSON
=
r
.
rule
.
NotifyGroupsJSON
event
.
NotifyRepeatNext
=
now
+
int64
(
r
.
rule
.
NotifyRepeatStep
*
60
)
event
.
TargetIdent
=
string
(
targetIdent
)
event
.
TargetNote
=
targetNote
event
.
TriggerValue
=
readableValue
(
vectors
[
i
]
.
Value
)
...
...
@@ -301,7 +300,7 @@ func (r RuleEval) handleNewEvent(event *models.AlertCurEvent) {
_
,
has
:=
r
.
pendings
[
event
.
Hash
]
if
has
{
r
.
pendings
[
event
.
Hash
]
.
LastEvalTime
=
event
.
Trigger
Time
r
.
pendings
[
event
.
Hash
]
.
LastEvalTime
=
event
.
LastEval
Time
}
else
{
r
.
pendings
[
event
.
Hash
]
=
event
}
...
...
@@ -313,19 +312,19 @@ func (r RuleEval) handleNewEvent(event *models.AlertCurEvent) {
func
(
r
RuleEval
)
fireEvent
(
event
*
models
.
AlertCurEvent
)
{
if
fired
,
has
:=
r
.
fires
[
event
.
Hash
];
has
{
r
.
fires
[
event
.
Hash
]
.
LastEvalTime
=
event
.
LastEvalTime
if
r
.
rule
.
NotifyRepeatStep
==
0
{
// 说明不想重复通知,那就直接返回了,nothing to do
return
}
// 之前发送过告警了,这次是否要继续发送,要看是否过了通道静默时间
if
event
.
LastEvalTime
>
fired
.
LastEvalTime
+
int64
(
r
.
rule
.
NotifyRepeatStep
)
*
60
{
r
.
fires
[
event
.
Hash
]
=
event
pushEventToQueue
(
event
)
if
event
.
LastEvalTime
>
fired
.
LastSentTime
+
int64
(
r
.
rule
.
NotifyRepeatStep
)
*
60
{
r
.
pushEventToQueue
(
event
)
}
}
else
{
r
.
fires
[
event
.
Hash
]
=
event
pushEventToQueue
(
event
)
r
.
pushEventToQueue
(
event
)
}
}
...
...
@@ -372,12 +371,17 @@ func (r RuleEval) recoverRule(alertingKeys map[string]struct{}, now int64) {
event
.
NotifyChannelsJSON
=
r
.
rule
.
NotifyChannelsJSON
event
.
NotifyGroups
=
r
.
rule
.
NotifyGroups
event
.
NotifyGroupsJSON
=
r
.
rule
.
NotifyGroupsJSON
pushEventToQueue
(
event
)
r
.
pushEventToQueue
(
event
)
}
}
}
func
pushEventToQueue
(
event
*
models
.
AlertCurEvent
)
{
func
(
r
RuleEval
)
pushEventToQueue
(
event
*
models
.
AlertCurEvent
)
{
if
!
event
.
IsRecovered
{
event
.
LastSentTime
=
event
.
LastEvalTime
r
.
fires
[
event
.
Hash
]
=
event
}
promstat
.
CounterAlertsTotal
.
WithLabelValues
(
config
.
C
.
ClusterName
)
.
Inc
()
logEvent
(
event
,
"push_queue"
)
if
!
EventQueue
.
PushFront
(
event
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录