Merge pull request #458 from SumoLogic/SUMO-203323-terraform-minDataPoints-field

Sumo 203323 terraform min data points field

Author: ndhar-sumo

CHANGELOG.md

@@ -1,17 +1,19 @@
 ## 2.20.1 (Unreleased)
 FEATURES:
 * **New Resource:** sumologic_cse_first_seen_rule (GH-476)
+* Add new optional `min_data_points` field to metrics monitor trigger_conditions (GH-464)
 
 BUG FIXES:
 * Added validations to fail if no trigger conditions defined in monitor resource (GH-463)
- 
+
 ## 2.20.0 (December 15, 2022)
 FEATURES:
 * **New Resource:** sumologic_cse_custom_match_list_column (GH-462)
 
 BUG FIXES:
 * Fix typo on cse_match_list documentation (GH-461)
 
+
 ## 2.19.2 (November 4, 2022)
 ENHANCEMENTS:
 * Suppress diffs for equivalent values of some time attributes. This should reduce output of `terraform plan` that didn't disappear after running `terraform apply`. (GH-442)

sumologic/resource_sumologic_monitors_library_monitor.go

@@ -120,6 +120,12 @@ func resourceSumologicMonitorsLibraryMonitor() *schema.Resource {
 							Optional:     true,
 							ValidateFunc: validation.StringInSlice([]string{"AtLeastOnce", "Always", "ResultCount", "MissingData"}, false),
 						},
+						"min_data_points": {
+							Type:         schema.TypeInt,
+							Optional:     true,
+							ValidateFunc: validation.IntBetween(1, 100),
+							Computed:     true,
+						},
 						"detection_method": {
 							Type:     schema.TypeString,
 							Optional: true,
@@ -446,26 +452,30 @@ var metricsStaticTriggerConditionSchema = map[string]*schema.Schema{
 		"time_range":      &timeRangeSchema,
 		"occurrence_type": &occurrenceTypeSchema,
 		"alert": nested(false, schemaMap{
-			"threshold":      &thresholdSchema,
-			"threshold_type": &thresholdTypeSchema,
+			"threshold":       &thresholdSchema,
+			"threshold_type":  &thresholdTypeSchema,
+			"min_data_points": &minDataPointsOptSchema,
 		}),
 		"resolution": nested(false, schemaMap{
 			"threshold":       &thresholdSchema,
 			"threshold_type":  &thresholdTypeSchema,
 			"occurrence_type": &occurrenceTypeOptSchema,
+			"min_data_points": &minDataPointsOptSchema,
 		}),
 	}, metricsStaticConditionCriticalOrWarningAtleastOneKeys),
 	"warning": nestedWithAtleastOneOfKeys(true, schemaMap{
 		"time_range":      &timeRangeSchema,
 		"occurrence_type": &occurrenceTypeSchema,
 		"alert": nested(false, schemaMap{
-			"threshold":      &thresholdSchema,
-			"threshold_type": &thresholdTypeSchema,
+			"threshold":       &thresholdSchema,
+			"threshold_type":  &thresholdTypeSchema,
+			"min_data_points": &minDataPointsOptSchema,
 		}),
 		"resolution": nested(false, schemaMap{
 			"threshold":       &thresholdSchema,
 			"threshold_type":  &thresholdTypeSchema,
 			"occurrence_type": &occurrenceTypeOptSchema,
+			"min_data_points": &minDataPointsOptSchema,
 		}),
 	}, metricsStaticConditionCriticalOrWarningAtleastOneKeys),
 }
@@ -569,6 +579,13 @@ var occurrenceTypeOptSchema = schema.Schema{
 	ValidateFunc: validation.StringInSlice([]string{"AtLeastOnce", "Always"}, false),
 }
 
