monitor policy supoort change (#759)

Author: hellertang

tencentcloud/resource_tc_monitor_alarm_policy.go

@@ -197,17 +197,17 @@ func AlarmPolicyRule() map[string]*schema.Schema {
 			Type:        schema.TypeList,
 			Optional:    true,
 			MaxItems:    1,
-			Description: "Filter condition for one single trigger rule.",
+			Description: "Filter condition for one single trigger rule. Must set it when create tke-xxx rules.",
 			Elem: &schema.Resource{
 				Schema: map[string]*schema.Schema{
 					"type": {
 						Type:        schema.TypeString,
-						Required:    true,
+						Optional:    true,
 						Description: "Filter condition type. Valid values: DIMENSION (uses dimensions for filtering).",
 					},
 					"dimensions": {
 						Type:        schema.TypeString,
-						Required:    true,
+						Optional:    true,
 						Description: "JSON string generated by serializing the AlarmPolicyDimension two-dimensional array.",
 					},
 				},
@@ -253,11 +253,13 @@ func resourceTencentMonitorAlarmPolicy() *schema.Resource {
 			"monitor_type": {
 				Type:        schema.TypeString,
 				Required:    true,
+				ForceNew:    true,
 				Description: "The type of monitor.",
 			},
 			"namespace": {
 				Type:        schema.TypeString,
 				Required:    true,
+				ForceNew:    true,
 				Description: "The type of alarm.",
 			},
 			"remark": {
@@ -275,6 +277,7 @@ func resourceTencentMonitorAlarmPolicy() *schema.Resource {
 			"project_id": {
 				Type:        schema.TypeInt,
 				Optional:    true,
+				ForceNew:    true,
 				Default:     -1,
 				Description: "Project ID. For products with different projects, a value other than -1 must be passed in.",
 			},
@@ -595,12 +598,6 @@ func resourceTencentMonitorAlarmPolicyRead(d *schema.ResourceData, meta interfac
 
 	var rules = make([]interface{}, 0, 100)
 	for _, rule := range policy.Condition.Rules {
-		var filter = make([]interface{}, 0, 10)
-		alarmPolicyFilter := map[string]interface{}{
-			"type":       rule.Filter.Type,
-			"dimensions": rule.Filter.Dimensions,
-		}
-		filter = append(filter, alarmPolicyFilter)
 
 		m := map[string]interface{}{
 			"metric_name":      rule.MetricName,
@@ -609,11 +606,20 @@ func resourceTencentMonitorAlarmPolicyRead(d *schema.ResourceData, meta interfac
 			"value":            rule.Value,
 			"continue_period":  rule.ContinuePeriod,
 			"notice_frequency": rule.NoticeFrequency,
-			"filter":           filter,
 			"description":      rule.Description,
 			"unit":             rule.Unit,
 			"rule_type":        rule.RuleType,
 		}
+		if rule.Filter != nil {
+			var filter = make([]interface{}, 0, 10)
+			alarmPolicyFilter := map[string]interface{}{
+				"type":       rule.Filter.Type,
+				"dimensions": rule.Filter.Dimensions,
+			}
+			filter = append(filter, alarmPolicyFilter)
+			m["filter"] = filter
+		}
+
 		rules = append(rules, m)
 	}
 
@@ -641,10 +647,19 @@ func resourceTencentMonitorAlarmPolicyRead(d *schema.ResourceData, meta interfac
 		m["notice_frequency"] = eventRule.NoticeFrequency
 		m["is_power_notice"] = eventRule.IsPowerNotice
 		m["notice_frequency"] = eventRule.NoticeFrequency
-		m["filter"] = filter
 		m["description"] = eventRule.Description
 		m["unit"] = eventRule.Unit
 		m["rule_type"] = eventRule.RuleType
+
+		if eventRule.Filter != nil {
+			var filter = make([]interface{}, 0, 10)
+			alarmPolicyFilter := map[string]interface{}{
+				"type":       eventRule.Filter.Type,
+				"dimensions": eventRule.Filter.Dimensions,
+			}
+			filter = append(filter, alarmPolicyFilter)
+			m["filter"] = filter
+		}
 		eventConditions = append(eventConditions, m)
 	}
 	_ = d.Set("event_conditions", eventConditions)
@@ -679,6 +694,44 @@ func resourceTencentMonitorAlarmPolicyUpdate(d *schema.ResourceData, meta interf
 		monitorService = MonitorService{client: meta.(*TencentCloudClient).apiV3Conn}
 	)
 
+	if d.HasChange("policy_name") {
+		request := monitor.NewModifyAlarmPolicyInfoRequest()
+		request.Module = helper.String("monitor")
+		request.PolicyId = helper.String(d.Id())
+		request.Key = helper.String("NAME")
+		value := d.Get("policy_name").(string)
+		request.Value = helper.String(value)
+
+		if err := resource.Retry(readRetryTimeout, func() *resource.RetryError {
+			ratelimit.Check(request.GetAction())
+			if _, err := monitorService.client.UseMonitorClient().ModifyAlarmPolicyInfo(request); err != nil {
+				return retryError(err, InternalError)
+			}
+			return nil
+		}); err != nil {
+			return err
+		}
+	}
+
+	if d.HasChange("remark") {
+		request := monitor.NewModifyAlarmPolicyInfoRequest()
+		request.Module = helper.String("monitor")
+		request.PolicyId = helper.String(d.Id())
+		request.Key = helper.String("REMARK")
+		value := d.Get("remark").(string)
+		request.Value = helper.String(value)
+
+		if err := resource.Retry(readRetryTimeout, func() *resource.RetryError {
+			ratelimit.Check(request.GetAction())
+			if _, err := monitorService.client.UseMonitorClient().ModifyAlarmPolicyInfo(request); err != nil {
+				return retryError(err, InternalError)
+			}
+			return nil
+		}); err != nil {
+			return err
+		}
+	}
+
 	if d.HasChange("enable") {
 		request := monitor.NewModifyAlarmPolicyStatusRequest()
 		request.Module = helper.String("monitor")
@@ -687,10 +740,6 @@ func resourceTencentMonitorAlarmPolicyUpdate(d *schema.ResourceData, meta interf
 		enable := d.Get("enable").(int)
 		request.Enable = helper.IntInt64(enable)
 
-		//if v, ok := d.GetOk("enable"); ok {
-		//	request. = helper.IntInt64(v.(int))
-		//}
-
 		if err := resource.Retry(readRetryTimeout, func() *resource.RetryError {
 			ratelimit.Check(request.GetAction())
 			if _, err := monitorService.client.UseMonitorClient().ModifyAlarmPolicyStatus(request); err != nil {

website/docs/r/monitor_alarm_policy.html.markdown

@@ -145,15 +145,15 @@ resource "tencentcloud_monitor_alarm_policy" "policy" {
 
 The following arguments are supported:
 
-* `monitor_type` - (Required) The type of monitor.
-* `namespace` - (Required) The type of alarm.
+* `monitor_type` - (Required, ForceNew) The type of monitor.
+* `namespace` - (Required, ForceNew) The type of alarm.
 * `policy_name` - (Required) The name of policy.
 * `conditions` - (Optional) A list of metric trigger condition.
 * `conditon_template_id` - (Optional, ForceNew) ID of trigger condition template.
 * `enable` - (Optional) Whether to enable, default is `1`.
 * `event_conditions` - (Optional) A list of event trigger condition.
 * `notice_ids` - (Optional) List of notification rule IDs.
-* `project_id` - (Optional) Project ID. For products with different projects, a value other than -1 must be passed in.
+* `project_id` - (Optional, ForceNew) Project ID. For products with different projects, a value other than -1 must be passed in.
 * `remark` - (Optional) The remark of policy group.
 * `trigger_tasks` - (Optional) Triggered task list.
 
@@ -166,7 +166,7 @@ The `event_conditions` object supports the following:
 
 * `continue_period` - (Optional) Number of periods.
 * `description` - (Optional) Metric display name, which is used in the output parameter.
-* `filter` - (Optional) Filter condition for one single trigger rule.
+* `filter` - (Optional) Filter condition for one single trigger rule. Must set it when create tke-xxx rules.
 * `is_power_notice` - (Optional) Whether the alarm frequency increases exponentially.
 * `metric_name` - (Optional) Metric name or event name.
 * `notice_frequency` - (Optional) Alarm interval in seconds.
@@ -178,14 +178,14 @@ The `event_conditions` object supports the following:
 
 The `filter` object supports the following:
 
-* `dimensions` - (Required) JSON string generated by serializing the AlarmPolicyDimension two-dimensional array.
-* `type` - (Required) Filter condition type. Valid values: DIMENSION (uses dimensions for filtering).
+* `dimensions` - (Optional) JSON string generated by serializing the AlarmPolicyDimension two-dimensional array.
+* `type` - (Optional) Filter condition type. Valid values: DIMENSION (uses dimensions for filtering).
 
 The `rules` object supports the following:
 
 * `continue_period` - (Optional) Number of periods.
 * `description` - (Optional) Metric display name, which is used in the output parameter.
-* `filter` - (Optional) Filter condition for one single trigger rule.
+* `filter` - (Optional) Filter condition for one single trigger rule. Must set it when create tke-xxx rules.
 * `is_power_notice` - (Optional) Whether the alarm frequency increases exponentially.
 * `metric_name` - (Optional) Metric name or event name.
 * `notice_frequency` - (Optional) Alarm interval in seconds.