From be4b9a580b53f3ca55a2e3df9dc27705fa0d2b40 Mon Sep 17 00:00:00 2001
From: zhaoxiangchun <1422928955@qq.com>
Date: Sat, 6 Feb 2021 19:51:54 +0800
Subject: [PATCH] fix(monitor): fix update alert duration fail
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1.修复无法更新报警持续周期的问题
---
 pkg/apis/monitor/alert.go         | 2 ++
 pkg/monitor/models/commonalert.go | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/pkg/apis/monitor/alert.go b/pkg/apis/monitor/alert.go
index ec0a6dd98e..6460af539e 100644
--- a/pkg/apis/monitor/alert.go
+++ b/pkg/apis/monitor/alert.go
@@ -136,6 +136,8 @@ type AlertUpdateInput struct {
 
 	// 报警执行频率
 	Frequency *int64 `json:"frequency"`
+	// 报警持续时间
+	For int64 `json:"for"`
 	// 报警设置
 	Settings *AlertSetting `json:"settings"`
 	// 启用报警
diff --git a/pkg/monitor/models/commonalert.go b/pkg/monitor/models/commonalert.go
index d7b9482c12..7e357750f5 100644
--- a/pkg/monitor/models/commonalert.go
+++ b/pkg/monitor/models/commonalert.go
@@ -827,6 +827,7 @@ func (alert *SCommonAlert) ValidateUpdateData(
 		if err != nil {
 			return data, errors.Wrap(err, "SAlert.ValidateUpdateData")
 		}
+		updataInput.For = alertCreateInput.For
 		data.Update(jsonutils.Marshal(updataInput))
 	}
 	return data, nil
@@ -878,6 +879,7 @@ func (alert *SCommonAlert) getUpdateAlertInput(updateInput monitor.CommonAlertUp
 	input := monitor.CommonAlertCreateInput{
 		CommonMetricInputQuery: updateInput.CommonMetricInputQuery,
 		Period:                 updateInput.Period,
+		AlertDuration:          updateInput.AlertDuration,
 	}
 	alertCreateInput := CommonAlertManager.toAlertCreatInput(input)
 	return alertCreateInput