Merge pull request #8496 from zhaoxiangchun/bugfix/zxc-commonalert

commalertUpdateInput increat param:
This commit is contained in:
yunion-ci-robot
2020-10-26 19:55:48 +08:00
committed by GitHub
2 changed files with 6 additions and 2 deletions
+2
View File
@@ -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 {
+4 -2
View File
@@ -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)