+var minDataPointsOptSchema = schema.Schema{
+	Type:         schema.TypeInt,
+	Optional:     true,
+	Computed:     true,
+	ValidateFunc: validation.IntBetween(1, 100),
+}
+
 var windowSchema = schema.Schema{
 	Type:         schema.TypeInt,
 	Optional:     true,
@@ -763,6 +780,7 @@ func resourceSumologicMonitorsLibraryMonitorRead(d *schema.ResourceData, meta in
 				"threshold":         t.Threshold,
 				"threshold_type":    t.ThresholdType,
 				"occurrence_type":   t.OccurrenceType,
+				"min_data_points":   t.MinDataPoints,
 				"trigger_source":    t.TriggerSource,
 				"detection_method":  t.DetectionMethod,
 				"resolution_window": t.PositiveResolutionWindow(),
@@ -921,6 +939,7 @@ func getTriggers(d *schema.ResourceData) []TriggerCondition {
 				TimeRange:        triggerDict["time_range"].(string),
 				OccurrenceType:   triggerDict["occurrence_type"].(string),
 				TriggerSource:    triggerDict["trigger_source"].(string),
+				MinDataPoints:    triggerDict["min_data_points"].(int),
 				DetectionMethod:  triggerDict["detection_method"].(string),
 				ResolutionWindow: triggerDict["resolution_window"].(string),
 			}
@@ -1167,11 +1186,13 @@ func jsonToMetricsStaticConditionBlock(conditions []TriggerCondition) map[string
 			hasCritical = true
 			criticalDict["time_range"] = condition.PositiveTimeRange()
 			criticalDict["occurrence_type"] = condition.OccurrenceType
+			criticalAlrt["min_data_points"] = condition.MinDataPoints
 			criticalAlrt["threshold"] = condition.Threshold
 			criticalAlrt["threshold_type"] = condition.ThresholdType
 		case "ResolvedCritical":
 			hasCritical = true
 			criticalDict["time_range"] = condition.PositiveTimeRange()
+			criticalRslv["min_data_points"] = condition.MinDataPoints
 			criticalRslv["threshold"] = condition.Threshold
 			criticalRslv["threshold_type"] = condition.ThresholdType
 			if condition.OccurrenceType == "AtLeastOnce" {
@@ -1183,15 +1204,17 @@ func jsonToMetricsStaticConditionBlock(conditions []TriggerCondition) map[string
 			hasWarning = true
 			warningDict["time_range"] = condition.PositiveTimeRange()
 			warningDict["occurrence_type"] = condition.OccurrenceType
+			warningAlrt["min_data_points"] = condition.MinDataPoints
 			warningAlrt["threshold"] = condition.Threshold
 			warningAlrt["threshold_type"] = condition.ThresholdType
 		case "ResolvedWarning":
 			hasWarning = true
 			warningDict["time_range"] = condition.PositiveTimeRange()
+			warningRslv["min_data_points"] = condition.MinDataPoints
 			warningRslv["threshold"] = condition.Threshold
 			warningRslv["threshold_type"] = condition.ThresholdType
 			if condition.OccurrenceType == "AtLeastOnce" {
-				criticalRslv["occurrence_type"] = condition.OccurrenceType
+				warningRslv["occurrence_type"] = condition.OccurrenceType
 			} else {
 				// otherwise, the canonical translation is to leave out occurrenceType in the Resolved block
 			}
@@ -1501,6 +1524,8 @@ func (condition *TriggerCondition) readFrom(block map[string]interface{}) {
 			condition.ThresholdType = v.(string)
 		case "occurrence_type":
 			condition.OccurrenceType = v.(string)
+		case "min_data_points":
+			condition.MinDataPoints = v.(int)
 		case "trigger_source":
 			condition.TriggerSource = v.(string)
 		case "detection_method":

sumologic/resource_sumologic_monitors_library_monitor_test.go

@@ -1113,31 +1113,35 @@ var exampleLogsStaticTriggerConditionBlockWithResolutionWindow = `
 var exampleMetricsStaticTriggerConditionBlock1 = `
    metrics_static_condition {
      critical {
-       time_range = "-30m"
-       occurrence_type = "AtLeastOnce"
+       time_range = "30m"
+       occurrence_type = "Always"
        alert {
          threshold = 100.0
          threshold_type = "GreaterThan"
+         min_data_points = 4
        }
        resolution {
          threshold = 90
          threshold_type = "LessThanOrEqual"
+         min_data_points = 7
        }
      }
    }`
 
 var exampleMetricsStaticTriggerConditionBlock2 = `
    metrics_static_condition {
      critical {
-       time_range = "30m"
+       time_range = "60m"
        occurrence_type = "Always"
        alert {
          threshold = 100.0
          threshold_type = "GreaterThan"
+         min_data_points = 6
        }
        resolution {
          threshold = 90
          threshold_type = "LessThanOrEqual"
+         occurrence_type = "AtLeastOnce"
        }
      }
    }`
@@ -1270,6 +1274,7 @@ func exampleMetricsStaticTriggerCondition(triggerType string, threshold float64,
 		Threshold:       threshold,
 		ThresholdType:   thresholdType,
 		OccurrenceType:  "Always",
+		MinDataPoints:   4,
 		DetectionMethod: "MetricsStaticCondition",
 	}
 }

sumologic/sumologic_monitors_library_monitor.go

@@ -162,6 +162,7 @@ type TriggerCondition struct {
 	Threshold         float64 `json:"threshold,omitempty"`
 	ThresholdType     string  `json:"thresholdType,omitempty"`
 	OccurrenceType    string  `json:"occurrenceType"`
+	MinDataPoints     int     `json:"minDataPoints,omitempty"`
 	TriggerSource     string  `json:"triggerSource"`
 	DetectionMethod   string  `json:"detectionMethod"`
 	ResolutionWindow  string  `json:"resolutionWindow,omitempty"`

website/docs/r/monitor.html.markdown

@@ -120,10 +120,11 @@ resource "sumologic_monitor" "tf_metrics_monitor_1" {
     metrics_static_condition {
       critical {
         time_range = "15m"
-        occurrence_type = "AtLeastOnce"
+        occurrence_type = "Always"
         alert {
           threshold      = 40.0
           threshold_type = "GreaterThan"
+          min_data_points = 5
         }
         resolution {
           threshold      = 40.0
@@ -430,18 +431,22 @@ Here is a summary of arguments for each condition type (fields which are not mar
     - `alert` (Required)
       - `threshold`
       - `threshold_type`
+      - `min_data_points` (Optional)
     - `resolution` (Required)
       - `threshold`
       - `threshold_type`
-  - `warning`
+      - `min_data_points` (Optional)
+    - `warning`
     - `time_range` (Required) :  Accepted format: Optional `-` sign followed by `<number>` followed by a `<time_unit>` character: `s` for seconds, `m` for minutes, `h` for hours, `d` for days. Examples: `30m`, `-12h`.
     - `occurrence_type` (Required)
     - `alert` (Required)
       - `threshold`
       - `threshold_type`
+      - `min_data_points` (Optional)
     - `resolution` (Required)
       - `threshold`
       - `threshold_type`
+      - `min_data_points` (Optional)
 #### logs_outlier_condition
   - `field`
   - `direction`