alerts: add optional triggered for durations

client/metric_conditions.go

@@ -48,14 +48,17 @@ type Expression struct {
 }
 
 type SubAlertExpression struct {
-	Thresholds Thresholds `json:"thresholds"`
-	Operand    string     `json:"operand"`
-	IsNoData   bool       `json:"enable-no-data-alert,omitempty"`
+	Thresholds       Thresholds `json:"thresholds"`
+	Operand          string     `json:"operand"`
+	IsNoData         bool       `json:"enable-no-data-alert,omitempty"`
+	NoDataDurationMs *int       `json:"no-data-duration-ms,omitempty"`
 }
 
 type Thresholds struct {
-	Warning  *float64 `json:"warning,omitempty"`
-	Critical *float64 `json:"critical,omitempty"`
+	Warning            *float64 `json:"warning,omitempty"`
+	WarningDurationMs  *int     `json:"warning-duration-ms,omitempty"`
+	Critical           *float64 `json:"critical,omitempty"`
+	CriticalDurationMs *int     `json:"critical-duration-ms,omitempty"`
 }
 
 type DependencyMapOptions struct {

docs/resources/alert.md

@@ -110,6 +110,7 @@ Optional:
 Optional:
 
 - `is_no_data` (Boolean) If true, a notification is sent when the alert query returns no data. If false, notifications aren't sent in this scenario.
+- `no_data_duration_ms` (Number) No data must be seen for this duration before the status changes.
 - `operand` (String) Required when at least one threshold (Critical, Warning) is defined. Indicates whether the alert triggers when the value is above the threshold or below the threshold.
 - `thresholds` (Block List, Max: 1) Optional values defining the thresholds at which this alert transitions into Critical or Warning states. If a particular threshold is not specified, the alert never transitions into that state. (see [below for nested schema](#nestedblock--composite_alert--alert--expression--thresholds))
 
@@ -119,7 +120,9 @@ Optional:
 Optional:
 
 - `critical` (String) Defines the threshold for the alert to transition to a Critical (more severe) status.
+- `critical_duration_ms` (Number) Critical threshold must be breached for this duration before the status changes.
 - `warning` (String) Defines the threshold for the alert to transition to a Warning (less severe) status.
+- `warning_duration_ms` (Number) Critical threshold must be breached for this duration before the status changes.
 
 
 
@@ -161,6 +164,7 @@ Optional:
 
 - `is_multi` (Boolean) When false, send a single notification whenever any number of group_by values exceeds the alert threshold. When true, send individual notifications for each distinct group_by value that exceeds the threshold.
 - `is_no_data` (Boolean) If true, a notification is sent when the alert query returns no data. If false, notifications aren't sent in this scenario.
+- `no_data_duration_ms` (Number) No data must be seen for this duration before the status changes.
 - `operand` (String) Required when at least one threshold (Critical, Warning) is defined. Indicates whether the alert triggers when the value is above the threshold or below the threshold.
 - `thresholds` (Block List, Max: 1) Optional values defining the thresholds at which this alert transitions into Critical or Warning states. If a particular threshold is not specified, the alert never transitions into that state. (see [below for nested schema](#nestedblock--expression--thresholds))
 
@@ -170,7 +174,9 @@ Optional:
 Optional:
 
 - `critical` (String) Defines the threshold for the alert to transition to a Critical (more severe) status.
+- `critical_duration_ms` (Number) Critical threshold must be breached for this duration before the status changes.
 - `warning` (String) Defines the threshold for the alert to transition to a Warning (less severe) status.
+- `warning_duration_ms` (Number) Critical threshold must be breached for this duration before the status changes.
 
 
 

docs/resources/metric_condition.md

@@ -120,6 +120,7 @@ Optional:
 
 - `is_multi` (Boolean) When false, send a single notification whenever any number of group_by values exceeds the alert threshold. When true, send individual notifications for each distinct group_by value that exceeds the threshold.
 - `is_no_data` (Boolean) If true, a notification is sent when the alert query returns no data. If false, notifications aren't sent in this scenario.
+- `no_data_duration_ms` (Number) No data must be seen for this duration before the status changes.
 - `operand` (String) Required when at least one threshold (Critical, Warning) is defined. Indicates whether the alert triggers when the value is above the threshold or below the threshold.
 - `thresholds` (Block List, Max: 1) Optional values defining the thresholds at which this alert transitions into Critical or Warning states. If a particular threshold is not specified, the alert never transitions into that state. (see [below for nested schema](#nestedblock--expression--thresholds))
 
@@ -129,7 +130,9 @@ Optional:
 Optional:
 
 - `critical` (String) Defines the threshold for the alert to transition to a Critical (more severe) status.
+- `critical_duration_ms` (Number) Critical threshold must be breached for this duration before the status changes.
 - `warning` (String) Defines the threshold for the alert to transition to a Warning (less severe) status.
+- `warning_duration_ms` (Number) Critical threshold must be breached for this duration before the status changes.
 
 
 

lightstep/resource_alert.go

@@ -2,6 +2,7 @@ package lightstep
 
 import (
 	"fmt"
+
 	"github.com/lightstep/terraform-provider-lightstep/client"
 )
 
@@ -52,7 +53,7 @@ func getCompositeAlertFromUnifiedConditionResourceData(compositeAlertIn *client.
 			return nil, err
 		}
 
-		subAlerts = append(subAlerts, map[string]interface{}{
+		subAlertExpressionMap := map[string]interface{}{
 			"name":  subAlertIn.Name,
 			"title": subAlertIn.Title,
 			"expression": []map[string]interface{}{
@@ -63,7 +64,11 @@ func getCompositeAlertFromUnifiedConditionResourceData(compositeAlertIn *client.
 				},
 			},
 			"query": queries,
-		})
+		}
+		if subAlertIn.Expression.NoDataDurationMs != nil {
+			subAlertExpressionMap["no_data_duration_ms"] = subAlertIn.Expression.NoDataDurationMs
+		}
+		subAlerts = append(subAlerts, subAlertExpressionMap)
 	}
 
 	return []map[string][]map[string]interface{}{{

lightstep/resource_alert_test.go

@@ -62,13 +62,6 @@ resource "lightstep_alert" "test" {
   alerting_rule {
     id          = lightstep_slack_destination.slack.id
     update_interval = "1h"
-
-    include_filters = [
-      {
-        key   = "project_name"
-        value = "catlab"
-      }
-    ]
   }
 }
 `
@@ -103,13 +96,6 @@ resource "lightstep_alert" "test" {
   alerting_rule {
     id          = lightstep_slack_destination.slack.id
     update_interval = "1h"
-
-    include_filters = [
-      {
-        key   = "project_name"
-        value = "catlab"
-      }
-    ]
   }
 }
 `
@@ -206,13 +192,6 @@ EOT
   alerting_rule {
     id          = lightstep_slack_destination.slack.id
     update_interval = "1h"
-
-    include_filters = [
-      {
-        key   = "project_name"
-        value = "catlab"
-      }
-    ]
   }
 }
 `, uqlQuery)
@@ -251,13 +230,6 @@ EOT
   alerting_rule {
     id          = lightstep_slack_destination.slack.id
     update_interval = "1h"
-
-    include_filters = [
-      {
-        key   = "project_name"
-        value = "catlab"
-      }
-    ]
   }
 }
 `, uqlQuery)
@@ -282,10 +254,6 @@ EOT
 					resource.TestCheckResourceAttr(resourceName, "name", "Too many requests"),
 					resource.TestCheckResourceAttr(resourceName, "description", "A link to a playbook"),
 					resource.TestCheckResourceAttr(resourceName, "query.0.query_string", uqlQuery+"\n"),
-					resource.TestCheckTypeSetElemNestedAttrs(resourceName, "alerting_rule.*", map[string]string{
-						"include_filters.0.key":   "project_name",
-						"include_filters.0.value": "catlab",
-					}),
 					resource.TestCheckResourceAttr(resourceName, "expression.0.is_no_data", "true"),
 				),
 			},
@@ -553,11 +521,6 @@ EOT
   alerting_rule {
     id          = lightstep_slack_destination.slack.id
     update_interval = "1h"
-
-    include_filters = [{
-      key   = "project_name"
-      value = "catlab"
-    }]
   }
 }
 `, uqlQuery)
@@ -706,13 +669,6 @@ resource "lightstep_alert" "errors" {
 	alerting_rule {
 	  id          = lightstep_slack_destination.slack.id
 	  update_interval = "1h"
-
-	  include_filters = [
-	    {
-	      key   = "project_name"
-	      value = "catlab"
-	    }
-	  ]
 	}
 	}
 	`
@@ -769,13 +725,6 @@ resource "lightstep_alert" "test" {
  alerting_rule {
    id          = lightstep_slack_destination.slack.id
    update_interval = "1h"
-
-   include_filters = [
-     {
-       key   = "project_name"
-       value = "catlab"
-     }
-   ]
  }
 }
 `
@@ -1172,3 +1121,53 @@ resource "lightstep_alert" "composite_diff_test" {
 		},
 	})
 }
+
+func TestAccAlertWithThresholdDurations(t *testing.T) {
+	var condition client.UnifiedCondition
+
+	conditionConfig := `
+resource "lightstep_alert" "test" {
+  project_name = "` + testProject + `"
+  name = "Too many requests"
+
+  expression {
+	  is_multi   = true
+	  is_no_data = true
+      no_data_duration_ms = 60000
+      operand  = "above"
+	  thresholds {
+		critical  = 10
+        critical_duration_ms = 180000
+		warning = 5
+        warning_duration_ms = 120000
+	  }
+  }
+
+  query {
+	query_name                          = "a"
+	hidden                              = false
+    display                             = "line"
+	query_string                        = "metric requests | rate 1h | filter service_name == frontend | group_by [method], mean"
+  }
+}
+`
+
+	resourceName := "lightstep_alert.test"
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccMetricConditionDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: conditionConfig,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckLightstepAlertExists(resourceName, &condition),
+					resource.TestCheckResourceAttr(resourceName, "name", "Too many requests"),
+					resource.TestCheckResourceAttr(resourceName, "expression.0.no_data_duration_ms", "60000"),
+					resource.TestCheckResourceAttr(resourceName, "expression.0.thresholds.0.warning_duration_ms", "120000"),
+					resource.TestCheckResourceAttr(resourceName, "expression.0.thresholds.0.critical_duration_ms", "180000"),
+				),
+			},
+		},
+	})
+}