flapjack 0.7.27 → 0.7.28

data/lib/flapjack/gateways/sms_messagenet.rb

@@ -2,12 +2,13 @@
 
 require 'em-synchrony'
 require 'em-synchrony/em-http'
+require 'active_support/inflector'
 
 module Flapjack
   module Gateways
     class SmsMessagenet
 
-      MESSAGENET_URL = 'https://www.messagenet.com.au/dotnet/Lodge.asmx/LodgeSMSMessage'
+      MESSAGENET_DEFAULT_URL = 'https://www.messagenet.com.au/dotnet/Lodge.asmx/LodgeSMSMessage'
 
       class << self
 
@@ -18,27 +19,32 @@ module Flapjack
         def perform(notification)
           @logger.debug "Woo, got a notification to send out: #{notification.inspect}"
 
-          notification_type  = notification['notification_type']
-          contact_first_name = notification['contact_first_name']
-          contact_last_name  = notification['contact_last_name']
-          state              = notification['state']
-          summary            = notification['summary']
-          time               = notification['time']
-          entity, check      = notification['event_id'].split(':', 2)
+          endpoint = @config["endpoint"] || MESSAGENET_DEFAULT_URL
+          username = @config["username"]
+          password = @config["password"]
 
-          headline_map = {'problem'         => 'PROBLEM: ',
-                          'recovery'        => 'RECOVERY: ',
-                          'acknowledgement' => 'ACK: ',
-                          'test'            => 'TEST NOTIFICATION: ',
-                          'unknown'         => '',
-                          ''                => '',
-                         }
+          @notification_type   = notification['notification_type']
+          @rollup              = notification['rollup']
+          @rollup_alerts       = notification['rollup_alerts']
+          @state               = notification['state']
+          @summary             = notification['summary']
+          @time                = notification['time']
+          @entity_name, @check = notification['event_id'].split(':', 2)
+          address              = notification['address']
+          notification_id      = notification['id']
+
+          message_type = case
+          when @rollup
+            'rollup'
+          else
+            'alert'
+          end
 
-          headline = headline_map[notification_type] || ''
+          sms_template = ERB.new(File.read(File.dirname(__FILE__) +
+            "/sms_messagenet/#{message_type}.text.erb"), nil, '-')
 
-          message = "#{headline}'#{check}' on #{entity}"
-          message += " is #{state.upcase}" unless ['acknowledgement', 'test'].include?(notification_type)
-          message += " at #{Time.at(time).strftime('%-d %b %H:%M')}, #{summary}"
+          bnd     = binding
+          message = sms_template.result(bnd).chomp
 
           # TODO log error and skip instead of raising errors
           if @config.nil? || (@config.respond_to?(:empty?) && @config.empty?)
@@ -48,11 +54,7 @@ module Flapjack
 
           errors = []
 
-          username = @config["username"]
-          password = @config["password"]
-          address  = notification['address']
           safe_message = truncate(message, 159)
-          notification_id = notification['id']
 
           [[username, "Messagenet username is missing"],
            [password, "Messagenet password is missing"],
@@ -73,7 +75,7 @@ module Flapjack
                    'PhoneNumber'  => address,
                    'PhoneMessage' => safe_message}
 
-          http = EM::HttpRequest.new(MESSAGENET_URL).get(:query => query)
+          http = EM::HttpRequest.new(endpoint).get(:query => query)
 
           @logger.debug "server response: #{http.response}"
 

data/lib/flapjack/gateways/sms_messagenet/alert.text.erb

@@ -0,0 +1,15 @@
+<% case @notification_type -%>
+<% when "problem" -%>
+<%=  "Problem: " -%>
+<% when "recovery" -%>
+<%=  "Recovery: " -%>
+<% when "acknowledgement" -%>
+<%=  "Ack: " -%>
+<% when "test" -%>
+<%=  "Test notification: " -%>
+<% end -%>
+'<%= @check %>' on <%= @entity_name -%>
+<% unless ['acknowledgement', 'test'].include?(@notification_type) -%>
+ is <%= ['ok'].include?(@state) ? @state.upcase : @state.titleize -%>
+<% end -%>
+ at <%= Time.at(@time).strftime('%-d %b %H:%M') %>, <%= @summary -%>

data/lib/flapjack/gateways/sms_messagenet/rollup.text.erb

@@ -0,0 +1,34 @@
+<%
+  state_counts = @rollup_alerts.inject({}) do |memo, alert|
+    memo[alert[1]['state']] = (memo[alert[1]['state']] || 0) + 1
+    memo
+  end
+
+  states_summary = ['critical', 'warning', 'unknown'].inject([]) do |memo, state|
+    next memo unless state_counts[state]
+    memo << "#{state.titleize}: #{state_counts[state]}"
+    memo
+  end.join(', ')
+
+  states_detail = ['critical', 'warning', 'unknown'].inject([]) do |memo, state|
+
+    alerts = @rollup_alerts.find_all {|alert| alert[1]['state'] == state}
+    next memo if alerts.to_a.empty?
+
+    memo << "#{state.titleize}: " + alerts.inject([]) do |ret, alert|
+      entity, check = alert[0].split(':', 2)
+      ret << "'#{check}' on #{entity}"
+      ret
+    end.join(', ')
+
+    memo
+  end.join('; ')
+
+-%>
+<% case @rollup -%>
+<% when "problem" -%>
+<%=  "Problem summary: " -%>
+<% when "recovery" -%>
+<%=  "Problem summaries finishing: " -%>
+<% end -%>
+<%= states_summary %> (<%= states_detail -%>)

data/lib/flapjack/gateways/web/views/contact.html.erb

@@ -24,6 +24,7 @@
               <th>Media</th>
               <th>Address</th>
               <th>Interval</th>
+              <th>Rollup Threshold</th>
             </tr>
             <% @contact.media.each_pair do |mk, mv| %>
               <tr>
@@ -34,18 +35,25 @@
                       <p><%= 'password'.eql?(pk) ? h("#{pk}: ...") : h("#{pk}: #{pv}") %></p>
                     <% end %>
                   </td>
-                  <td>-</td>
                 <% else %>
                   <td><%= h mk.capitalize %></td>
                   <td><%= h mv %></td>
-                  <td>
-                    <% if @contact.media_intervals[mk] %>
-                      <%= h @contact.media_intervals[mk] %> seconds
-                    <% else %>
-                      no custom interval
-                    <% end %>
-                  </td>
                 <% end %>
+
+                <td>
+                  <% if @contact.media_intervals[mk] %>
+                    <%= h @contact.media_intervals[mk] %> seconds
+                  <% else %>
+                    no custom interval
+                  <% end %>
+                </td>
+                <td>
+                  <% if @contact.media_rollup_thresholds[mk] %>
+                    <%= h @contact.media_rollup_thresholds[mk] %> failing checks
+                  <% else %>
+                    -
+                  <% end %>
+                </td>
               </tr>
             <% end %>
           </table>

data/lib/flapjack/notifier.rb

@@ -90,10 +90,10 @@ module Flapjack
     def process_notification(notification)
       @logger.debug ("Processing notification: #{notification.inspect}")
 
-      timestamp = Time.now
-      event_id = notification.event_id
+      timestamp    = Time.now
+      event_id     = notification.event_id
       entity_check = Flapjack::Data::EntityCheck.for_event_id(event_id, :redis => @redis)
-      contacts = entity_check.contacts
+      contacts     = entity_check.contacts
 
       if contacts.empty?
         @logger.debug("No contacts for #{event_id}")
@@ -111,6 +111,19 @@ module Flapjack
         address    = message.address
         contents   = message.contents.merge(notification_contents)
 
+        if message.rollup
+          contents['rollup_alerts'] = message.contact.alerting_checks_for_media(media_type).inject({}) do |memo, alert|
+            ec = Flapjack::Data::EntityCheck.for_event_id(alert, :redis => @redis)
+            last_change = ec.last_change
+            memo[alert] = {
+              'duration' => last_change ? (Time.now.to_i - last_change) : nil,
+              'state'    => ec.state
+            }
+            memo
+          end
+          contents['rollup_threshold'] = message.contact.rollup_threshold_for_media(media_type)
+        end
+
         @notifylog.info("#{event_id} | " +
           "#{notification.type} | #{message.contact.id} | #{media_type} | #{address}")
 
@@ -119,7 +132,7 @@ module Flapjack
           return
         end
 
-        @logger.info("Enqueueing #{media_type} alert for #{event_id} to #{address}")
+        @logger.info("Enqueueing #{media_type} alert for #{event_id} to #{address} type: #{notification.type} rollup: #{message.rollup || '-'}")
 
         contact = message.contact
 

data/lib/flapjack/processor.rb

@@ -178,7 +178,7 @@ module Flapjack
       # FIXME: create an event if there is dodgy data
 
       case event.type
-      # Service events represent changes in state on monitored systems
+      # Service events represent current state of checks on monitored systems
       when 'service'
         @redis.multi
         if event.ok?

data/lib/flapjack/version.rb

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

data/spec/lib/flapjack/coordinator_spec.rb

@@ -4,10 +4,10 @@ require 'flapjack/coordinator'
 
 describe Flapjack::Coordinator do
 
-  let(:fiber)  { mock(Fiber) }
-  let(:config) { mock(Flapjack::Configuration) }
+  let(:fiber)  { double(Fiber) }
+  let(:config) { double(Flapjack::Configuration) }
 
-  let(:logger) { mock(Flapjack::Logger) }
+  let(:logger) { double(Flapjack::Logger) }
 
   let!(:time)  { Time.now }
 
@@ -19,7 +19,7 @@ describe Flapjack::Coordinator do
     config.should_receive(:for_redis).and_return({})
     config.should_receive(:all).and_return(cfg)
 
-    processor = mock('processor')
+    processor = double('processor')
     processor.should_receive(:start)
     processor.should_receive(:stop)
     processor.should_receive(:update_status)
@@ -53,7 +53,7 @@ describe Flapjack::Coordinator do
     config.should_receive(:for_redis).and_return({})
     config.should_receive(:all).and_return(cfg)
 
-    processor = mock('processor')
+    processor = double('processor')
     processor.should_receive(:start).and_raise(RuntimeError)
     processor.should_receive(:stop)
     processor.should_receive(:update_status)
@@ -84,13 +84,13 @@ describe Flapjack::Coordinator do
     config.should_receive(:for_redis).and_return({})
     config.should_receive(:all).and_return(cfg)
 
-    processor = mock('processor')
+    processor = double('processor')
     processor.should_receive(:start)
     processor.should_receive(:stop)
     processor.should_receive(:update_status)
     processor.should_receive(:status).exactly(3).times.and_return('stopped')
 
-    notifier = mock('processor')
+    notifier = double('processor')
     notifier.should_receive(:start)
     notifier.should_receive(:stop)
     notifier.should_receive(:update_status)
@@ -127,7 +127,7 @@ describe Flapjack::Coordinator do
     config.should_receive(:for_redis).and_return({})
     config.should_receive(:all).and_return(cfg)
 
-    processor = mock('processor')
+    processor = double('processor')
     processor.should_receive(:start)
     processor.should_receive(:stop)
     processor.should_receive(:update_status)
@@ -194,8 +194,8 @@ describe Flapjack::Coordinator do
     old_cfg = {'processor' => {'enabled' => true}}
     new_cfg = {'gateways' => {'jabber' => {'enabled' => true}}}
 
-    new_config = mock('new_config')
-    filename = mock('filename')
+    new_config = double('new_config')
+    filename = double('filename')
 
     config.should_receive(:all).and_return(old_cfg)
     config.should_receive(:filename).and_return(filename)
@@ -204,7 +204,7 @@ describe Flapjack::Coordinator do
     new_config.should_receive(:load).with(filename)
     new_config.should_receive(:all).and_return(new_cfg)
 
-    processor = mock('processor')
+    processor = double('processor')
     processor.should_receive(:type).twice.and_return('processor')
     processor.should_receive(:stop)
     processor.should_receive(:update_status)
@@ -213,7 +213,7 @@ describe Flapjack::Coordinator do
     config.should_receive(:for_redis).and_return({})
     fc = Flapjack::Coordinator.new(config)
 
-    jabber = mock('jabber')
+    jabber = double('jabber')
     Flapjack::Pikelet.should_receive(:create).
       with('jabber', :config => {"enabled" => true}, :redis_config => {},
         :boot_time => time, :coordinator => fc).
@@ -237,8 +237,8 @@ describe Flapjack::Coordinator do
     old_cfg = {'processor' => {'enabled' => true, 'foo' => 'bar'}}
     new_cfg = {'processor' => {'enabled' => true, 'foo' => 'baz'}}
 
-    new_config = mock('new_config')
-    filename = mock('filename')
+    new_config = double('new_config')
+    filename = double('filename')
 
     config.should_receive(:all).and_return(old_cfg)
     config.should_receive(:filename).and_return(filename)
@@ -247,7 +247,7 @@ describe Flapjack::Coordinator do
     new_config.should_receive(:load).with(filename)
     new_config.should_receive(:all).and_return(new_cfg)
 
-    processor = mock('processor')
+    processor = double('processor')
     processor.should_not_receive(:start)
     processor.should_receive(:type).exactly(3).times.and_return('processor')
     processor.should_receive(:reload).with(new_cfg['processor']).and_return(true)
@@ -267,8 +267,8 @@ describe Flapjack::Coordinator do
     old_cfg = {'processor' => {'enabled' => true, 'foo' => 'bar'}}
     new_cfg = {'processor' => {'enabled' => true, 'baz' => 'qux'}}
 
-    new_config = mock('new_config')
-    filename = mock('filename')
+    new_config = double('new_config')
+    filename = double('filename')
 
     config.should_receive(:all).and_return(old_cfg)
     config.should_receive(:filename).and_return(filename)
@@ -277,7 +277,7 @@ describe Flapjack::Coordinator do
     new_config.should_receive(:load).with(filename)
     new_config.should_receive(:all).and_return(new_cfg)
 
-    processor = mock('processor')
+    processor = double('processor')
     processor.should_receive(:type).exactly(5).times.and_return('processor')
     processor.should_receive(:reload).with(new_cfg['processor']).and_return(false)
     processor.should_receive(:stop)
@@ -287,7 +287,7 @@ describe Flapjack::Coordinator do
     fiber.should_receive(:resume)
     Fiber.should_receive(:new).and_yield.and_return(fiber)
 
-    new_exec = mock('new_executive')
+    new_exec = double('new_executive')
     new_exec.should_receive(:start)
 
     config.should_receive(:for_redis).and_return({})

data/spec/lib/flapjack/data/contact_spec.rb

@@ -14,8 +14,10 @@ describe Flapjack::Data::Contact, :redis => true do
     {:tags               => ["database","physical"],
      :entities           => ["foo-app-01.example.com"],
      :time_restrictions  => [],
+     :unknown_media      => [],
      :warning_media      => ["email"],
      :critical_media     => ["sms", "email"],
+     :unknown_blackhole  => false,
      :warning_blackhole  => false,
      :critical_blackhole => false
     }
@@ -25,38 +27,45 @@ describe Flapjack::Data::Contact, :redis => true do
     {:entities           => [],
      :tags               => Flapjack::Data::TagSet.new([]),
      :time_restrictions  => [],
+     :unknown_media      => [],
      :warning_media      => ['email', 'sms', 'jabber', 'pagerduty'],
      :critical_media     => ['email', 'sms', 'jabber', 'pagerduty'],
+     :unknown_blackhole  => false,
      :warning_blackhole  => false,
      :critical_blackhole => false}
   }
 
   before(:each) do
-    Flapjack::Data::Contact.add({'id'         => '362',
-                                 'first_name' => 'John',
-                                 'last_name'  => 'Johnson',
-                                 'email'      => 'johnj@example.com',
-                                 'media' => {
-                                    'pagerduty' => {
-                                      'service_key' => '123456789012345678901234',
-                                      'subdomain'   => 'flpjck',
-                                      'username'    => 'flapjack',
-                                      'password'    => 'very_secure'
-                                    }
-                                  }},
-                                 :redis       => @redis)
-
-    Flapjack::Data::Contact.add({'id'         => '363',
-                                 'first_name' => 'Jane',
-                                 'last_name'  => 'Janeley',
-                                 'email'      => 'janej@example.com',
-                                 'media'      => {
-                                    'email' => {
-                                      'address'  => 'janej@example.com',
-                                      'interval' => 60
-                                      }
-                                  }},
-                                 :redis       => @redis)
+    Flapjack::Data::Contact.add( {
+        'id'         => '362',
+        'first_name' => 'John',
+        'last_name'  => 'Johnson',
+        'email'      => 'johnj@example.com',
+        'media'      => {
+          'pagerduty' => {
+            'service_key' => '123456789012345678901234',
+            'subdomain'   => 'flpjck',
+            'username'    => 'flapjack',
+            'password'    => 'very_secure'
+          },
+        },
+      },
+      :redis => @redis)
+
+    Flapjack::Data::Contact.add( {
+        'id'         => '363',
+        'first_name' => 'Jane',
+        'last_name'  => 'Janeley',
+        'email'      => 'janej@example.com',
+        'media'      => {
+          'email' => {
+            'address'          => 'janej@example.com',
+            'interval'         => 60,
+            'rollup_threshold' => 5,
+          },
+        },
+      },
+      :redis => @redis)
   end
 
   it "returns a list of all contacts" do
@@ -240,4 +249,70 @@ describe Flapjack::Data::Contact, :redis => true do
                            'password'    => 'very_secure'}
   end
 
+  it "sets the interval for a contact's media" do
+    contact = Flapjack::Data::Contact.find_by_id('362', :redis => @redis)
+    contact.set_interval_for_media('email', 42)
+    email_interval_raw = @redis.hget("contact_media_intervals:#{contact.id}", 'email')
+    email_interval_raw.should == '42'
+  end
+
+  it "returns the interval for a contact's media" do
+    contact = Flapjack::Data::Contact.find_by_id('363', :redis => @redis)
+    email_interval = contact.interval_for_media('email')
+    email_interval.should == 60
+  end
+
+  it "returns default 15 mins for interval for a contact's media that has no set interval" do
+    contact = Flapjack::Data::Contact.find_by_id('362', :redis => @redis)
+    email_interval = contact.interval_for_media('email')
+    email_interval.should == 900
+  end
+
+  it "removes the interval for a contact's media" do
+    contact = Flapjack::Data::Contact.find_by_id('363', :redis => @redis)
+    contact.set_interval_for_media('email', nil)
+    email_interval_raw = @redis.hget("contact_media_intervals:#{contact.id}", 'email')
+    email_interval_raw.should be_nil
+  end
+
+  it "sets the rollup threshold for a contact's media" do
+    contact = Flapjack::Data::Contact.find_by_id('362', :redis => @redis)
+    email_rollup_threshold = contact.set_rollup_threshold_for_media('email', 3)
+    email_rollup_threshold_raw = @redis.hget("contact_media_rollup_thresholds:#{contact.id}", 'email')
+    email_rollup_threshold_raw.should == '3'
+  end
+
+  it "returns the rollup threshold for a contact's media" do
+    contact = Flapjack::Data::Contact.find_by_id('363', :redis => @redis)
+    email_rollup_threshold = contact.rollup_threshold_for_media('email')
+    email_rollup_threshold.should_not be_nil
+    email_rollup_threshold.should be_a(Integer)
+    email_rollup_threshold.should == 5
+  end
+
+  it "removes the rollup threshold for a contact's media" do
+    contact = Flapjack::Data::Contact.find_by_id('363', :redis => @redis)
+    email_rollup_threshold = contact.set_rollup_threshold_for_media('email', nil)
+    email_rollup_threshold_raw = @redis.hget("contact_media_rollup_thresholds:#{contact.id}", 'email')
+    email_rollup_threshold_raw.should be_nil
+  end
+
+  it "sets the address for a contact's media" do
+    contact = Flapjack::Data::Contact.find_by_id('362', :redis => @redis)
+    contact.set_address_for_media('email', 'spongebob@example.com')
+    email_address_raw = @redis.hget("contact_media:#{contact.id}", 'email')
+    email_address_raw.should == 'spongebob@example.com'
+  end
+
+  it "removes a contact's media" do
+    contact = Flapjack::Data::Contact.find_by_id('363', :redis => @redis)
+    contact.remove_media('email')
+    email_address_raw = @redis.hget("contac_media:#{contact.id}", 'email')
+    email_address_raw.should be_nil
+    email_rollup_threshold_raw = @redis.hget("contact_media_rollup_thresholds:#{contact.id}", 'email')
+    email_rollup_threshold_raw.should be_nil
+    email_interval_raw = @redis.hget("contact_media_intervals:#{contact.id}", 'email')
+    email_interval_raw.should be_nil
+  end
+
 end