flapjack 0.7.2 → 0.7.3

data/lib/flapjack/gateways/web.rb

@@ -71,12 +71,13 @@ module Flapjack
       end
 
       get '/' do
-        self_stats
+        check_stats
+        entity_stats
         haml :index
       end
 
       get '/checks_all' do
-        self_stats
+        check_stats
         @adjective = 'all'
 
         # TODO (?) recast as Entity.all do |e|; e.checks.do |ec|; ...
@@ -89,7 +90,7 @@ module Flapjack
       end
 
       get '/checks_failing' do
-        self_stats
+        check_stats
         @adjective = 'failing'
 
         @states = redis.zrange('failed_checks', 0, -1).map {|key|
@@ -102,11 +103,15 @@ module Flapjack
 
       get '/self_stats' do
         self_stats
+        entity_stats
+        check_stats
         haml :self_stats
       end
 
       get '/self_stats.json' do
         self_stats
+        entity_stats
+        check_stats
         {
           'events_queued'    => @events_queued,
           'all_entities'     => @count_all_entities,
@@ -128,7 +133,7 @@ module Flapjack
               'average' => @event_rate_all,
             }
           },
-          'total_keys' => @keys.length,
+          'total_keys' => @dbsize,
           'uptime'     => @uptime_string,
           'boottime'   => @boot_time,
           'current_time' => Time.now,
@@ -137,22 +142,22 @@ module Flapjack
       end
 
       get '/entities_all' do
-        self_stats
+        entity_stats
         @adjective = 'all'
         @entities = Flapjack::Data::Entity.find_all_with_checks(:redis => redis)
         haml :entities
       end
 
       get '/entities_failing' do
-        self_stats
+        entity_stats
         @adjective = 'failing'
         @entities = Flapjack::Data::Entity.find_all_with_failing_checks(:redis => redis)
         haml :entities
       end
 
       get '/entity/:entity' do
-        self_stats
         @entity = params[:entity]
