Merge pull request #263 from SumoLogic/SUMO-169842-terraform-delay-field

Sumo 169842 terraform delay field

Author: ndhar-sumo

CHANGELOG.md

@@ -1,5 +1,9 @@
 ## 2.9.10 (Unreleased)
 
+FEATURES:
+
+* Add a new optional field `evaluation_delay` to resource/sumologic_monitor.
+
 ## 2.9.9 (August 12, 2021)
 
 FEATURES:

sumologic/resource_sumologic_monitors_library_monitor.go

@@ -2,6 +2,7 @@ package sumologic
 
 import (
 	"log"
+	"regexp"
 	"strings"
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
@@ -267,6 +268,13 @@ func resourceSumologicMonitorsLibraryMonitor() *schema.Resource {
 				ValidateFunc: validation.StringInSlice([]string{"Logs", "Metrics"}, false),
 			},
 
+			"evaluation_delay": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				ValidateFunc: validation.StringMatch(regexp.MustCompile(`((\d)+[smh])+`), "This value is not in correct format. Example: 1m30s"),
+			},
+
 			"is_locked": {
 				Type:     schema.TypeBool,
 				Optional: true,
@@ -504,6 +512,7 @@ func resourceSumologicMonitorsLibraryMonitorRead(d *schema.ResourceData, meta in
 	d.Set("created_by", monitor.CreatedBy)
 	d.Set("created_at", monitor.CreatedAt)
 	d.Set("monitor_type", monitor.MonitorType)
+	d.Set("evaluation_delay", monitor.EvaluationDelay)
 	d.Set("modified_by", monitor.ModifiedBy)
 	d.Set("is_mutable", monitor.IsMutable)
 	d.Set("version", monitor.Version)
@@ -1084,6 +1093,7 @@ func resourceToMonitorsLibraryMonitor(d *schema.ResourceData) MonitorsLibraryMon
 		CreatedAt:          d.Get("created_at").(string),
 		MonitorType:        d.Get("monitor_type").(string),
 		Description:        d.Get("description").(string),
+		EvaluationDelay:    d.Get("evaluation_delay").(string),
 		Queries:            queries,
 		ModifiedBy:         d.Get("modified_by").(string),
 		IsMutable:          d.Get("is_mutable").(bool),

sumologic/resource_sumologic_monitors_library_monitor_test.go

@@ -138,6 +138,7 @@ func TestAccSumologicMonitorsLibraryMonitor_create(t *testing.T) {
 	testContentType := "Monitor"
 	testMonitorType := "Logs"
 	testIsDisabled := false
+	testEvaluationDelay := "5m"
 	testQueries := []MonitorQuery{
 		{
 			RowID: "A",
@@ -203,6 +204,7 @@ func TestAccSumologicMonitorsLibraryMonitor_create(t *testing.T) {
 					resource.TestCheckResourceAttr("sumologic_monitor.test", "name", testName),
 					resource.TestCheckResourceAttr("sumologic_monitor.test", "type", testType),
 					resource.TestCheckResourceAttr("sumologic_monitor.test", "description", testDescription),
+					resource.TestCheckResourceAttr("sumologic_monitor.test", "evaluation_delay", testEvaluationDelay),
 					resource.TestCheckResourceAttr("sumologic_monitor.test", "content_type", testContentType),
 					resource.TestCheckResourceAttr("sumologic_monitor.test", "queries.0.row_id", testQueries[0].RowID),
 					resource.TestCheckResourceAttr("sumologic_monitor.test", "triggers.0.trigger_type", testTriggers[0].TriggerType),
@@ -250,6 +252,7 @@ func TestAccSumologicMonitorsLibraryMonitor_update(t *testing.T) {
 	testContentType := "Monitor"
 	testMonitorType := "Logs"
 	testIsDisabled := false
+	testEvaluationDelay := "5m"
 	testQueries := []MonitorQuery{
 		{
 			RowID: "A",
@@ -307,6 +310,7 @@ func TestAccSumologicMonitorsLibraryMonitor_update(t *testing.T) {
 	testUpdatedContentType := "Monitor"
 	testUpdatedMonitorType := "Logs"
 	testUpdatedIsDisabled := true
+	testUpdatedEvaluationDelay := "8m"
 	testUpdatedQueries := []MonitorQuery{
 		{
 			RowID: "A",
@@ -372,6 +376,7 @@ func TestAccSumologicMonitorsLibraryMonitor_update(t *testing.T) {
 					resource.TestCheckResourceAttr("sumologic_monitor.test", "name", testName),
 					resource.TestCheckResourceAttr("sumologic_monitor.test", "type", testType),
 					resource.TestCheckResourceAttr("sumologic_monitor.test", "description", testDescription),
+					resource.TestCheckResourceAttr("sumologic_monitor.test", "evaluation_delay", testEvaluationDelay),
 					resource.TestCheckResourceAttr("sumologic_monitor.test", "content_type", testContentType),
 					resource.TestCheckResourceAttr("sumologic_monitor.test", "queries.0.row_id", testQueries[0].RowID),
 					resource.TestCheckResourceAttr("sumologic_monitor.test", "triggers.0.trigger_type", testTriggers[0].TriggerType),
@@ -387,6 +392,7 @@ func TestAccSumologicMonitorsLibraryMonitor_update(t *testing.T) {
 					resource.TestCheckResourceAttr("sumologic_monitor.test", "name", testUpdatedName),
 					resource.TestCheckResourceAttr("sumologic_monitor.test", "type", testUpdatedType),
 					resource.TestCheckResourceAttr("sumologic_monitor.test", "description", testUpdatedDescription),
+					resource.TestCheckResourceAttr("sumologic_monitor.test", "evaluation_delay", testUpdatedEvaluationDelay),
 					resource.TestCheckResourceAttr("sumologic_monitor.test", "content_type", testUpdatedContentType),
 					resource.TestCheckResourceAttr("sumologic_monitor.test", "queries.0.row_id", testUpdatedQueries[0].RowID),
 					resource.TestCheckResourceAttr("sumologic_monitor.test", "triggers.0.trigger_type", testUpdatedTriggers[0].TriggerType),
@@ -446,6 +452,7 @@ func testAccCheckMonitorsLibraryMonitorAttributes(name string) resource.TestChec
 			resource.TestCheckResourceAttrSet(name, "created_by"),
 			resource.TestCheckResourceAttrSet(name, "is_locked"),
 			resource.TestCheckResourceAttrSet(name, "monitor_type"),
+			resource.TestCheckResourceAttrSet(name, "evaluation_delay"),
 			resource.TestCheckResourceAttrSet(name, "is_system"),
 			resource.TestCheckResourceAttrSet(name, "is_disabled"),
 			resource.TestCheckResourceAttrSet(name, "name"),
@@ -471,6 +478,7 @@ resource "sumologic_monitor" "test" {
 	is_disabled = false
 	content_type = "Monitor"
 	monitor_type = "Logs"
+	evaluation_delay = "5m"
 	queries {
 		row_id = "A"
 		query = "_sourceCategory=monitor-manager error"
@@ -515,6 +523,7 @@ resource "sumologic_monitor" "test" {
 	is_disabled = true
 	content_type = "Monitor"
 	monitor_type = "Logs"
+	evaluation_delay = "8m"
 	queries {
 		row_id = "A"
 		query = "_sourceCategory=monitor-manager info"

sumologic/sumologic_monitors_library_monitor.go

@@ -126,6 +126,7 @@ type MonitorsLibraryMonitor struct {
 	Notifications      []MonitorNotification `json:"notifications,omitempty"`
 	CreatedBy          string                `json:"createdBy"`
 	MonitorType        string                `json:"monitorType"`
+	EvaluationDelay    string                `json:"evaluationDelay,omitempty"`
 	IsLocked           bool                  `json:"isLocked"`
 	Description        string                `json:"description"`
 	CreatedAt          string                `json:"createdAt"`

website/docs/r/monitor.html.markdown

@@ -19,6 +19,7 @@ resource "sumologic_monitor" "tf_logs_monitor_1" {
   is_disabled  = false
   content_type = "Monitor"
   monitor_type = "Logs"
+  evaluation_delay = "5m"
   queries {
     row_id = "A"
     query  = "_sourceCategory=event-action info"
@@ -72,6 +73,7 @@ resource "sumologic_monitor" "tf_metrics_monitor_1" {
   is_disabled  = false
   content_type = "Monitor"
   monitor_type = "Metrics"
+  evaluation_delay = "1m"
   queries {
     row_id = "A"
     query  = "metric=CPU_Idle _sourceCategory=event-action"