flapjack 0.7.19 → 0.7.20

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Flapjack Changelog
 
+# 0.7.20 - 2013-07-17
+- Bug: flapjack-nagios-receiver failing after json library change gh-257 (@jessereynolds)
+- Bug: email gateway partial conversion to erb sending haml source code gh-256 (@ali-graham)
+
 # 0.7.19 - 2013-07-17
 - Feature: Removed log4r and YAJL dependencies gh-25 (@ali-graham)
 - Feature: Made jabber entity status messages more verbose gh-245 (@ali-graham)

data/bin/flapjack-nagios-receiver

@@ -47,7 +47,7 @@ def process_input(opts)
       state = 'ok'       if state.downcase == 'up'
       state = 'critical' if state.downcase == 'down'
       details = check_long_output ? check_long_output.gsub(/\\n/, "\n") : nil
-      event = {
+      event = Oj.dump({
         'entity'    => entity,
         'check'     => check,
         'type'      => 'service',
@@ -55,7 +55,7 @@ def process_input(opts)
         'summary'   => check_output,
         'details'   => details,
         'timestamp' => timestamp,
-      }.to_json
+      })
       redis.lpush 'events', event
     end
   rescue Redis::CannotConnectError

data/lib/flapjack/gateways/email/alert.html.erb

@@ -1,60 +1,70 @@
-%style{:type => "text/css", :media => "screen"}
-  :plain
-    #container {
-      text-transform: uppercase;
-    }
-    table {
-      border-collapse: collapse;
-    }
-    table, th, td {
-      border: 1px solid #666;
-      padding: 4px;
-    }
-
-%p Hi #{@contact_first_name}
-
-%p Monitoring has detected the following:
-
-%table
-  %tbody
-    %tr
-      %td
-        %strong Entity
-      %td= @entity_name
-    %tr
-      %td
-        %strong Check
-      %td= @check
-    %tr
-      %td
-        %strong State
-      %td= @state.upcase
-    %tr
-      %td
-        %strong Summary
-      %td= @summary
-    - if @details
-      %tr
-        %td
-          %strong Details
-        %td= @details
-    %tr
-      %td
-        %strong Time
-      %td
-        = Time.at(@time.to_i).to_s
-        ( #{@relative} ago)
-
-    - if @last_state
-      %tr
-        %td Previous state
-        %td= @last_state
-
-    - if @last_summary
-      %tr
-        %td Previous summary
-        %td= @last_summary
-
-%p Cheers,
-%p Flapjack
+<style type="text/css" media="screen">
+  #container {
+    text-transform: uppercase;
+  }
+  table {
+    border-collapse: collapse;
+  }
+  table, th, td {
+    border: 1px solid #666;
+    padding: 4px;
+  }
+</style>
 
+<p>Hi <%= @contact_first_name%></p>
+
+<p>Monitoring has detected the following:</p>
+
+<table>
+  <tbody>
+    <tr>
+      <td>Entity</td>
+      <td><%= @entity_name %></td>
+    </tr>
+
+    <tr>
+      <td>Check</td>
+      <td><%= @check %></td>
+    </tr>
+
+    <tr>
+      <td>State</td>
+      <td><%= @state.upcase %></td>
+    </tr>
+
+    <tr>
+      <td>Summary</td>
+      <td><%= @summary %></td>
+    </tr>
+
+    <% if @details %>
+      <tr>
+        <td>Details</td>
+        <td><%= @details %></td>
+      </tr>
+    <% end %>
+
+    <tr>
+      <td>Time</td>
+      <td><%= Time.at(@time.to_i).to_s %> (<%= @relative %> ago)</td>
+    </tr>
+
+    <% if @last_state %>
+      <tr>
+        <td>Previous state</td>
+        <td><%= @last_state %></td>
+      </tr>
+    <% end %>
+
+    <% if @last_summary %>
+      <tr>
+        <td>Previous summary</td>
+        <td><%= @last_summary %></td>
+      </tr>
+    <% end %>
+
+  </tbody>
+</table>
+
+<p>Cheers,</p>
+<p>Flapjack</p>

data/lib/flapjack/version.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
 module Flapjack
-  VERSION = "0.7.19"
+  VERSION = "0.7.20"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flapjack
 version: !ruby/object:Gem::Version
-  version: 0.7.19
+  version: 0.7.20
   prerelease: 
 platform: ruby
 authors:
@@ -527,7 +527,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4516922423453420301
+      hash: -2799990042721425625
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -536,7 +536,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4516922423453420301
+      hash: -2799990042721425625
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23