+        entity_stats
         @states = redis.keys("#{@entity}:*:states").map { |r|
           parts  = r.split(':')[0..1]
           [parts[0], parts[1]] + entity_check_state(parts[0], parts[1])
@@ -167,7 +172,8 @@ module Flapjack
         entity_check = get_entity_check(@entity, @check)
         return 404 if entity_check.nil?
 
-        self_stats
+        check_stats
+
         last_change = entity_check.last_change
 
         @check_state                = entity_check.state
@@ -263,13 +269,13 @@ module Flapjack
       end
 
       get '/contacts' do
-        self_stats
+        #self_stats
         @contacts = Flapjack::Data::Contact.all(:redis => redis)
         haml :contacts
       end
 
       get "/contacts/:contact" do
-        self_stats
+        #self_stats
         contact_id = params[:contact]
 
         if contact_id
@@ -332,13 +338,8 @@ module Flapjack
         @fqdn         = `/bin/hostname -f`.chomp
         @pid          = Process.pid
         @instance_id  = "#{@fqdn}:#{@pid}"
-        @version      = Flapjack::VERSION
 
-        @keys = redis.keys '*'
-        @count_all_checks        = redis.keys('check:*:*').length
-        @count_failing_checks    = redis.zcard 'failed_checks'
-        @count_all_entities      = Flapjack::Data::Entity.find_all_with_checks(:redis => redis).length
-        @count_failing_entities  = Flapjack::Data::Entity.find_all_with_failing_checks(:redis => redis).length
+        @dbsize                  = redis.dbsize
         @executive_instances     = redis.keys("executive_instance:*").map {|i|
           [ i.match(/executive_instance:(.*)/)[1], redis.hget(i, 'boot_time').to_i ]
         }.sort {|a, b| b[1] <=> a[1]}
@@ -352,6 +353,17 @@ module Flapjack
         @events_queued           = redis.llen('events')
       end
 
+      def entity_stats
+        @count_all_entities      = Flapjack::Data::Entity.find_all_with_checks(:redis => redis).length
+        @count_failing_entities  = Flapjack::Data::Entity.find_all_with_failing_checks(:redis => redis).length
+      end
+
+      def check_stats
+        @count_all_checks        = redis.keys('check:*:*').length
+        @count_failing_checks    = redis.zcard 'failed_checks'
+      end
+
+
     end
 
   end

data/lib/flapjack/gateways/web/views/_foot.haml

@@ -1,8 +1,8 @@
 %div{:class => "container"}
   %p{:class => "muted credit"}
-    = "Flapjack version #{@version} | "
+    = "Flapjack version #{::Flapjack::VERSION} | "
     %a{:href => 'http://flapjack-project.com'}
       Flapjack Project
     = " | "
     %a{:href => 'https://github.com/flpjck/flapjack'}
-      Flapjack on Github
+      Flapjack on Github

data/lib/flapjack/gateways/web/views/entity.haml

@@ -21,11 +21,17 @@
               %th Last Update
               %th Last Notification
             - @states.each do |entity, check, status, changed, updated, in_unscheduled_outage, in_scheduled_outage, notified_kind, notified|
-              %tr
+              - colour_class = status
+              - case status
+              - when 'critical', 'unknown'
+                - colour_class = 'error'
+              - when 'ok', 'up'
+                - colour_class = 'success'
+              %tr{:class => colour_class}
                 %td
                   - link = "/check?entity=" + CGI.escape(entity) + "&check=" + CGI.escape(check)
                   %a(title='check detail' href=link) #{check}
-                %td{:class => status}
+                %td
                   = status.upcase
                   = " (Acknowledged)" if in_unscheduled_outage
                   = " (Scheduled Maintenance)" if in_scheduled_outage

data/lib/flapjack/gateways/web/views/self_stats.haml

@@ -39,7 +39,7 @@
             %td #{@event_rate_all} events per second
           %tr
             %td Total keys in redis
-            %td #{@keys.length}
+            %td #{@dbsize}
           %tr
             %td Uptime
             %td= @uptime_string

data/lib/flapjack/patches.rb

@@ -44,8 +44,27 @@ class Hash
   end
 end
 
-# we don't want to stop the entire EM reactor when we stop a web server
 module Thin
+
+  # see https://github.com/flpjck/flapjack/issues/169
+  class Request
+    class EqlTempfile < ::Tempfile
+      def eql?(obj)
+        obj.equal?(self) && (obj == self)
+      end
+    end
+
+    def move_body_to_tempfile
+      current_body = @body
+      current_body.rewind
+      @body = Thin::Request::EqlTempfile.new(BODY_TMPFILE)
+      @body.binmode
+      @body << current_body.read
+      @env[RACK_INPUT] = @body
+    end
+  end
+
+  # we don't want to stop the entire EM reactor when we stop a web server
   module Backends
     class Base
       def stop!

data/lib/flapjack/pikelet.rb

@@ -110,13 +110,7 @@ module Flapjack
 
       def start
         @fiber = Fiber.new {
-          begin
-            @pikelet.start
-          rescue Exception => e
-            trace = e.backtrace.join("\n")
-            @logger.fatal "#{e.message}\n#{trace}"
-            stop
-          end
+          @pikelet.start
         }
         super
         @fiber.resume
@@ -172,13 +166,7 @@ module Flapjack
 
       def start
         @fiber = Fiber.new {
-          begin
-            @worker.work(0.1)
-          rescue Exception => e
-            trace = e.backtrace.join("\n")
-            @logger.fatal "#{e.message}\n#{trace}"
-            stop
-          end
+          @worker.work(0.1)
         }
         super
         @klass.start if @klass.respond_to?(:start)
@@ -225,11 +213,14 @@ module Flapjack
         if @config
           @port = @config['port']
           @port = @port.nil? ? nil : @port.to_i
+          @timeout = @config['timeout']
+          @timeout = @timeout.nil? ? 300 : @timeout.to_i
         end
         @port = 3001 if (@port.nil? || @port <= 0 || @port > 65535)
 
         @server = ::Thin::Server.new('0.0.0.0', @port,
                     @klass, :signals => false)
+        @server.timeout = @timeout
       end
 
       def start

data/lib/flapjack/utility.rb

@@ -52,5 +52,21 @@ module Flapjack
       return obj
     end
 
+    # The passed block will be provided each value from the args
+    # and must return array pairs [key, value] representing members of
+    # the hash this method returns. Keys should be unique -- if they're
+    # not, the earlier pair for that key will be overwritten.
+    def hashify(*args, &block)
+      key_value_pairs = args.map {|a| yield(a) }
+
+      # if using Ruby 1.9,
+      #   Hash[ key_value_pairs ]
+      # is all that's needed, but for Ruby 1.8 compatability, these must
+      # be flattened and the resulting array unpacked. flatten(1) only
+      # flattens the arrays constructed in the block, it won't mess up
+      # any values (or keys) that are themselves arrays/hashes.
+      Hash[ *( key_value_pairs.flatten(1) )]
+    end
+
   end
 end

data/lib/flapjack/version.rb

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

data/spec/lib/flapjack/coordinator_spec.rb

@@ -54,6 +54,34 @@ describe Flapjack::Coordinator do
     fc.stop
   end
 
+  it "handles an exception raised by a pikelet and shuts down" do
+    setup_logger
+    logger.should_receive(:fatal)
+
+    cfg = {'executive' => {'enabled' => 'yes'}}
+    EM.should_receive(:synchrony).and_yield
+    config.should_receive(:for_redis).and_return({})
+    config.should_receive(:all).and_return(cfg)
+
+    executive = mock('executive')
+    executive.should_receive(:start).and_raise(RuntimeError)
+    executive.should_receive(:stop)
+    executive.should_receive(:update_status)
+    executive.should_receive(:status).exactly(3).times.and_return('stopped')
+
+    fc = Flapjack::Coordinator.new(config)
+    Flapjack::Pikelet.should_receive(:create).with('executive',
+        :config => cfg['executive'], :redis_config => {}).and_return(executive)
+
+    fiber.should_receive(:resume)
+    Fiber.should_receive(:new).and_yield.and_return(fiber)
+
+    EM.should_receive(:stop)
+
+    fc.start(:signals => false)
+    fc.stop
+  end
+
   it "traps system signals and shuts down" do
     setup_logger
 
@@ -143,6 +171,7 @@ describe Flapjack::Coordinator do
     new_config.should_receive(:all).and_return(new_cfg)
 
     executive = mock('executive')
+    executive.should_not_receive(:start)
     executive.should_receive(:type).exactly(3).times.and_return('executive')
     executive.should_receive(:reload).with(new_cfg['executive']).and_return(true)
     executive.should_not_receive(:stop)

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

@@ -9,13 +9,10 @@ require 'flapjack/data/notification_rule'
 
 describe Flapjack::Data::Contact, :redis => true do
 
-  weekdays_8_18 = IceCube::Schedule.new(Time.local(2013,2,1,8,0,0), :duration => 60 * 60 * 10)
-  weekdays_8_18.add_recurrence_rule(IceCube::Rule.weekly.day(:monday, :tuesday, :wednesday, :thursday, :friday))
-
   let(:notification_rule_data) {
     {:entity_tags        => ["database","physical"],
      :entities           => ["foo-app-01.example.com"],
-     :time_restrictions  => [ weekdays_8_18.to_hash ],
+     :time_restrictions  => [],
      :warning_media      => ["email"],
      :critical_media     => ["sms", "email"],
      :warning_blackhole  => false,

data/spec/lib/flapjack/data/notification_rule_spec.rb

@@ -1,22 +1,115 @@
 require 'spec_helper'
 require 'flapjack/data/notification_rule'
 
-describe Flapjack::Data::NotificationRule do
+describe Flapjack::Data::NotificationRule, :redis => true do
 
-  it "checks that a notification rule exists"
+  let(:weekdays_8_18) {
+    wd = IceCube::Schedule.new(Time.local(2013,2,1,8,0,0), :duration => 60 * 60 * 10)
+    wd.add_recurrence_rule(IceCube::Rule.weekly.day(:monday, :tuesday, :wednesday, :thursday, :friday))
+    wd = wd.to_hash
+    wd[:start_time] = wd.delete(:start_date)
+    wd[:rrules].first[:rule_type] = wd[:rrules].first[:rule_type].sub(/\AIceCube::(\w+)Rule\z/, '\1')
+    wd
+  }
 
-  it "returns a notification rule if it exists"
+  let(:rule_data) {
+    {:contact_id         => '23',
+     :entity_tags        => ["database","physical"],
+     :entities           => ["foo-app-01.example.com"],
+     :time_restrictions  => [ weekdays_8_18 ],
+     :warning_media      => ["email"],
+     :critical_media     => ["sms", "email"],
+     :warning_blackhole  => false,
+     :critical_blackhole => false
+    }
+  }
 
-  it "does not return a notification rule if it does not exist"
+  let(:rule_id) { 'ABC123' }
 
-  it "updates a notification rule"
+  let(:timezone) { ActiveSupport::TimeZone.new("Europe/Moscow") }
 
-  it "checks whether tag or entity names match"
+  let(:existing_rule) {
+    Flapjack::Data::NotificationRule.add(rule_data, :redis => @redis)
+  }
 
-  it "checks whether times match"
+  it "checks that a notification rule exists" do
+    Flapjack::Data::NotificationRule.exists_with_id?(existing_rule.id, :redis => @redis).should be_true
+    Flapjack::Data::NotificationRule.exists_with_id?('not_there', :redis => @redis).should be_false
+  end
 
-  it "checks if blackhole settings for a rule match a severity level"
+  it "returns a notification rule if it exists" do
+    rule = Flapjack::Data::NotificationRule.find_by_id(existing_rule.id, :redis => @redis)
+    rule.should_not be_nil
+  end
 
-  it "returns the media settings for a rule's severity level"
+  it "does not return a notification rule if it does not exist" do
+    rule = Flapjack::Data::NotificationRule.find_by_id('not_there', :redis => @redis)
+    rule.should be_nil
+  end
+
+  it "updates a notification rule" do
+    rule = existing_rule
+
+    expect {
+      rule_data[:warning_blackhole] = true
+      success = rule.update(rule_data)
+      success.should be_true
+    }.to change { rule.warning_blackhole }.from(false).to(true)
+  end
+
+  it "converts time restriction data to an IceCube schedule" do
+    sched = Flapjack::Data::NotificationRule.
+              time_restriction_to_icecube_schedule(weekdays_8_18, timezone)
+    sched.should_not be_nil
+  end
+
+  it "generates a JSON string representing its data" do
+    rule = existing_rule
+    # bit of extra hackery for the inserted ID values
+    rule.to_json.should == {:id => rule.id}.merge(rule_data).to_json
+  end
+
+  it "checks whether entity names match" do
+    rule = existing_rule
+
+    rule.match_entity?('foo-app-01.example.com').should be_true
+    rule.match_entity?('foo-app-02.example.com').should be_false
+  end
+
+  pending "check whether entity tags match"
+
+  it "checks if blackhole settings for a rule match a severity level" do
+    rule_data[:warning_blackhole] = true
+    rule = Flapjack::Data::NotificationRule.add(rule_data, :redis => @redis)
+
+    rule.blackhole?('warning').should be_true
+    rule.blackhole?('critical').should be_false
+  end
+
+  it "returns the media settings for a rule's severity level" do
+    rule = existing_rule
+    rule.media_for_severity('warning').should == ['email']
+    rule.media_for_severity('critical').should =~ ['email', 'sms']
+  end
+
+  context 'validation' do
+
+    it "fails to add a notification rule with invalid data" do
+      rule_data[:entities] = []
+      rule_data[:entity_tags] = []
+      rule = Flapjack::Data::NotificationRule.add(rule_data, :redis => @redis)
+      rule.should be_nil
+    end
+
+    it "fails to update a notification rule with invalid data" do
+      rule = Flapjack::Data::NotificationRule.add(rule_data, :redis => @redis)
+      expect {
+        rule_data[:entities] = [57]
+        success = rule.update(rule_data)
+        success.should be_false
+      }.not_to change { rule.entities }
+    end
+
+  end
 
 end