#247 Apply suggestions

scripts/module/gen_detectors.sh

@@ -14,6 +14,5 @@ done
 for detector in ${TARGET}/conf/[0-9][0-9]-*.yaml; do
     for dst in variables detectors; do
         j2 ./scripts/templates/$(echo ${dst} | sed 's/detectors/detector/').tf.j2 ${detector} >> ${TARGET}/${dst}-gen.tf
-        terraform fmt ${TARGET}/${dst}-gen.tf
     done
 done

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 }}}{%- if rule.lasting is string %}, lasting=${var.{{ id }}_lasting_{{severity}}}{%- endif %})
+    detect(when(signal {{ rule.comparator }} ${var.{{ id }}_threshold_{{ severity }}}{%- if rule.lasting is string %}, lasting=${var.{{ id }}_lasting_duration_{{severity}}}{%- endif %}{%- if rule.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/variables.tf.j2

@@ -65,11 +65,18 @@ variable "{{ id }}_disabled_{{ severity }}" {
   default     = null
 }
 {% if rule.lasting is string %}
-variable "{{ id }}_lasting_{{ severity }}" {
-  description = "Use lasting in {{ severity }} alerting rule for {{ id }} detector"
+variable "{{ id }}_lasting_duration_{{ severity }}" {
+  description = "Minimum duration that conditions must be true before raising alert (in seconds)"
   type        = string
   default     = "{{ rule.lasting }}"
 }
+{% endif -%}
+{% if rule.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.at_least }}"
+}
 {% endif %}
 {% endfor -%}
 {% endif -%}