flapjack 0.7.22 → 0.7.25

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

@@ -206,7 +206,7 @@ describe Flapjack::Gateways::Web, :sinatra => true, :logger => true do
       with(entity, 'ping', :redis => redis).and_return(entity_check)
 
     entity_check.should_receive(:create_scheduled_maintenance).
-      with(:start_time => start_time.to_i, :duration => duration, :summary => summary)
+      with(start_time.to_i, duration, :summary => summary)
 
     post "/scheduled_maintenances/#{entity_name_esc}/ping?"+
       "start_time=1+day+ago&duration=30+minutes&summary=wow"

data/spec/lib/flapjack/pikelet_spec.rb

@@ -44,14 +44,15 @@ describe Flapjack::Pikelet do
     config.should_receive(:[]).with('logger').and_return(nil)
     config.should_receive(:[]).with('queue').and_return('email_notif')
 
+    resque_redis = mock('resque_redis')
     redis = mock('redis')
-    Flapjack::RedisPool.should_receive(:new).and_return(redis)
-    Resque.should_receive(:redis=).with( redis )
+    Flapjack::RedisPool.should_receive(:new).twice.and_return(resque_redis, redis)
+    Resque.should_receive(:redis=).with(resque_redis)
 
     Flapjack::Gateways::Email.should_receive(:instance_variable_set).
       with('@config', config)
     Flapjack::Gateways::Email.should_receive(:instance_variable_set).
-      with('@redis_config', redis_config)
+      with('@redis', redis)
     Flapjack::Gateways::Email.should_receive(:instance_variable_set).
       with('@logger', logger)
 

data/spec/lib/flapjack/processor_spec.rb

@@ -16,7 +16,6 @@ describe Flapjack::Processor, :logger => true do
     Flapjack::Filters::Ok.should_receive(:new)
     Flapjack::Filters::ScheduledMaintenance.should_receive(:new)
     Flapjack::Filters::UnscheduledMaintenance.should_receive(:new)
-    Flapjack::Filters::DetectMassClientFailures.should_receive(:new)
     Flapjack::Filters::Delays.should_receive(:new)
     Flapjack::Filters::Acknowledgement.should_receive(:new)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flapjack
 version: !ruby/object:Gem::Version
-  version: 0.7.22
+  version: 0.7.25
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-09 00:00:00.000000000 Z
+date: 2013-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dante
@@ -274,17 +274,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.14
 - !ruby/object:Gem::Dependency
   name: ice_cube
   requirement: !ruby/object:Gem::Requirement
@@ -303,6 +303,22 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: tzinfo
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+- !ruby/object:Gem::Dependency
+  name: tzinfo-data
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -408,7 +424,6 @@ files:
 - lib/flapjack/filters/acknowledgement.rb
 - lib/flapjack/filters/base.rb
 - lib/flapjack/filters/delays.rb
-- lib/flapjack/filters/detect_mass_client_failures.rb
 - lib/flapjack/filters/ok.rb
 - lib/flapjack/filters/scheduled_maintenance.rb
 - lib/flapjack/filters/unscheduled_maintenance.rb
@@ -429,6 +444,10 @@ files:
 - lib/flapjack/gateways/web/public/css/bootstrap-responsive.min.css
 - lib/flapjack/gateways/web/public/css/bootstrap.min.css
 - lib/flapjack/gateways/web/public/css/flapjack.css
+- lib/flapjack/gateways/web/public/img/flapjack-favicon-32-16.ico
+- lib/flapjack/gateways/web/public/img/flapjack-favicon-64-32-24-16.ico
+- lib/flapjack/gateways/web/public/img/flapjack-transparent-300.png
+- lib/flapjack/gateways/web/public/img/flapjack-transparent-350-400.png
 - lib/flapjack/gateways/web/public/img/flapjack_white_bg_400_353.jpeg
 - lib/flapjack/gateways/web/public/img/glyphicons-halflings-white.png
 - lib/flapjack/gateways/web/public/img/glyphicons-halflings.png
@@ -466,7 +485,6 @@ files:
 - spec/lib/flapjack/data/tag_spec.rb
 - spec/lib/flapjack/filters/acknowledgement_spec.rb
 - spec/lib/flapjack/filters/delays_spec.rb
-- spec/lib/flapjack/filters/detect_mass_client_failures_spec.rb
 - spec/lib/flapjack/filters/ok_spec.rb
 - spec/lib/flapjack/filters/scheduled_maintenance_spec.rb
 - spec/lib/flapjack/filters/unscheduled_maintenance_spec.rb
@@ -529,7 +547,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 525306744622522205
+      hash: 2327642757705601515
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -538,7 +556,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 525306744622522205
+      hash: 2327642757705601515
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -570,7 +588,6 @@ test_files:
 - spec/lib/flapjack/data/tag_spec.rb
 - spec/lib/flapjack/filters/acknowledgement_spec.rb
 - spec/lib/flapjack/filters/delays_spec.rb
-- spec/lib/flapjack/filters/detect_mass_client_failures_spec.rb
 - spec/lib/flapjack/filters/ok_spec.rb
 - spec/lib/flapjack/filters/scheduled_maintenance_spec.rb
 - spec/lib/flapjack/filters/unscheduled_maintenance_spec.rb

data/lib/flapjack/filters/detect_mass_client_failures.rb

@@ -1,44 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'flapjack/filters/base'
-
-module Flapjack
-  module Filters
-
-    # * If the service event’s state is a failure, and the total number of failing client checks is
-    #   over a threshold (e.g. 10 checks are failing), then set a meta flag noting the threshold has
-    #   been tripped, and generate an event for this meta check
-    # * If the service event’s state is ok, and the meta flag is set, and the total number of
-    #   failing client checks is less than a threshold (eg 10), then unset the flag, and generate an
-    #   event for this meta check
-    class DetectMassClientFailures
-      include Base
-
-      def block?(event)
-        client_mass_fail_threshold = 10
-        timestamp = Time.now.to_i
-
-        if event.service?
-          client_fail_count = @redis.zcount("failed_checks:#{event.client}", '-inf', '+inf')
-
-          if client_fail_count >= client_mass_fail_threshold
-            # set the flag
-            # FIXME: perhaps implement this with tagging
-            @redis.add("mass_failed_client:#{event.client}", timestamp)
-            @redis.zadd("mass_failure_events_client:#{event.client}", 0, timestamp)
-          else
-            # unset the flag
-            start_mf = @redis.get("mass_failed_client:#{event.client}")
-            duration = Time.now.to_i - start_mf.to_i
-            @redis.del("mass_failed_client:#{event.client}")
-            @redis.zadd("mass_failure_events_client:#{event.client}", duration, start_mf)
-          end
-        end
-
-        result = false
-        @logger.debug("Filter: DetectMassClientFailures: #{result ? "block" : "pass"}")
-        result
-      end
-    end
-  end
-end

data/spec/lib/flapjack/filters/detect_mass_client_failures_spec.rb

@@ -1,6 +0,0 @@
-require 'spec_helper'
-require 'flapjack/filters/detect_mass_client_failures'
-
-describe Flapjack::Filters::DetectMassClientFailures do
-
-end