Fix screenboard template

amnk · Feb 26, 2019 · f9cb3e8 · f9cb3e8
1 parent 694725d
commit f9cb3e8
Show file tree

Hide file tree

Showing 4 changed files with 226 additions and 204 deletions.
diff --git a/screenboards_test.go b/screenboards_test.go
@@ -66,12 +66,11 @@ func Example() {
 	//     type = "query_value"
 	//     x = "1"
 	//     y = "1"
-	//     title = "true"
-	//     title_text = "Test title"
+	//     title = "Test title"
+	//     title_align = "right"
 	//     title_size = "16"
 	//     height = "5"
 	//     width = "5"
-	//     title_align = "right"
 	//     time {
 	//       live_span = "1d"
 	//     }

diff --git a/tmpl/monitor.tmpl b/tmpl/monitor.tmpl
@@ -1,7 +1,7 @@
 resource "datadog_monitor" "{{ .Id }}" {
   name               = "{{ .Name }}"
   type               = "{{ .Type }}"
-  {{ if .Tags }}
+  {{- if .Tags }}
   tags               = [{{range .Tags}}"{{.}}",{{end}}]
   {{- end }}
   message            = <<EOT
@@ -12,23 +12,49 @@ EOT
   query = {{ .Query | escapeCharacters }}
 
   {{- with .Options }}
-  {{ if .NotifyNoData }}notify_no_data    = {{ .NotifyNoData }}{{- end }}
-  {{ if .RenotifyInterval }}renotify_interval = {{ .RenotifyInterval }} {{- end }}
-  {{ if .NotifyAudit }}notify_audit = {{ .NotifyAudit }}{{- end }}
-  {{ if .TimeoutH }}timeout_h = {{ .TimeoutH }}{{- end }}
-  {{ if .IncludeTags }}include_tags = {{ .IncludeTags  }}{{- end }}
-  {{ if .RequireFullWindow }}require_full_window = {{ .RequireFullWindow }}{{- end }}
-  {{ if .NewHostDelay }}new_host_delay = {{ .NewHostDelay }}{{- end }}
-  {{ if .EvaluationDelay }}evaluation_delay = {{ .EvaluationDelay }}{{- end }}
+  {{- if .NotifyNoData }}
+  notify_no_data    = {{ .NotifyNoData }}
+  {{- end }}
+  {{- if .RenotifyInterval }}
+  renotify_interval = {{ .RenotifyInterval }}
+  {{- end }}
+  {{- if .NotifyAudit }}
+  notify_audit = {{ .NotifyAudit }}
+  {{- end }}
+  {{- if .TimeoutH }}
+  timeout_h = {{ .TimeoutH }}
+  {{- end }}
+  {{- if .IncludeTags }}
+  include_tags = {{ .IncludeTags  }}
+  {{- end }}
+  {{- if .RequireFullWindow }}
+  require_full_window = {{ .RequireFullWindow }}
+  {{- end }}
+  {{- if .NewHostDelay }}
+  new_host_delay = {{ .NewHostDelay }}
+  {{- end }}
+  {{- if .EvaluationDelay }}
+  evaluation_delay = {{ .EvaluationDelay }}
+  {{- end }}
 
   {{- if .Thresholds }}
   {{- with .Thresholds }}
   thresholds {
-    {{ if .Ok }}ok = {{ .Ok }}{{- end }}
-    {{ if .Warning }}warning = {{ .Warning }}{{- end }}
-    {{ if .WarningRecovery }}warning_recovery = {{ .WarningRecovery }}{{- end }}
-    {{ if .Critical }}critical = {{ .Critical }}{{- end }}
-    {{ if .CriticalRecovery }}critical_recovery = {{ .CriticalRecovery }}{{- end }}
+    {{- if .Ok }}
+    ok = {{ .Ok }}
+    {{- end }}
+    {{- if .Warning }}
+    warning = {{ .Warning }}
+    {{- end }}
+    {{- if .WarningRecovery }}
+    warning_recovery = {{ .WarningRecovery }}
+    {{- end }}
+    {{- if .Critical }}
+    critical = {{ .Critical }}
+    {{- end }}
+    {{- if .CriticalRecovery }}
+    critical_recovery = {{ .CriticalRecovery }}
+    {{- end }}
   }
   {{- end }}
   {{- end }}