Merge pull request #248 from claranet/feature/lasting

scripts/templates/detector.tf.j2

@@ -77,7 +77,7 @@ resource "signalfx_detector" "{{ id }}" {
         {%- else %}
           {%- set negative_comparator = reverse_comparator ~ '=' %}
         {%- endif %}
-    detect(when(signal {{ rule.comparator }} ${var.{{ id }}_threshold_{{ severity }}})
+    detect(when(signal {{ rule.comparator }} ${var.{{ id }}_threshold_{{ severity }}}{%- if rule.lasting_duration is string %}, lasting='${var.{{ id }}_lasting_duration_{{severity}}}'{%- endif %}{%- if rule.lasting_at_least is number %}, at_least=${var.{{ id }}_at_least_percentage_{{ severity }}}{%- endif %})
         {%- if 'dependency' in rule %} and when(signal {{ negative_comparator }} ${var.{{ id }}_threshold_{{ rule.dependency }}}){%- endif -%})
       {%- endif -%}
     .publish('{{ severity_label }}')

scripts/templates/values.yaml

@@ -200,3 +200,15 @@ rules:
     ## This will add another condition to negate the dependecy like:
     ## when(signal > {{severity}}) and when(signal <= {{severity.dependency}})
     #dependency:
+
+    ## @param lasting_duration - string - optional
+    ## Minimum duration that conditions must be true 
+    ## before raising alert
+    lasting_duration:
+
+    ## @param lasting_at_least - number - option
+    ## Percentage of lasting that conditions must be true 
+    ## before raising alert (>= 0.0 and <= 1.0)
+    ## lasting value is mandatory to use this parameter
+    lasting_at_least:
+

scripts/templates/variables.tf.j2

@@ -64,7 +64,20 @@ variable "{{ id }}_disabled_{{ severity }}" {
   type        = bool
   default     = null
 }
-
+{% if rule.lasting_duration is string %}
+variable "{{ id }}_lasting_duration_{{ severity }}" {
+  description = "Minimum duration that conditions must be true before raising alert"
+  type        = string
+  default     = "{{ rule.lasting_duration }}"
+}
+{% endif -%}
+{% if rule.lasting_at_least is number %}
+variable "{{ id }}_at_least_percentage_{{ severity }}" {
+  description = "Percentage of lasting that conditions must be true before raising alert (>= 0.0 and <= 1.0)"
+  type        = number
+  default     = "{{ rule.lasting_at_least }}"
+}
+{% endif %}
 {% endfor -%}
 {% endif -%}