flapjack 0.7.1 → 0.7.2

data/lib/flapjack/version.rb

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

data/spec/lib/flapjack/executive_spec.rb

@@ -19,19 +19,23 @@ describe Flapjack::Executive, :logger => true do
 
     redis = mock('redis')
 
-    redis.should_receive(:set).with('boot_time', a_kind_of(Integer))
+    #redis.should_receive(:set).with('boot_time', a_kind_of(Integer))
+    redis.should_receive(:hset).with(/^executive_instance:/, "boot_time", anything)
     redis.should_receive(:hget).with('event_counters', 'all').and_return(nil)
     redis.should_receive(:hset).with('event_counters', 'all', 0)
     redis.should_receive(:hset).with('event_counters', 'ok', 0)
     redis.should_receive(:hset).with('event_counters', 'failure', 0)
     redis.should_receive(:hset).with('event_counters', 'action', 0)
 
-    redis.should_receive(:zadd).with('executive_instances', a_kind_of(Integer), a_kind_of(String))
+    #redis.should_receive(:zadd).with('executive_instances', a_kind_of(Integer), a_kind_of(String))
     redis.should_receive(:hset).with(/^event_counters:/, 'all', 0)
     redis.should_receive(:hset).with(/^event_counters:/, 'ok', 0)
     redis.should_receive(:hset).with(/^event_counters:/, 'failure', 0)
     redis.should_receive(:hset).with(/^event_counters:/, 'action', 0)
 
+    redis.should_receive(:expire).with(/^executive_instance:/, anything).twice
+    redis.should_receive(:expire).with(/^event_counters:/, anything).exactly(8).times
+
     redis.should_receive(:hincrby).with('event_counters', 'all', 1)
     redis.should_receive(:hincrby).with(/^event_counters:/, 'all', 1)
 

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

@@ -196,6 +196,21 @@ describe 'Flapjack::Gateways::API', :sinatra => true, :logger => true, :json =>
     last_response.status.should == 204
   end
 
+  it "creates a scheduled maintenance for an entity check" do
+    start = Time.now + (60 * 60) # an hour from now
+    duration = (2 * 60 * 60)     # two hours
+    Flapjack::Data::Entity.should_receive(:find_by_name).
+      with(entity_name, :redis => redis).and_return(entity)
+    Flapjack::Data::EntityCheck.should_receive(:for_entity).
+      with(entity, check, :redis => redis).and_return(entity_check)
+    entity_check.should_receive(:create_scheduled_maintenance).
+      with(:summary => 'test', :duration => duration, :start_time => start.getutc.to_i)
+
+    post "/scheduled_maintenances/#{entity_name_esc}/#{check}?" +
+       "start_time=#{CGI.escape(start.iso8601)}&summary=test&duration=#{duration}"
+    last_response.status.should == 204
+  end
+
   it "returns a list of scheduled maintenance periods within a time window for an entity" do
     start  = Time.parse('1 Jan 2012')
     finish = Time.parse('6 Jan 2012')

data/spec/lib/flapjack/gateways/web/views/contact.haml_spec.rb

@@ -6,9 +6,10 @@ describe 'web/views/contact.haml', :haml_view => true do
     @contact = mock('contact')
     @contact.should_receive(:media)
     @contact.should_receive(:name).twice.and_return('Aeschylus')
+    @contact.should_receive(:notification_rules)
 
     entity = mock('entity')
-    entity.should_receive(:name).twice.and_return('abc-xyz-01')
+    entity.should_receive(:name).exactly(3).times.and_return('abc-xyz-01')
 
     checks = ['Disk / Utilisation']
 

data/spec/lib/flapjack/gateways/web/views/index.haml_spec.rb

@@ -1,11 +1,12 @@
 require 'spec_helper'
 
-describe 'web/views/index.haml', :haml_view => true do
+describe 'web/views/checks.haml', :haml_view => true do
 
   it "should escape unsafe check characters in URI parameters" do
     @states = [['abc-xyz-01', 'Disk / Utilisation', '-', '-', '-', false, false, nil, nil]]
+    @adjective = "all"
 
-    page = render_haml('index.haml', self)
+    page = render_haml('checks.haml', self)
     page.should match(%r{\?entity=abc-xyz-01&check=Disk\+%2F\+Utilisation})
   end
 

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

