Skip to content

S
so-operation-api
Commit 72f4ba62 authored by 黄智's avatar 黄智
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev

parents dac54b71 2084bca8
Show whitespace changes
Inline Side-by-side
Showing with 73 additions and 42 deletions
src/bean/entity/alert_rules.go
View file @ 72f4ba62
......@@ -15,6 +15,7 @@ type AlertRules struct {
DurationUnit string `json:"duration_unit" xorm:"'duration_unit'"` // 持续时间单位 s m h
CheckPeriod int `json:"check_period" xorm:"'check_period'"` // 检查周期 单位:分钟
NotifyMethod string `json:"notify_method" xorm:"'notify_method'"` // 预警通知方式 all dingtalk sms
NotifyRecipients string `json:"notify_recipients" xorm:"notify_recipients"` // 预警推送用户
NotifyPushCount int `json:"notify_push_count" xorm:"'notify_push_count'"` // 消息推送次数
NotifyPushFrequency int `json:"notify_push_frequency" xorm:"'notify_push_frequency'"` // 消息推送频率 分钟
IsEnabled int `json:"is_enabled" xorm:"'is_enabled'"` // 是否开启 0:关闭 1:启动
......@@ -39,3 +40,9 @@ type AlertCondition struct {
ThresholdsMin int `json:"thresholds_min" form:"thresholds_min" binding:"required"`
RiskLevel int `json:"risk_level" form:"risk_level" binding:"required"`
}
type NotifyRecipients struct {
SystemAccount string `json:"system_account" form:"system_account" binding:"required"`
Name string `json:"user_name" form:"user_name" binding:"required"`
Phone string `json:"phone" form:"phone" binding:"required"`
}
src/bean/vo/request/alert_rules.go
View file @ 72f4ba62
......@@ -16,28 +16,30 @@ type AddAlertRules struct {
Duration int `json:"duration" form:"duration" binding:"gte=0"` // 持续时间
DurationUnit string `json:"duration_unit" form:"duration_unit" binding:"oneof=s m h"` // 持续时间单位 s m h
CheckPeriod int `json:"check_period" form:"check_period" binding:"oneof=1 3 5 10 20 30"` // 检查周期 单位:分钟
NotifyMethod string `json:"notify_method" form:"notify_method" binding:"oneof=all dingtalk sms"` // 预警通知方式 all dingtalk sms
NotifyMethod []string `json:"notify_method" form:"notify_method" binding:"max=2,dive,oneof=dingtalk sms"` // 预警通知方式 all dingtalk sms
NotifyRecipients []entity.NotifyRecipients `json:"notify_recipients" form:"notify_recipients" binding:"dive"` // 预警推送用户
NotifyPushCount int `json:"notify_push_count" form:"notify_push_count" binding:"gte=1"` // 消息推送次数
NotifyPushFrequency int `json:"notify_push_frequency" form:"notify_push_frequency" binding:"gte=1"` // 消息推送频率 分钟
IsEnabled int `json:"is_enabled" form:"is_enabled" binding:"omitempty,oneof=0 1 2"` // 是否开启 1:是 2:否
}
type UpdateAlertRules struct {
Id string `json:"id" binding:"required"`
Id string `json:"id" form:"id" binding:"required"`
MetricName string `json:"metric_name" form:"metric_name" binding:"required"` // 预警规则名称(指标名称)
DetectionType int `json:"detection_type" form:"detection_type" binding:"oneof=1 2"` // 检测类型 1:静态阈值 2:自定义
ClassId int `json:"class_id" form:"class_id" binding:"required"` // 预警对象id(级联:预警分类/预警对象)
ClassId int `json:"class_id" form:"class_id" binding:"required_if=DetectionType 1"` // 预警对象id(级联:预警分类/预警对象)
ClassParentName string `json:"class_parent_name" form:"class_parent_name" binding:"required_if=DetectionType 2"` // 预警分类名称
ClassName string `json:"class_name" form:"class_name" binding:"required_if=DetectionType 2"` // 预警对象名称
MetricConfigName string `json:"metric_config_name" form:"metric_config_name" binding:"required_if=DetectionType 2"` // 预警指标名称(detection_type=2时有值)
MetricConfigName string `json:"metric_config_name" form:"metric_config_name" binding:"required_if=DetectionType 2"` // 预警指标名称(映射entity.MetricConfig.MetricName)
Expr string `json:"expr" form:"expr" binding:"required_if=DetectionType 2"` // 指标表达式(PromQL语句)
AlertCondition string `json:"alert_condition" form:"alert_condition" binding:"required"` // 预警规则 字典值
AlertCondition []entity.AlertCondition `json:"alert_condition" form:"alert_condition" binding:"required"` // 预警规则 字典值
AlertRuleType string `json:"alert_rule_type" form:"alert_rule_type" binding:"required_if=DetectionType 2"` // 预警规则类型 关联字典表
AlertRange string `json:"alert_range" form:"alert_range"` // 预警范围 字典值
AlertRange []entity.RulesAlertRange `json:"alert_range" form:"alert_range" binding:"required,dive"` // 预警范围 字典值
Duration int `json:"duration" form:"duration" binding:"gte=0"` // 持续时间
DurationUnit string `json:"duration_unit" form:"duration_unit" binding:"oneof=s m h"` // 持续时间单位 s m h
CheckPeriod int `json:"check_period" form:"check_period" binding:"gte=0"` // 检查周期 单位:分钟
NotifyMethod string `json:"notify_method" form:"notify_method" binding:"oneof=all dingtalk sms"` // 预警通知方式 all dingtalk sms
CheckPeriod int `json:"check_period" form:"check_period" binding:"oneof=1 3 5 10 20 30"` // 检查周期 单位:分钟
NotifyMethod []string `json:"notify_method" form:"notify_method" binding:"max=2,dive,oneof=dingtalk sms"` // 预警通知方式 all dingtalk sms
NotifyRecipients []entity.NotifyRecipients `json:"notify_recipients" form:"notify_recipients" binding:"dive"` // 预警推送用户
NotifyPushCount int `json:"notify_push_count" form:"notify_push_count" binding:"gte=1"` // 消息推送次数
NotifyPushFrequency int `json:"notify_push_frequency" form:"notify_push_frequency" binding:"gte=1"` // 消息推送频率 分钟
IsEnabled int `json:"is_enabled" form:"is_enabled" binding:"omitempty,oneof=0 1 2"` // 是否开启 1:是 2:否
......
src/bean/vo/response/alert_rules.go
View file @ 72f4ba62
......@@ -4,6 +4,10 @@ import "gitlab.wodcloud.com/smart-operation/so-operation-api/src/bean/entity"
type AlertRulesItem struct {
entity.AlertRules `xorm:"extends"`
AlertCondition []entity.AlertCondition `json:"alert_condition" form:"alert_condition" binding:"required"`
AlertRange []entity.RulesAlertRange `json:"alert_range" form:"alert_range" binding:"required,dive"`
NotifyMethod []string `json:"notify_method" form:"notify_method" binding:"max=2,dive,oneof=dingtalk sms"`
NotifyRecipients []entity.NotifyRecipients `json:"notify_recipients" form:"notify_recipients" binding:"dive"`
}
type AlertRulesList struct {
......
src/service/alert_class.go
View file @ 72f4ba62
......@@ -28,11 +28,14 @@ func (m *AlertClassSvc) Add(session *xorm.Session, req request.AddAlertClass) (c
}
_ = copier.Copy(&data, &req)
max, err := m.SortOrderMax(data.ParentId)
var max int
if data.SortOrder >= 0 {
max, err = m.SortOrderMax(data.ParentId)
if err != nil {
return
}
data.SortOrder = max + 1
}
_, err = session.Insert(&data)
classId = data.ClassId
return
......
src/service/alert_rules.go
View file @ 72f4ba62
......@@ -9,6 +9,7 @@ import (
"gitlab.wodcloud.com/smart-operation/so-operation-api/src/common/client"
"gitlab.wodcloud.com/smart-operation/so-operation-api/src/pkg/beagle/jsontime"
"gitlab.wodcloud.com/smart-operation/so-operation-api/src/pkg/beagle/resp"
"gitlab.wodcloud.com/smart-operation/so-operation-api/src/util"
"xorm.io/xorm"
)
......@@ -31,9 +32,13 @@ func (m *AlertRulesSvc) Add(req request.AddAlertRules) error {
UpdatedAt: now,
}
_ = copier.Copy(&data, &req)
data.AlertCondition = util.ConvertToString(req.AlertCondition)
data.AlertRange = util.ConvertToString(req.AlertRange)
data.NotifyMethod = util.ConvertToString(req.NotifyMethod)
data.NotifyRecipients = util.ConvertToString(req.NotifyRecipients)
switch req.DetectionType {
case 1:
_, err = db.Update(&data)
_, err = db.Insert(&data)
if err != nil {
return err
}
......@@ -82,6 +87,9 @@ func (m *AlertRulesSvc) Add(req request.AddAlertRules) error {
_, err = session.Insert(&data)
return nil, err
})
if err != nil {
return err
}
}
// TODO 告警规则添加到普罗米修斯表
......@@ -100,6 +108,10 @@ func (m *AlertRulesSvc) Update(req request.UpdateAlertRules) error {
UpdatedAt: now,
}
_ = copier.Copy(&data, &req)
data.AlertCondition = util.ConvertToString(req.AlertCondition)
data.AlertRange = util.ConvertToString(req.AlertRange)
data.NotifyMethod = util.ConvertToString(req.NotifyMethod)
data.NotifyRecipients = util.ConvertToString(req.NotifyRecipients)
session := db.NewSession()
var dbAlertRules entity.AlertRules
......@@ -109,7 +121,7 @@ func (m *AlertRulesSvc) Update(req request.UpdateAlertRules) error {
}
switch req.DetectionType {
case 1:
_, err = db.Update(&data)
_, err = db.ID(data.Id).Update(&data)
if err != nil {
return err
}
......@@ -152,9 +164,12 @@ func (m *AlertRulesSvc) Update(req request.UpdateAlertRules) error {
}
// 更新预警规则配置
_, err = session.Update(&data)
_, err = session.ID(data.Id).Update(&data)
return nil, err
})
if err != nil {
return err
}
}
return nil
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment