flapjack 0.7.22 → 0.7.25

data/lib/flapjack/gateways/sms_messagenet.rb

@@ -40,8 +40,6 @@ module Flapjack
           message += " is #{state.upcase}" unless ['acknowledgement', 'test'].include?(notification_type)
           message += " at #{Time.at(time).strftime('%-d %b %H:%M')}, #{summary}"
 
-          notification['message'] = message
-
           # TODO log error and skip instead of raising errors
           if @config.nil? || (@config.respond_to?(:empty?) && @config.empty?)
             @logger.error "Messagenet config is missing"
@@ -53,13 +51,12 @@ module Flapjack
           username = @config["username"]
           password = @config["password"]
           address  = notification['address']
-          message  = notification['message']
+          safe_message = truncate(message, 159)
           notification_id = notification['id']
 
           [[username, "Messagenet username is missing"],
            [password, "Messagenet password is missing"],
            [address,  "SMS address is missing"],
-           [message,  "SMS message is missing"],
            [notification_id, "Notification id is missing"]].each do |val_err|
 
             next unless val_err.first.nil? || (val_err.first.respond_to?(:empty?) && val_err.first.empty?)
@@ -74,7 +71,7 @@ module Flapjack
           query = {'Username'     => username,
                    'Pwd'          => password,
                    'PhoneNumber'  => address,
-                   'PhoneMessage' => message}
+                   'PhoneMessage' => safe_message}
 
           http = EM::HttpRequest.new(MESSAGENET_URL).get(:query => query)
 
@@ -91,6 +88,19 @@ module Flapjack
           end
 
         end
+
+        # copied from ActiveSupport
+        def truncate(str, length, options = {})
+          text = str.dup
+          options[:omission] ||= "..."
+
+          length_with_room_for_omission = length - options[:omission].length
+          stop = options[:separator] ?
+            (text.rindex(options[:separator], length_with_room_for_omission) || length_with_room_for_omission) : length_with_room_for_omission
+
+          (text.length > length ? text[0...stop] + options[:omission] : text).to_s
+        end
+
       end
     end
   end

data/lib/flapjack/gateways/web.rb

@@ -259,9 +259,8 @@ module Flapjack
         entity_check = get_entity_check(params[:entity], params[:check])
         return 404 if entity_check.nil?
 
-        entity_check.create_scheduled_maintenance(:start_time => start_time,
-                                                  :duration   => duration,
-                                                  :summary    => summary)
+        entity_check.create_scheduled_maintenance(start_time, duration,
+                                                  :summary => summary)
         redirect back
       end
 
@@ -340,7 +339,7 @@ module Flapjack
         entity_check = Flapjack::Data::EntityCheck.for_entity(entity,
           check, :redis => redis)
         summary = entity_check.summary
-        summary = summary[0..76] + '...' unless summary.length < 81
+        summary = summary[0..76] + '...' unless (summary.nil? || (summary.length < 81))
         latest_notif =
           {:problem         => entity_check.last_notification_for_state(:problem)[:timestamp],
            :recovery        => entity_check.last_notification_for_state(:recovery)[:timestamp],

data/lib/flapjack/gateways/web/public/css/flapjack.css

@@ -42,8 +42,6 @@
       /* Not required for template or sticky footer method. */
 
       .container {
-        width: auto;
-        max-width: 1900px;
       }
       .container .credit {
         margin: 10px 0;

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

@@ -2,3 +2,4 @@
 <link rel="stylesheet" href="/css/bootstrap.min.css" media="screen">
 <link rel="stylesheet" href="/css/flapjack.css" media="screen">
 <link rel="stylesheet" href="/css/bootstrap-responsive.min.css" media="screen">
+<link rel="shortcut icon" href="/img/flapjack-favicon-32-16.ico"> <!-- thank you http://xiconeditor.com/ -->

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

@@ -16,7 +16,7 @@
         </div>
         <h4><a href="/entities_failing" title="failing entities"><%= h @count_failing_entities %></a> out of <a href="/entities_all" title="all entities"><%= h @count_all_entities %></a> entities have failing checks</h4>
         <h4><a href="/checks_failing" title="failing checks"><%= h @count_failing_checks %></a> out of <a href="/checks_all" title="all checks"><%= h @count_all_checks %></a> checks are failing</h4>
-        <img src="/img/flapjack_white_bg_400_353.jpeg" width="400" height="353">
+        <img src="/img/flapjack-transparent-350-400.png" height="350" width="400">
       </div>
       <div id="push"></div>
     </div>

data/lib/flapjack/notifier.rb

@@ -121,8 +121,7 @@ module Flapjack
 
         contact = message.contact
 
-        # was event.ok?
-        if (notification.event_state == 'ok') || (notification.event_state == 'up')
+        if notification.ok?
           contact.update_sent_alert_keys(
             :media => media_type,
             :check => event_id,
@@ -142,7 +141,7 @@ module Flapjack
           contact.update_sent_alert_keys(
             :media => media_type,
             :check => event_id,
-            :state => notification.event_state)
+            :state => notification.state)
         end
 
 

data/lib/flapjack/pikelet.rb

@@ -154,15 +154,16 @@ module Flapjack
       def initialize(type, pikelet_klass, opts = {})
         super(type, pikelet_klass, opts)
 
-        pikelet_klass.instance_variable_set('@config', @config)
-        pikelet_klass.instance_variable_set('@redis_config', @redis_config)
-        pikelet_klass.instance_variable_set('@logger', @logger)
-
         unless defined?(@@resque_pool) && !@@resque_pool.nil?
           @@resque_pool = Flapjack::RedisPool.new(:config => @redis_config)
           ::Resque.redis = @@resque_pool
+          @@redis_connection = Flapjack::RedisPool.new(:config => @redis_config)
         end
 
+        pikelet_klass.instance_variable_set('@config', @config)
+        pikelet_klass.instance_variable_set('@redis', @@redis_connection)
+        pikelet_klass.instance_variable_set('@logger', @logger)
+
         # TODO error if config['queue'].nil?
 
         @worker = EM::Resque::Worker.new(@config['queue'])

data/lib/flapjack/processor.rb

@@ -8,7 +8,6 @@ require 'flapjack/filters/acknowledgement'
 require 'flapjack/filters/ok'
 require 'flapjack/filters/scheduled_maintenance'
 require 'flapjack/filters/unscheduled_maintenance'
-require 'flapjack/filters/detect_mass_client_failures'
 require 'flapjack/filters/delays'
 
 require 'flapjack/data/entity_check'
@@ -47,7 +46,6 @@ module Flapjack
       @filters << Flapjack::Filters::Ok.new(options)
       @filters << Flapjack::Filters::ScheduledMaintenance.new(options)
       @filters << Flapjack::Filters::UnscheduledMaintenance.new(options)
-      @filters << Flapjack::Filters::DetectMassClientFailures.new(options)
       @filters << Flapjack::Filters::Delays.new(options)
       @filters << Flapjack::Filters::Acknowledgement.new(options)
 
@@ -150,18 +148,18 @@ module Flapjack
 
       event.tags = (event.tags || Flapjack::Data::TagSet.new) + entity_check.tags
 
-      should_notify = update_keys(event, entity_check, timestamp)
+      should_notify, previous_state = update_keys(event, entity_check, timestamp)
 
       if !should_notify
         @logger.debug("Not generating notification for event #{event.id} because filtering was skipped")
         return
-      elsif blocker = @filters.find {|filter| filter.block?(event) }
+      elsif blocker = @filters.find {|filter| filter.block?(event, entity_check, previous_state) }
         @logger.debug("Not generating notification for event #{event.id} because this filter blocked: #{blocker.name}")
         return
       end
 
       @logger.info("Generating notification for event #{event_str}")
-      generate_notification(event, entity_check, timestamp)
+      generate_notification(event, entity_check, timestamp, previous_state)
     end
 
     def update_keys(event, entity_check, timestamp)
@@ -169,6 +167,7 @@ module Flapjack
       touch_keys
 
       result = true
+      previous_state = nil
 
       event.counter = @redis.hincrby('event_counters', 'all', 1)
       @redis.hincrby("event_counters:#{@instance_id}", 'all', 1)
@@ -181,9 +180,7 @@ module Flapjack
       case event.type
       # Service events represent changes in state on monitored systems
       when 'service'
-        # Track when we last saw an event for a particular entity:check pair
-        entity_check.last_update = timestamp
-
+        @redis.multi
         if event.ok?
           @redis.hincrby('event_counters', 'ok', 1)
           @redis.hincrby("event_counters:#{@instance_id}", 'ok', 1)
@@ -192,10 +189,11 @@ module Flapjack
           @redis.hincrby("event_counters:#{@instance_id}", 'failure', 1)
           @redis.hset('unacknowledged_failures', event.counter, event.id)
         end
+        @redis.exec
 
-        event.previous_state = entity_check.state
+        previous_state = entity_check.state
 
-        if event.previous_state.nil?
+        if previous_state.nil?
           @logger.info("No previous state for event #{event.id}")
 
           if @ncsm_duration >= 0
@@ -203,28 +201,24 @@ module Flapjack
             entity_check.create_scheduled_maintenance(timestamp,
               @ncsm_duration, :summary => 'Automatically created for new check')
           end
-        else
-          event.previous_state_duration = timestamp - entity_check.last_change.to_i
+
+          # If the service event's state is ok and there was no previous state, don't alert.
+          # This stops new checks from alerting as "recovery" after they have been added.
+          if event.ok?
+            @logger.debug("setting skip_filters to true because there was no previous state and event is ok")
+            result = false
+          end
         end
 
         entity_check.update_state(event.state, :timestamp => timestamp,
-          :summary => event.summary, :client => event.client,
-          :count => event.counter, :details => event.details)
-
-        # No state change, and event is ok, so no need to run through filters
-        # OR
-        # If the service event's state is ok and there was no previous state, don't alert.
-        # This stops new checks from alerting as "recovery" after they have been added.
-        if !event.previous_state && event.ok?
-          @logger.debug("setting skip_filters to true because there was no previous state and event is ok")
-          result = false
-        end
+          :summary => event.summary, :count => event.counter, :details => event.details)
 
         entity_check.update_current_scheduled_maintenance
 
       # Action events represent human or automated interaction with Flapjack
       when 'action'
         # When an action event is processed, store the event.
+        @redis.multi
         @redis.hset(event.id + ':actions', timestamp, event.state)
         @redis.hincrby('event_counters', 'action', 1)
         @redis.hincrby("event_counters:#{@instance_id}", 'action', 1)
@@ -232,26 +226,44 @@ module Flapjack
         if event.acknowledgement? && event.acknowledgement_id
           @redis.hdel('unacknowledged_failures', event.acknowledgement_id)
         end
+        @redis.exec
       end
 
-      result
+      [result, previous_state]
     end
 
-    def generate_notification(event, entity_check, timestamp)
+    def generate_notification(event, entity_check, timestamp, previous_state)
       notification_type = Flapjack::Data::Notification.type_for_event(event)
       max_notified_severity = entity_check.max_notified_severity_of_current_failure
 
+      @redis.multi
       @redis.set("#{event.id}:last_#{notification_type}_notification", timestamp)
       @redis.set("#{event.id}:last_#{event.state}_notification", timestamp) if event.failure?
       @redis.rpush("#{event.id}:#{notification_type}_notifications", timestamp)
       @redis.rpush("#{event.id}:#{event.state}_notifications", timestamp) if event.failure?
+      @redis.exec
+
       @logger.debug("Notification of type #{notification_type} is being generated for #{event.id}: " + event.inspect)
 
       severity = Flapjack::Data::Notification.severity_for_event(event, max_notified_severity)
-      last_state = entity_check.historical_state_before(timestamp)
+
+      historical_state = case entity_check.state
+      when previous_state
+        # current state
+        curr = entity_check.historical_states(nil, nil, :order => 'desc', :limit => 1)
+        (curr && (curr.size == 1)) ? curr.first : nil
+      else
+        # last state
+        curr_and_last = entity_check.historical_states(nil, nil, :order => 'desc', :limit => 2)
+        (curr_and_last && (curr_and_last.size == 2)) ? curr_and_last.last : nil
+      end
+
+      lc = entity_check.last_change
+      state_duration = lc ? (timestamp - lc) : nil
 
       Flapjack::Data::Notification.add(@notifier_queue, event,
-        :type => notification_type, :severity => severity, :last_state => last_state,
+        :type => notification_type, :severity => severity,
+        :last_state => historical_state, :state_duration => state_duration,
         :redis => @redis)
     end
 

data/lib/flapjack/version.rb

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

data/spec/lib/flapjack/data/entity_check_spec.rb

@@ -373,12 +373,17 @@ describe Flapjack::Data::EntityCheck, :redis => true do
   it "updates state" do
     @redis.hset("check:#{name}:#{check}", 'state', 'ok')
 
+    old_timestamp = @redis.hget("check:#{name}:#{check}", 'last_update')
+
     ec = Flapjack::Data::EntityCheck.for_entity_name(name, check, :redis => @redis)
     ec.update_state('critical')
 
     state = @redis.hget("check:#{name}:#{check}", 'state')
     state.should_not be_nil
     state.should == 'critical'
+
+    new_timestamp = @redis.hget("check:#{name}:#{check}", 'last_update')
+    new_timestamp.should_not == old_timestamp
   end
 
   it "updates enabled checks" do

data/spec/lib/flapjack/data/event_spec.rb

@@ -88,7 +88,6 @@ describe Flapjack::Data::Event do
     its(:duration) { should == event_data['duration'] }
     its(:time)     { should == event_data['time'] }
     its(:id)       { should == 'xyz-example.com:ping' }
-    its(:client)   { should == 'xyz' }
     its(:type)     { should == 'service' }
 
     it { should be_a_service }

data/spec/lib/flapjack/gateways/email_spec.rb

@@ -3,22 +3,13 @@ require 'flapjack/gateways/email'
 
 describe Flapjack::Gateways::Email, :logger => true do
 
-  before(:each) do
-    Flapjack::Gateways::Email.instance_variable_set('@config', {})
-    Flapjack::Gateways::Email.instance_variable_set('@logger', @logger)
-    Flapjack::Gateways::Email.start
-  end
-
   it "sends a mail with text and html parts" do
     email = mock('email')
 
     entity_check = mock(Flapjack::Data::EntityCheck)
     entity_check.should_receive(:in_scheduled_maintenance?).and_return(false)
     entity_check.should_receive(:in_unscheduled_maintenance?).and_return(false)
-    entity_check.should_receive(:last_change).and_return(Time.now.to_i)
-
     redis = mock('redis')
-    ::Resque.should_receive(:redis).and_return(redis)
 
     Flapjack::Data::EntityCheck.should_receive(:for_event_id).
       with('example.com:ping', :redis => redis).and_return(entity_check)
@@ -38,12 +29,17 @@ describe Flapjack::Gateways::Email, :logger => true do
                     'contact_first_name'  => 'John',
                     'contact_last_name'   => 'Smith',
                     'state'               => 'ok',
+                    'state_duration'      => 2,
                     'summary'             => 'smile',
                     'last_state'          => 'problem',
                     'last_summary'        => 'frown',
                     'time'                => Time.now.to_i,
                     'event_id'            => 'example.com:ping'}
 
+    Flapjack::Gateways::Email.instance_variable_set('@config', {})
+    Flapjack::Gateways::Email.instance_variable_set('@redis', redis)
+    Flapjack::Gateways::Email.instance_variable_set('@logger', @logger)
+    Flapjack::Gateways::Email.start
     Flapjack::Gateways::Email.perform(notification)
   end
 

data/spec/lib/flapjack/gateways/sms_messagenet.spec.rb

@@ -1,6 +1,85 @@
 require 'spec_helper'
 require 'flapjack/gateways/sms_messagenet'
 
-describe Flapjack::Gateways::SmsMessagenet do
+describe Flapjack::Gateways::SmsMessagenet, :logger => true do
+
+  let(:lock) { mock(Monitor) }
+
+  let(:config) { {'username'  => 'user',
+                  'password'  => 'password'
+                 }
+               }
+
+  let(:time) { Time.now }
+
+  let(:time_str) { Time.at(time).strftime('%-d %b %H:%M') }
+
+  let(:message) { {'notification_type'  => 'recovery',
+                   'contact_first_name' => 'John',
+                   'contact_last_name'  => 'Smith',
+                   'state'              => 'ok',
+                   'summary'            => 'smile',
+                   'last_state'         => 'problem',
+                   'last_summary'       => 'frown',
+                   'time'               => time.to_i,
+                   'address'            => '555-555555',
+                   'event_id'           => 'example.com:ping',
+                   'id'                 => '123456789'
+                  }
+                }
+
+  it "sends an SMS message" do
+    req = stub_request(:get, "https://www.messagenet.com.au/dotnet/Lodge.asmx/LodgeSMSMessage").
+      with(:query => {'PhoneNumber' => '555-555555',
+                      'Username' => 'user', 'Pwd' => 'password',
+                      'PhoneMessage' => "RECOVERY: 'ping' on example.com is OK at #{time_str}, smile"}).
+      to_return(:status => 200)
+
+    EM.synchrony do
+      Flapjack::Gateways::SmsMessagenet.instance_variable_set('@config', config)
+      Flapjack::Gateways::SmsMessagenet.instance_variable_set('@logger', @logger)
+      Flapjack::Gateways::SmsMessagenet.start
+      Flapjack::Gateways::SmsMessagenet.perform(message)
+      EM.stop
+    end
+    req.should have_been_requested
+  end
+
+  it "truncates a long message a" do
+    long_msg = message.merge('summary' => 'Four score and seven years ago our ' +
+      'fathers brought forth on this continent, a new nation, conceived in ' +
+      'Liberty, and dedicated to the proposition that all men are created equal.')
+
+    req = stub_request(:get, "https://www.messagenet.com.au/dotnet/Lodge.asmx/LodgeSMSMessage").
+      with(:query => {'PhoneNumber' => '555-555555',
+                      'Username' => 'user', 'Pwd' => 'password',
+                      'PhoneMessage' => "RECOVERY: 'ping' on example.com is " +
+                      "OK at #{time_str}, Four score and seven years ago " +
+                      'our fathers brought forth on this continent, a new ' +
+                      'nation, conceived i...'}).
+      to_return(:status => 200)
+
+    EM.synchrony do
+      Flapjack::Gateways::SmsMessagenet.instance_variable_set('@config', config)
+      Flapjack::Gateways::SmsMessagenet.instance_variable_set('@logger', @logger)
+      Flapjack::Gateways::SmsMessagenet.start
+      Flapjack::Gateways::SmsMessagenet.perform(long_msg)
+      EM.stop
+    end
+    req.should have_been_requested
+  end
+
+  it "does not send an SMS message with an invalid config" do
+    EM.synchrony do
+      Flapjack::Gateways::SmsMessagenet.instance_variable_set('@config', config.reject {|k, v| k == 'password'})
+      Flapjack::Gateways::SmsMessagenet.instance_variable_set('@logger', @logger)
+      Flapjack::Gateways::SmsMessagenet.start
+      Flapjack::Gateways::SmsMessagenet.perform(message)
+      EM.stop
+    end
+
+    WebMock.should_not have_requested(:get,
+      "https://www.messagenet.com.au/dotnet/Lodge.asmx/LodgeSMSMessage")
+  end
 
 end