@@ -19,6 +19,7 @@ describe Flapjack::Gateways::Web, :sinatra => true, :logger => true do
   before(:all) do
     Flapjack::Gateways::Web.class_eval {
       set :raise_errors, true
+      set :show_exceptions, false
     }
     Flapjack::Gateways::Web.instance_variable_get('@middleware').delete_if {|m|
       m[0] == Rack::FiberPool
@@ -33,10 +34,11 @@ describe Flapjack::Gateways::Web, :sinatra => true, :logger => true do
   end
 
   def expect_stats
-    redis.should_receive(:keys).with('*').and_return([])
-    redis.should_receive(:zcard).with('failed_checks')
+    redis.should_receive(:keys).with('*').and_return(['a', 'b', 'c'])
     redis.should_receive(:keys).with('check:*:*').and_return([])
-    redis.should_receive(:zscore).with('executive_instances', anything).and_return(Time.now.to_i)
+    redis.should_receive(:zcard).with('failed_checks')
+    redis.should_receive(:keys).with('executive_instance:*').and_return(["executive_instance:foo-app-01"])
+    redis.should_receive(:hget).twice.and_return(Time.now.to_i - 60)
     redis.should_receive(:hgetall).twice.and_return({'all' => '8001', 'ok' => '8002'},
       {'all' => '9001', 'ok' => '9002'})
     redis.should_receive(:llen).with('events')
@@ -60,10 +62,11 @@ describe Flapjack::Gateways::Web, :sinatra => true, :logger => true do
 
   it "shows a page listing all checks" do
     redis.should_receive(:keys).with('*:*:states').and_return(["#{entity_name}:#{check}:states"])
+    redis.should_receive(:keys).with('check:*').and_return(["#{entity_name}:#{check}:states"])
 
     expect_stats
 
-    redis.should_receive(:zrange).with("executive_instances", "0", "-1", :withscores => true)
+    redis.should_receive(:zrange).with("failed_checks", 0, -1).and_return([])
 
     expect_entity_check_status(entity_check)
 
@@ -73,13 +76,13 @@ describe Flapjack::Gateways::Web, :sinatra => true, :logger => true do
     Flapjack::Data::EntityCheck.should_receive(:for_entity).
       with(entity, 'ping', :redis => redis).and_return(entity_check)
 
-    get '/'
+    get '/checks_all'
     last_response.should be_ok
   end
 
   it "shows a page listing failing checks" do
-    redis.should_receive(:zrange).with("executive_instances", "0", "-1", :withscores => true)
-    redis.should_receive(:zrange).with('failed_checks', 0, -1).and_return(["#{entity_name}:#{check}:states"])
+    redis.should_receive(:zrange).with('failed_checks', 0, -1).twice.and_return(["#{entity_name}:#{check}:states"])
+    redis.should_receive(:keys).with('check:*').and_return(["#{entity_name}:#{check}:states"])
 
     expect_stats
 
@@ -90,13 +93,14 @@ describe Flapjack::Gateways::Web, :sinatra => true, :logger => true do
 
     Flapjack::Data::EntityCheck.should_receive(:for_entity).
       with(entity, 'ping', :redis => redis).and_return(entity_check)
-    get '/failing'
+    get '/checks_failing'
     last_response.should be_ok
   end
 
   it "shows a page listing flapjack statistics" do
+    redis.should_receive(:keys).with('check:*').and_return([])
+    redis.should_receive(:zrange).with('failed_checks', 0, -1).and_return(["#{entity_name}:#{check}:states"])
     expect_stats
-    redis.should_receive(:zrange).with("executive_instances", "0", "-1", :withscores => true)
 
     get '/self_stats'
     last_response.should be_ok
@@ -109,6 +113,9 @@ describe Flapjack::Gateways::Web, :sinatra => true, :logger => true do
                           :recovery        => time - (3 * 60 * 60),
                           :acknowledgement => nil }
 
+    expect_stats
+    redis.should_receive(:keys).with('check:*').and_return([])
+    redis.should_receive(:zrange).with('failed_checks', 0, -1).and_return([])
     entity_check.should_receive(:state).and_return('ok')
     entity_check.should_receive(:last_update).and_return(time - (3 * 60 * 60))
     entity_check.should_receive(:last_change).and_return(time - (3 * 60 * 60))
@@ -228,6 +235,9 @@ describe Flapjack::Gateways::Web, :sinatra => true, :logger => true do
 
   it "shows a list of all known contacts" do
     Flapjack::Data::Contact.should_receive(:all)
+    redis.should_receive(:keys).with('check:*').and_return([])
+    redis.should_receive(:zrange).with('failed_checks', 0, -1).and_return(["#{entity_name}:#{check}:states"])
+    expect_stats
 
     get "/contacts"
     last_response.should be_ok
@@ -238,6 +248,10 @@ describe Flapjack::Gateways::Web, :sinatra => true, :logger => true do
     contact.should_receive(:name).twice.and_return("Smithson Smith")
     contact.should_receive(:media).exactly(3).times.and_return({})
     contact.should_receive(:entities).with(:checks => true).and_return([])
+    contact.should_receive(:notification_rules).and_return([])
+    redis.should_receive(:keys).with('check:*').and_return([])
+    redis.should_receive(:zrange).with('failed_checks', 0, -1).and_return(["#{entity_name}:#{check}:states"])
+    expect_stats
 
     Flapjack::Data::Contact.should_receive(:find_by_id).
       with('0362', :redis => redis).and_return(contact)

data/tmp/create_events_failure.rb

@@ -8,10 +8,12 @@ id = "%.2d" % (1..10).to_a[rand(9)]
 events = []
 
 events << {
-  'entity' => "app-#{id}",
-  'check' => 'http',
-  'type' => 'service',
-  'state' => 'critical',
+  'entity'    => "app-#{id}",
+  'check'     => 'http',
+  'type'      => 'service',
+  'state'     => 'critical',
+  'summary'   => "It's failing, yo!",
+  'timestamp' => Time.now.to_i,
 }.to_json
 
 redis = Redis.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flapjack
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-24 00:00:00.000000000 Z
+date: 2013-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dante
@@ -258,17 +258,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.8.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.8.3
 - !ruby/object:Gem::Dependency
   name: chronic
   requirement: !ruby/object:Gem::Requirement
@@ -375,6 +375,8 @@ executables:
 - flapjack-netsaint-parser
 - flapjack-populator
 - flapper
+- receive-events
+- simulate-failed-check
 extensions: []
 extra_rdoc_files: []
 files:
@@ -383,6 +385,7 @@ files:
 - .rbenv-version
 - .rspec
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
 - Guardfile
 - LICENCE
@@ -393,6 +396,8 @@ files:
 - bin/flapjack-netsaint-parser
 - bin/flapjack-populator
 - bin/flapper
+- bin/receive-events
+- bin/simulate-failed-check
 - config.ru
 - dist/etc/init.d/flapjack
 - dist/etc/init.d/flapjack-nagios-receiver
@@ -452,11 +457,23 @@ files:
 - lib/flapjack/gateways/pagerduty.rb
 - lib/flapjack/gateways/sms_messagenet.rb
 - lib/flapjack/gateways/web.rb
+- 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_white_bg_400_353.jpeg
+- lib/flapjack/gateways/web/public/img/glyphicons-halflings-white.png
+- lib/flapjack/gateways/web/public/img/glyphicons-halflings.png
+- lib/flapjack/gateways/web/public/js/bootstrap.min.js
 - lib/flapjack/gateways/web/views/_css.haml
+- lib/flapjack/gateways/web/views/_foot.haml
+- lib/flapjack/gateways/web/views/_head.haml
 - lib/flapjack/gateways/web/views/_nav.haml
 - lib/flapjack/gateways/web/views/check.haml
+- lib/flapjack/gateways/web/views/checks.haml
 - lib/flapjack/gateways/web/views/contact.haml
 - lib/flapjack/gateways/web/views/contacts.haml
+- lib/flapjack/gateways/web/views/entities.haml
+- lib/flapjack/gateways/web/views/entity.haml
 - lib/flapjack/gateways/web/views/index.haml
 - lib/flapjack/gateways/web/views/self_stats.haml
 - lib/flapjack/logger.rb
@@ -534,18 +551,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 308146534625742434
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 308146534625742434
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23