From 10b273938d606898f8e382181edc712d876e753e Mon Sep 17 00:00:00 2001 From: zhaoxiangchun <1422928955@qq.com> Date: Mon, 26 Oct 2020 18:16:50 +0800 Subject: [PATCH] commalertUpdateInput increat param: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1.处理operator对alertType == system的报警策略的update请求 --- pkg/apis/monitor/commalert.go | 2 ++ pkg/monitor/models/commonalert.go | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkg/apis/monitor/commalert.go b/pkg/apis/monitor/commalert.go index 9b143a7cab..344ba6331f 100644 --- a/pkg/apis/monitor/commalert.go +++ b/pkg/apis/monitor/commalert.go @@ -86,6 +86,8 @@ type CommonAlertUpdateInput struct { Channel []string `json:"channel"` // 通知接受者 Recipients []string `json:"recipients"` + // systemalert policy may need update through operator + ForceUpdate bool `json:"force_update"` } type CommonAlertDetails struct { diff --git a/pkg/monitor/models/commonalert.go b/pkg/monitor/models/commonalert.go index 46813bde77..77040afef6 100644 --- a/pkg/monitor/models/commonalert.go +++ b/pkg/monitor/models/commonalert.go @@ -706,9 +706,11 @@ func (alert *SCommonAlert) ValidateUpdateData( if err != nil { return data, errors.Wrap(err, "metric query error") } - if alert.getAlertType() == monitor.CommonAlertSystemAlertType { - return data, nil + forceUpdate, _ := data.Bool("force_update") + if !forceUpdate { + return data, nil + } } data.Update(jsonutils.Marshal(metricQuery)) err = data.Unmarshal(updataInput)