Merge pull request #178 from jamesgoodhouse/fix_nrql_alert_duration

fix nrql alert condition duration
newrelic · Oct 19, 2019 · e0b5591 · e0b5591
2 parents 118e724 + 6348781
commit e0b5591
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/newrelic/resource_newrelic_nrql_alert_condition.go b/newrelic/resource_newrelic_nrql_alert_condition.go
@@ -75,7 +75,7 @@ func resourceNewRelicNrqlAlertCondition() *schema.Resource {
 						"duration": {
 							Type:         schema.TypeInt,
 							Required:     true,
-							ValidateFunc: intInSlice([]int{1, 2, 3, 4, 5, 10, 15, 30, 60, 120}),
+							ValidateFunc: validation.IntBetween(1, 120),
 						},
 						"operator": {
 							Type:         schema.TypeString,

diff --git a/website/docs/r/nrql_alert_condition.html.markdown b/website/docs/r/nrql_alert_condition.html.markdown
@@ -55,7 +55,7 @@ The following arguments are supported:
 
 The `term` mapping supports the following arguments:
 
-  * `duration` - (Required) In minutes, must be: `1`, `2`, `3`, `4`, `5`, `10`, `15`, `30`, `60`, or `120`.
+  * `duration` - (Required) In minutes, must be in the range of `1` to `120`, inclusive.
   * `operator` - (Optional) `above`, `below`, or `equal`.  Defaults to `equal`.
   * `priority` - (Optional) `critical` or `warning`.  Defaults to `critical`.
   * `threshold` - (Required) Must be 0 or greater.
@@ -76,8 +76,8 @@ The following attributes are exported:
 
 ## Import
 
-Alert conditions can be imported using the `id`, e.g.
+Alert conditions can be imported using a composite ID of `<policy_id>:<condition_id> `id`, e.g.
 
 ```
-$ terraform import newrelic_nrql_alert_condition.main 12345
+$ terraform import newrelic_nrql_alert_condition.main 12345:67890
 ```