Move sensitivity under trigger object

Author: sumovishal

sumologic/resource_sumologic_monitors_library_monitor.go

@@ -635,12 +635,13 @@ var logsAnomalyTriggerConditionSchema = map[string]*schema.Schema{
 		Required:     true,
 		ValidateFunc: validation.StringInSlice([]string{"Cluster"}, false),
 	},
-	"sensitivity": {
-		Type:     schema.TypeFloat,
-		Optional: true,
-		Default:  0.5,
-	},
 	"critical": nested(false, schemaMap{
+		"sensitivity": {
+			Type:         schema.TypeFloat,
+			Optional:     true,
+			Default:      0.5,
+			ValidateFunc: validation.FloatBetween(0.1, 1.0),
+		},
 		"min_anomaly_count": {
 			Type:     schema.TypeInt,
 			Optional: true,
@@ -978,6 +979,7 @@ func resourceSumologicMonitorsLibraryMonitorUpdate(d *schema.ResourceData, meta
 		monitor = *updatedMonitor
 	}
 	monitor.Type = "MonitorsLibraryMonitorUpdate"
+	log.Printf("updating monitor: %+v\n", monitor)
 	err := c.UpdateMonitorsLibraryMonitor(monitor)
 	if err != nil {
 		return err
@@ -1253,7 +1255,6 @@ func logsAnomalyConditionBlockToJson(block map[string]interface{}) []TriggerCond
 		Field:               block["field"].(string),
 		Direction:           block["direction"].(string),
 		AnomalyDetectorType: block["anomaly_detector_type"].(string),
-		Sensitivity:         block["sensitivity"].(float64),
 		DetectionMethod:     logsAnomalyConditionDetectionMethod,
 	}
 	// log anomaly condition does not have 'alert' and 'resolution' objects. Here we generate empty blocks
@@ -1554,7 +1555,6 @@ func jsonToLogsAnomalyConditionBlock(conditions []TriggerCondition) map[string]i
 	block["field"] = conditions[0].Field
 	block["direction"] = conditions[0].Direction
 	block["anomaly_detector_type"] = conditions[0].AnomalyDetectorType
-	block["sensitivity"] = conditions[0].Sensitivity
 
 	var criticalDict = dict{}
 	block["critical"] = toSingletonArray(criticalDict)
@@ -1564,10 +1564,12 @@ func jsonToLogsAnomalyConditionBlock(conditions []TriggerCondition) map[string]i
 		switch condition.TriggerType {
 		case "Critical":
 			hasCritical = true
+			criticalDict["sensitivity"] = condition.Sensitivity
 			criticalDict["min_anomaly_count"] = condition.MinAnomalyCount
 			criticalDict["time_range"] = condition.PositiveTimeRange()
 		case "ResolvedCritical":
 			hasCritical = true
+			criticalDict["sensitivity"] = condition.Sensitivity
 			criticalDict["min_anomaly_count"] = condition.MinAnomalyCount
 			criticalDict["time_range"] = condition.PositiveTimeRange()
 		}
@@ -1817,7 +1819,9 @@ func (base TriggerCondition) cloneReadingFromNestedBlocks(block map[string]inter
 
 		if criticalCondition.DetectionMethod == logsAnomalyConditionDetectionMethod {
 			criticalCondition.MinAnomalyCount = critical["min_anomaly_count"].(int)
+			criticalCondition.Sensitivity = critical["sensitivity"].(float64)
 			resolvedCriticalCondition.MinAnomalyCount = criticalCondition.MinAnomalyCount
+			resolvedCriticalCondition.Sensitivity = criticalCondition.Sensitivity
 		}
 
 		if alert, ok := fromSingletonArray(critical, "alert"); ok {
@@ -1827,6 +1831,8 @@ func (base TriggerCondition) cloneReadingFromNestedBlocks(block map[string]inter
 			resolvedCriticalCondition.readFrom(resolved)
 		}
 		conditions = append(conditions, criticalCondition, resolvedCriticalCondition)
+		fmt.Printf("##DEBUG## [cloneReadingFromNestedBlocks] criticalCondition: %+v\n", criticalCondition)
+		fmt.Printf("##DEBUG## [cloneReadingFromNestedBlocks] resolvedCriticalCondition: %+v\n", resolvedCriticalCondition)
 	}
 	if warning, ok := fromSingletonArray(block, "warning"); ok {
 		warningCondition.readFrom(warning)

sumologic/resource_sumologic_monitors_library_monitor_test.go

@@ -1426,12 +1426,12 @@ var exampleSloBurnRateTriggerConditionBlock = `
 var exampleLogsAnomalyTriggerConditionBlock = `
     logs_anomaly_condition {
     	field = "_count"
-     	sensitivity = 0.5
-      anomaly_detector_type = "Cluster"
-      critical {
-      	min_anomaly_count = 5
-       	time_range = "-1h"
-      }
+      	anomaly_detector_type = "Cluster"
+       	critical {
+       		sensitivity = 0.5
+       		min_anomaly_count = 5
+         	time_range = "-1h"
+        }
     }`
 
 func exampleLogsStaticMonitor(testName string) string {

website/docs/r/monitor.html.markdown

@@ -351,9 +351,9 @@ resource "sumologic_monitor" "tf_example_anomaly_monitor" {
   trigger_conditions {
     logs_anomaly_condition {
       field = "_count"
-      sensitivity = 0.4
       anomaly_detector_type = "Cluster"
       critical {
+        sensitivity = 0.4
         min_anomaly_count = 9
         time_range = "-3h"
       }
@@ -372,7 +372,6 @@ resource "sumologic_monitor" "tf_example_anomaly_monitor" {
     }
     run_for_trigger_types = ["Critical", "ResolvedCritical"]
   }
-
 }
 ```
 
@@ -574,9 +573,9 @@ Here is a summary of arguments for each condition type (fields which are not mar
 
 #### log_anomaly_condition
   - `field`: The name of the field that the trigger condition will alert on. The trigger could compare the value of specified field with the threshold. If field is not specified, monitor would default to result count instead.
-  - `sensitivity`: The triggering sensitivity of the anomaly model used for this monitor.
   - `anomaly_detector_type`: The type of anomaly model that will be used for evaluating this monitor. Possible values are: `Cluster`.
   - `critical`
+    - `sensitivity`: The triggering sensitivity of the anomaly model used for this monitor.
     - `min_anomaly_count` (Required) : The minimum number of anomalies required to exist in the current time range for the condition to trigger.
     - `time_range` (Required) : The relative time range for anomaly evaluation.  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`.