Merge pull request #2 from bodgit/template

Fix template so it generates valid JSON
Yelp · Aug 7, 2014 · 55d47bf · 55d47bf
2 parents 3108abb + 5131f59
commit 55d47bf
Showing 1 changed file with 21 additions and 21 deletions.
diff --git a/templates/etc/sensu/uchiwa.json.erb b/templates/etc/sensu/uchiwa.json.erb
@@ -1,24 +1,24 @@
-module.exports = {
-  sensu: [
-  <%- scope.lookupvar("uchiwa::apis").each do | name, api | %>
+{
+  "sensu": [
+<% scope.lookupvar('uchiwa::apis').each_with_index do |(name,api),index| -%>
     {
-      name: '<%= name %>',
-      host: '<%= api['host'] %>',
-      ssl: <%= api['ssl'] %>,
-      port: <%= api['port'] %>,
-      user: '<%= api['user'] %>',
-      pass: '<%= api['pass'] %>',
-      path: '<%= api['path'] %>',
-      timeout: <%= api['timeout'] %> 
-    },
-  <%- end %>
+      "name": "<%= name %>",
+      "host": "<%= api['host'] %>",
+      "port": <%= api['port'] || 4567 %>,
+      "ssl": <%= api['ssl'] || false %>,
+      "user": "<%= api['user'] %>",
+      "pass": "<%= api['pass'] %>",
+      "path": "<%= api['path'] %>",
+      "timeout": <%= api['timeout'] || 5000 %>
+    }<%= ',' if index < scope.lookupvar('uchiwa::apis').length - 1 %>
+<% end -%>
   ],
-  uchiwa: {
-    host: '<%= scope.lookupvar("uchiwa::host") %>',
-    port: <%= scope.lookupvar('uchiwa::port') %>,
-    user: '<%= scope.lookupvar("uchiwa::user") %>',
-    pass: '<%= scope.lookupvar("uchiwa::pass") %>',
-    stats: <%= scope.lookupvar('uchiwa::stats') %>,
-    refresh: <%= scope.lookupvar('uchiwa::refresh') %>
+  "uchiwa": {
+    "host": "<%= scope.lookupvar('uchiwa::host') %>",
+    "port": <%= scope.lookupvar('uchiwa::port') %>,
+    "user": "<%= scope.lookupvar('uchiwa::user') %>",
+    "pass": "<%= scope.lookupvar('uchiwa::pass') %>",
+    "stats": <%= scope.lookupvar('uchiwa::stats') %>,
+    "refresh": <%= scope.lookupvar('uchiwa::refresh') %>
   }
-}
+}