feat(monitor): support notify_on_resolve option in alerts (#260)

* feat(monitor): support notify_on_resolve option in alerts

* fix(monitor): avoid drift on apply after update

Author: dbonf

sysdig/internal/client/monitor/models_v2.go

@@ -227,7 +227,7 @@ type NotificationChannelConfigV2 struct {
 type NotificationChannelOptionsV2 struct {
 	// commons
 	NotifyOnAcknowledge        bool                          `json:"notifyOnAcknowledge,omitempty"`
-	NotifyOnResolve            bool                          `json:"notifyOnResolve,omitempty"`
+	NotifyOnResolve            bool                          `json:"notifyOnResolve"`
 	ReNotifyEverySec           *int                          `json:"reNotifyEverySec"` // must send null to remove this opt
 	CustomNotificationTemplate *CustomNotificationTemplateV2 `json:"customNotificationTemplate,omitempty"`
 	Thresholds                 []string                      `json:"thresholds"` //Set of thresholds the notification channel will be used for. Possible values [MAIN, WARNING]

sysdig/resource_sysdig_monitor_alert_v2_common.go

@@ -73,13 +73,19 @@ func createAlertV2Schema(original map[string]*schema.Schema) map[string]*schema.
 					"type": {
 						Type:       schema.TypeString,
 						Optional:   true, //for retro compatibility, content will be discarded, remove this is the next major release
+						Default:    "",
 						Deprecated: "no need to define \"type\" attribute anymore, please remove it",
 					},
 					"renotify_every_minutes": {
 						Type:     schema.TypeInt,
 						Optional: true,
 						Default:  0,
 					},
+					"notify_on_resolve": {
+						Type:     schema.TypeBool,
+						Optional: true,
+						Default:  true,
+					},
 					"main_threshold": {
 						Type:     schema.TypeBool,
 						Optional: true,
@@ -222,6 +228,8 @@ func buildAlertV2CommonStruct(d *schema.ResourceData) *monitor.AlertV2Common {
 				}
 			}
 
+			newChannel.OverrideOptions.NotifyOnResolve = channelMap["notify_on_resolve"].(bool)
+
 			newChannel.OverrideOptions.Thresholds = []string{}
 			main_threshold := channelMap["main_threshold"].(bool)
 			if main_threshold {
@@ -299,7 +307,8 @@ func updateAlertV2CommonState(d *schema.ResourceData, alert *monitor.AlertV2Comm
 	var notificationChannels []interface{}
 	for _, ncc := range alert.NotificationChannelConfigList {
 		config := map[string]interface{}{
-			"id": ncc.ChannelID,
+			"id":                ncc.ChannelID,
+			"notify_on_resolve": ncc.OverrideOptions.NotifyOnResolve,
 		}
 
 		if ncc.OverrideOptions.ReNotifyEverySec != nil {

sysdig/resource_sysdig_monitor_alert_v2_metric_test.go

@@ -139,7 +139,7 @@ func alertV2MetricWithNotificationChannels(name string) string {
 resource "sysdig_monitor_alert_v2_metric" "sample" {
 
 	name = "TERRAFORM TEST - METRICV2 %s"
-	metric = "sysdig_container_cpu_used_percent" 
+	metric = "sysdig_container_cpu_used_percent"
 	group_aggregation = "avg"
 	time_aggregation = "avg"
 	operator = ">="
@@ -148,6 +148,7 @@ resource "sysdig_monitor_alert_v2_metric" "sample" {
 	enabled = false
 	notification_channels {
 		id = 47160
+		notify_on_resolve = false
 	}
 	notification_channels {
 		id = 47163
@@ -203,8 +204,8 @@ func alertV2MetricWithGroupBy(name string) string {
 		threshold = 50
 		trigger_after_minutes = 15
 		group_by = ["kube_cluster_name", "kube_pod_name", "cloud_provider_tag_Owner",]
-	
-	}	
+
+	}
 	`, name)
 }
 
@@ -292,7 +293,7 @@ func alertV2MetricWithEnabled(name string) string {
 resource "sysdig_monitor_alert_v2_metric" "sample" {
 
 	name = "TERRAFORM TEST - METRICV2 %s"
-	metric = "sysdig_container_cpu_used_percent" 
+	metric = "sysdig_container_cpu_used_percent"
 	group_aggregation = "avg"
 	time_aggregation = "avg"
 	operator = ">="
@@ -309,7 +310,7 @@ func alertV2MetricWithWarningThreshold(name string) string {
 resource "sysdig_monitor_alert_v2_metric" "sample" {
 
 	name = "TERRAFORM TEST - METRICV2 %s"
-	metric = "sysdig_container_cpu_used_percent" 
+	metric = "sysdig_container_cpu_used_percent"
 	group_aggregation = "avg"
 	time_aggregation = "avg"
 	operator = ">="

website/docs/r/monitor_alert_v2_downtime.md

@@ -57,11 +57,12 @@ These arguments are common to all alerts in Sysdig Monitor.
 
 ### `notification_channels`
 
-By defining this field, the user can choose to which notification channels send the events when the alert fires. 
+By defining this field, the user can choose to which notification channels send the events when the alert fires.
 
 It is a list of objects with the following fields:
 * `id` - (Required) The ID of the notification channel.
-* `renotify_every_minutes`: (Optional) the amount of minutes to wait before re sending the notification to this channel. `0` means no renotifiacation enabled. Default: `0`.
+* `renotify_every_minutes` - (Optional) the amount of minutes to wait before re sending the notification to this channel. `0` means no renotifiacation enabled. Default: `0`.
+* `notify_on_resolve` - (Optional) Wether to send a notification when the alert is resolved. Default: `true`.
 
 ### `custom_notification`
 

website/docs/r/monitor_alert_v2_event.md

@@ -8,8 +8,8 @@ description: |-
 
 # Resource: sysdig_monitor_alert_v2_event
 
-Creates a Sysdig Monitor Event Alert. Monitor occurrences of specific events, and alert if the total 
-number of occurrences violates a threshold. Useful for alerting on container, orchestration, and 
+Creates a Sysdig Monitor Event Alert. Monitor occurrences of specific events, and alert if the total
+number of occurrences violates a threshold. Useful for alerting on container, orchestration, and
 service events like restarts and deployments.
 
 -> **Note:** Sysdig Terraform Provider is under rapid development at this point. If you experience any issue or discrepancy while using it, please make sure you have the latest version. If the issue persists, or you have a Feature Request to support an additional set of resources, please open a [new issue](https://github.com/sysdiglabs/terraform-provider-sysdig/issues/new) in the GitHub repository.
@@ -69,13 +69,14 @@ These arguments are common to all alerts in Sysdig Monitor.
 
 ### `notification_channels`
 
-By defining this field, the user can choose to which notification channels send the events when the alert fires. 
+By defining this field, the user can choose to which notification channels send the events when the alert fires.
 
 It is a list of objects with the following fields:
 * `id` - (Required) The ID of the notification channel.
-* `renotify_every_minutes`: (Optional) the amount of minutes to wait before re sending the notification to this channel. `0` means no renotifiacation enabled. Default: `0`.
-* `main_threshold`: (Optional) Whether this notification channel is used for the main threshold of the alert. Default: `true`.
-* `warning_threshold`: (Optional) Whether this notification channel is used for the warning threshold of the alert. Default: `false`.
+* `renotify_every_minutes` - (Optional) the amount of minutes to wait before re sending the notification to this channel. `0` means no renotifiacation enabled. Default: `0`.
+* `notify_on_resolve` - (Optional) Wether to send a notification when the alert is resolved. Default: `true`.
+* `main_threshold` - (Optional) Whether this notification channel is used for the main threshold of the alert. Default: `true`.
+* `warning_threshold` - (Optional) Whether this notification channel is used for the warning threshold of the alert. Default: `false`.
 
 ### `custom_notification`
 

website/docs/r/monitor_alert_v2_metric.md

@@ -67,13 +67,14 @@ These arguments are common to all alerts in Sysdig Monitor.
 
 ### `notification_channels`
 
-By defining this field, the user can choose to which notification channels send the events when the alert fires. 
+By defining this field, the user can choose to which notification channels send the events when the alert fires.
 
 It is a list of objects with the following fields:
 * `id` - (Required) The ID of the notification channel.
-* `renotify_every_minutes`: (Optional) the amount of minutes to wait before re sending the notification to this channel. `0` means no renotifiacation enabled. Default: `0`.
-* `main_threshold`: (Optional) Whether this notification channel is used for the main threshold of the alert. Default: `true`.
-* `warning_threshold`: (Optional) Whether this notification channel is used for the warning threshold of the alert. Default: `false`.
+* `renotify_every_minutes` - (Optional) the amount of minutes to wait before re sending the notification to this channel. `0` means no renotifiacation enabled. Default: `0`.
+* `notify_on_resolve` - (Optional) Wether to send a notification when the alert is resolved. Default: `true`.
+* `main_threshold` - (Optional) Whether this notification channel is used for the main threshold of the alert. Default: `true`.
+* `warning_threshold` - (Optional) Whether this notification channel is used for the warning threshold of the alert. Default: `false`.
 
 ### `custom_notification`
 

website/docs/r/monitor_alert_v2_prometheus.md

@@ -44,13 +44,14 @@ These arguments are common to all alerts in Sysdig Monitor.
 * `custom_notification` - (Optional) Allows to define a custom notification title, prepend and append text.
 * `link` - (Optional) List of links to add to notifications.
 
-### `notification_channels` - 
+### `notification_channels` -
 
-By defining this field, the user can choose to which notification channels send the events when the alert fires. 
+By defining this field, the user can choose to which notification channels send the events when the alert fires.
 
 It is a list of objects with the following fields:
 * `id` - (Required) The ID of the notification channel.
-* `renotify_every_minutes`: (Optional) the amount of minutes to wait before re sending the notification to this channel. `0` means no renotifiacation enabled.
+* `renotify_every_minutes` - (Optional) the amount of minutes to wait before re sending the notification to this channel. `0` means no renotifiacation enabled.
+* `notify_on_resolve` - (Optional) Wether to send a notification when the alert is resolved. Default: `true`.
 
 ### `custom_notification`