terraform-exporter 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 268df7a7c3734ec6b3262aaad17fd35992ab3da5
-  data.tar.gz: ff73e11a723b3572828093a152b759d7e6e2c23e
+  metadata.gz: da876c668fbec0fa10d3d2e3b0db23df056343f5
+  data.tar.gz: ce7438ba8daea062a08e02ea1d15fc252740193c
 SHA512:
-  metadata.gz: c62a4264e70ea0b3bf45c930e9f913be5ee9372355233995d5f511d4cd232881eb17b481a298a12fc28256fa860894df2a1b836362243fdd9353a4540ac7736f
-  data.tar.gz: d99388881840946c339f82633821155571a4bb1b291ce6294d87f943a1da94818d788990884c3554b6a8d16748798ec3c7141ff63300db09c359a4cd97d911cb
+  metadata.gz: 9db7298c3bd1ec0d68931db50a5d984148fc2f15254d898509c3bc3d1558c585d9d8437765ea5f698cfe3a23d406c055f202a30cf3fd7e215118cf63038c3c97
+  data.tar.gz: 673c4fcbc0c5a28437af0cd56d363111458b3506289e2e44525b1579fbaa4d6bcecd678fb49c5b2cc93066bcb12a75602a9aba1c5583ba226b2cad0f60445f10

data/lib/terraformer/resource/datadog_monitor.rb

@@ -76,7 +76,7 @@ module Terraformer
           "name" => monitor["name"],
           "type" => monitor["type"],
           "message" => monitor["message"],
-          "escalation_message" => monitor["escalation_message"],
+          "escalation_message" => monitor["options"]["escalation_message"],
           "query" => monitor["query"],
           "notify_no_data" => monitor["options"]["notify_no_data"],
           "no_data_timeframe" => monitor["options"]["no_data_timeframe"],
@@ -94,7 +94,7 @@ module Terraformer
             option.each { |k, v| attributes["#{argument}.#{k}"] = v }
         end
         attributes["tags.%"] = monitor["tags"].length
-        monitor["tags"].each { |tag| attributes["tags.#{tag.split(":")[0]}"] = tag.split(":")[0] }
+        monitor["tags"].each { |tag| attributes["tags.#{tag.split(":")[0]}"] = tag.split(":")[1] }
 
         sanitize_monitor(attributes)
       end

data/lib/terraformer/template/tf/cloud_watch_alarm.erb

@@ -12,6 +12,9 @@ resource "aws_cloudwatch_metric_alarm" "<%= alarm.normalized_name %>" {
 <%- unless alarm.ok_actions.empty? -%>
     ok_actions          = <%= alarm.ok_actions %>
 <%- end -%>
+<%- unless alarm.unit.nil? || alarm.unit == "" -%>
+    unit                = "<%= alarm.unit %>"
+<%- end -%>
 <%- unless alarm.alarm_actions.empty? -%>
     alarm_actions       = <%= alarm.alarm_actions %>
 <%- end -%>

data/lib/terraformer/template/tf/datadog_monitor.erb

@@ -10,8 +10,14 @@ EOF
 <%- else -%>
     message = "<%= monitor["message"] %>"
 <%- end -%>
-<%- unless monitor["escalation_message"].nil? -%>
-    escalation_message = <%= monitor["escalation_message"] %>
+<%- unless monitor["options"]["escalation_message"].nil? -%>
+<%- if monitor["options"]["escalation_message"].include? "\n" -%>
+    escalation_message = <<EOF
+<%= monitor["options"]["escalation_message"] %>
+EOF
+<%- else -%>
+    escalation_message = "<%= monitor["options"]["escalation_message"] %>"
+<%- end -%>
 <%- end -%>
 
     thresholds {
@@ -27,8 +33,8 @@ EOF
 <%- unless monitor["options"]["notify_no_data"].nil? -%>
     notify_no_data = <%= monitor["options"]["notify_no_data"] %>
 <%- end -%>
-<%- unless monitor["options"]["no_data_timeframe "].nil? -%>
-    no_data_timeframe = <%= monitor["options"]["no_data_timeframe "] %>
+<%- unless monitor["options"]["no_data_timeframe"].nil? -%>
+    no_data_timeframe = <%= monitor["options"]["no_data_timeframe"] %>
 <%- end -%>
 <%- unless monitor["options"]["renotify_interval"].nil? -%>
     renotify_interval = <%= monitor["options"]["renotify_interval"] %>
@@ -52,15 +58,15 @@ EOF
 
     silenced {
 <% monitor["options"]["silenced"].each do |key, value| -%>
-        "<%= key %>" = "<%= value || 0 %>" 
+        "<%= key %>" = "<%= value || 0 %>"
 <%- end -%>
     }
 <%- end -%>
-<%- unless monitor["options"]["tags"].nil? || monitor["options"]["tags"].empty? -%>
+<%- unless monitor["tags"].nil? || monitor["tags"].empty? -%>
 
     tags {
-<% monitor["options"]["tags"].each do |tag| -%>
-        "<%= tag.split(":")[0] %>" = "<%= tag.split(":")[1] %>" 
+<% monitor["tags"].each do |tag| -%>
+        "<%= tag.split(":")[0] %>" = "<%= tag.split(":")[1] %>"
 <%- end -%>
     }
 <%- end -%>

data/lib/terraformer/version.rb

@@ -1,3 +1,3 @@
 module Terraformer
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraform-exporter
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Jacopo Scrinzi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-09 00:00:00.000000000 Z
+date: 2016-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk