flapjack 0.6.61 → 0.7.0

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

@@ -104,6 +104,7 @@ describe Flapjack::Gateways::Jabber, :logger => true do
 
     attempts = 0
 
+    EventMachine::Synchrony.should_receive(:sleep).with(5).exactly(1).times
     EventMachine::Synchrony.should_receive(:sleep).with(2).exactly(3).times
     fj.should_receive(:connect).exactly(4).times.and_return {
       attempts +=1

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

@@ -16,6 +16,15 @@ describe Flapjack::Gateways::Web, :sinatra => true, :logger => true do
 
   let(:redis) { mock('redis') }
 
+  before(:all) do
+    Flapjack::Gateways::Web.class_eval {
+      set :raise_errors, true
+    }
+    Flapjack::Gateways::Web.instance_variable_get('@middleware').delete_if {|m|
+      m[0] == Rack::FiberPool
+    }
+  end
+
   before(:each) do
     Flapjack::RedisPool.should_receive(:new).and_return(redis)
     Flapjack::Gateways::Web.instance_variable_set('@config', {})
@@ -174,6 +183,7 @@ describe Flapjack::Gateways::Web, :sinatra => true, :logger => true do
 
     post "/scheduled_maintenances/#{entity_name_esc}/ping?"+
       "start_time=1+day+ago&duration=30+minutes&summary=wow"
+
     last_response.status.should == 302
   end
 
@@ -227,7 +237,7 @@ describe Flapjack::Gateways::Web, :sinatra => true, :logger => true do
     contact = mock('contact')
     contact.should_receive(:name).twice.and_return("Smithson Smith")
     contact.should_receive(:media).exactly(3).times.and_return({})
-    contact.should_receive(:entities_and_checks).and_return([])
+    contact.should_receive(:entities).with(:checks => true).and_return([])
 
     Flapjack::Data::Contact.should_receive(:find_by_id).
       with('0362', :redis => redis).and_return(contact)

data/spec/spec_helper.rb

@@ -9,6 +9,8 @@ end
 $testing = true
 
 FLAPJACK_ENV = ENV["FLAPJACK_ENV"] || 'test'
+ENV['RACK_ENV'] = ENV["FLAPJACK_ENV"]
+
 require 'bundler'
 Bundler.require(:default, :test)
 
@@ -37,6 +39,11 @@ class MockLogger
   end
 end
 
+JsonSpec.configure do
+  # so we include id
+  exclude_keys "created_at", "updated_at"
+end
+
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
 # Require this file using `require "spec_helper"` to ensure that it is only
@@ -76,6 +83,8 @@ RSpec.configure do |config|
   config.around(:each, :logger => true) do |example|
     @logger = MockLogger.new
     example.run
+    #messages = @logger.messages.compact
+    #p "logger: " + messages.join(", ") unless messages.empty?
     @logger.messages.clear
   end
 
@@ -85,4 +94,5 @@ RSpec.configure do |config|
 
   config.include HamlViewHelper, :haml_view => true
   config.include Rack::Test::Methods, :sinatra => true
+  config.include JsonSpec::Helpers, :json => true
 end

data/tmp/notification_rules.rb

@@ -0,0 +1,73 @@
+#!/usr/bin/env ruby
+
+
+
+#tuple = [
+#  [ alice, sms ],
+#  [ alice, email ],
+#  [ boby, email ],
+#  [ carol, sms ],
+#]
+
+event
+
+# delete media based on entity name(s), tags, severity, time of day
+# first get all rules matching entity and time
+tuple.map! do |contact, media|
+  rules    = contact.notification_rules
+  # filter based on tags, severity, time of day
+  matchers = contact.notification_rules do |rule|
+    rule.match_entity?(event) && rule.match_time?(event)
+  end
+  matchers.empty? ? nil : [ contact, media, matchers ]
+end
+
+# matchers are rules of the contact that have matched the current event
+# for time and entity
+
+tuple.compact!
+
+# tuple = [
+#   [ alice, sms, matchers ],
+#   [ boby, email, matchers ],
+# ]
+
+# delete the matcher for all entities if there are more specific matchers
+tuple = tuple.map do |contact, media, matchers|
+  if matchers.lengh > 1
+    have_specific = matchers.detect do |matcher|
+      matcher.entities or matcher.entity_tags
+    end
+    if have_specific
+      # delete the rule for all entities
+      matchers.map! do |matcher|
+        matcher.entities.nil? and matcher.entity_tags.nil? ? nil : matcher
+      end
+    end
+  end
+  [contact, media, matchers]
+end
+
+# delete media based on blackholes
+tuple = tuple.find_all do |contact, media, matchers|
+  matchers.none? {|matcher| matcher.blackhole? }
+end
+
+# tuple = [
+#   [ alice, sms, matchers ],
+# ]
+
+# delete media based on notification interval
+tuple.find_all do |contact, media, matchers|
+  #interval = matchers.sort_by {|matcher| matcher.interval }.first # => 5
+  interval = contact.interval_for_media(media) # => 5
+  # use an expiring key to block a notification for a given (contact, media) for the interval
+  not_notified_within(interval) # => true
+end
+
+# tuple = [
+#   [ alice, sms, matchers ],
+# ]
+
+tuple.each {|contact, media, matchers| dispatch_message(media, contact) }
+

data/tmp/test_json_post.rb

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+
+require 'HTTParty'
+require 'json'
+
+@payload ={
+    "email" => "phil@gmail.com",
+    "token" => "mytokenstuff",
+    "content" => "here is some content",
+    "notification_type" => "1",
+    "name" => "here is a name",
+    "auto_action" => "true"
+ }
+
+HTTParty.post( 'http://localhost:4091/notification_rules', :body => JSON.dump(@payload), :options => { :headers => { 'ContentType' => 'application/json' } })
+

data/tmp/test_notification_rules_api.rb

@@ -0,0 +1,170 @@
+#!/usr/bin/env ruby
+
+require "httparty"
+require "json"
+
+class Foo
+
+  include HTTParty
+  base_uri "http://localhost:4091"
+
+  @summary = ""
+
+  #test_entity = "foo-app-1.example.com"
+  test_entity = "localhost"
+  test_check = "PING"
+  test_contact = "21"
+  test_email = '{
+    "address": "dmitri@example.com",
+    "interval": 900
+  }'
+  test_timezone = '{
+    "timezone": "Australia/Broken_Hill"
+  }'
+  get_urls = [
+    "/entities",
+    "/checks/#{test_entity}",
+    "/status/#{test_entity}",
+    "/status/#{test_entity}/#{test_check}",
+    "/outages/#{test_entity}",
+    "/outages/#{test_entity}/#{test_check}",
+    "/unscheduled_maintenances/#{test_entity}",
+    "/unscheduled_maintenances/#{test_entity}/#{test_check}",
+    "/scheduled_maintenances/#{test_entity}",
+    "/scheduled_maintenances/#{test_entity}/#{test_check}",
+    "/downtime/#{test_entity}",
+    "/downtime/#{test_entity}/#{test_check}",
+    "/contacts",
+    "/contacts/#{test_contact}",
+    "/contacts/#{test_contact}/notification_rules",
+    "/contacts/#{test_contact}/media",
+    "/contacts/#{test_contact}/media/email",
+    "/contacts/#{test_contact}/timezone",
+  ]
+
+  test_rule = '{
+      "contact_id": "21",
+      "entity_tags": [
+        "database",
+        "physical"
+      ],
+      "entities": [
+        "localhost"
+      ],
+      "time_restrictions": [
+        {
+          "TODO": "TODO"
+        }
+      ],
+      "warning_media": [
+        "email"
+      ],
+      "critical_media": [
+        "sms",
+        "email"
+      ],
+      "warning_blackhole": false,
+      "critical_blackhole": false
+    }'
+  post_urls = {
+    "/scheduled_maintenances/#{test_entity}/#{test_check}" => '{
+      "start_time": 1361791228,
+            "duration": 3600,
+                "@summary": "SHUT IT ALL DOWN!"
+    }',
+    "/acknowledgements/#{test_entity}/#{test_check}" => '{
+      "duration": 3600,
+      "@summary": "AL - working on it"
+    }',
+    "/test_notifications/#{test_entity}/#{test_check}" => '',
+    "/entities" => '{
+      "entities": [
+        {
+          "id": "825",
+          "name": "foo.example.com",
+          "contacts": [
+            "21",
+            "22"
+          ],
+          "tags": [
+            "foo"
+          ]
+        }
+      ]
+    }',
+    "/contacts" => '{
+      "contacts": [
+        {
+          "id": "21",
+          "first_name": "Ada",
+          "last_name": "Lovelace",
+          "email": "ada@example.com",
+          "media": {
+            "sms": "+61412345678",
+            "email": "ada@example.com"
+          },
+          "tags": [
+            "legend",
+            "first computer programmer"
+          ]
+        }
+      ]
+    }',
+    "/notification_rules" => test_rule,
+  }
+
+  def self.do_get(url)
+    response = get(url)
+    response_body = response.body ? response.body[0..300] : nil
+    puts "GET #{url}", "#{response.code} - #{response.message}", response.headers.inspect, response_body
+    puts "---------------------------------------------------"
+    @summary += "#{response.code} GET #{url}\n"
+  end
+
+  def self.do_post(url, body)
+    response = post(url, :body => body, :headers => {'Content-Type' => 'application/json'})
+    response_body = response.body ? response.body[0..300] : nil
+    puts "POST #{url}", body, "#{response.code} - #{response.message}", response.headers.inspect, response_body
+    puts "---------------------------------------------------"
+    @summary += "#{response.code} POST #{url}\n"
+  end
+
+  def self.do_put(url, body)
+    response = put(url, :body => body, :headers => {'Content-Type' => 'application/json'})
+    response_body = response.body ? response.body[0..300] : nil
+    puts "PUT #{url}", body, "#{response.code} - #{response.message}", response.headers.inspect, response_body
+    puts "---------------------------------------------------"
+    @summary += "#{response.code} PUT #{url}\n"
+  end
+
+  def self.do_delete(url)
+    response = delete(url)
+    response_body = response.body ? response.body[0..300] : nil
+    puts "DELETE #{url}", "#{response.code} - #{response.message}", response.headers.inspect, response_body
+    puts "---------------------------------------------------"
+    @summary += "#{response.code} DELETE #{url}\n"
+  end
+
+  get_urls.each do |url|
+    do_get(url)
+  end
+
+  post_urls.each_pair do |url, data|
+    do_post(url, data)
+  end
+
+  rule = JSON.parse(get('/contacts/21/notification_rules').body).last
+  rule_id = rule['id']
+  raise RuntimeError unless rule_id
+  puts "****** NOTIFICATION RULE ID TO PICK ON (PUT, DELETE) IS: #{rule_id} ******"
+
+  do_get("/notification_rules/#{rule_id}")
+  do_put("/notification_rules/#{rule_id}", test_rule)
+  do_delete("/contacts/21/media/email")
+  do_put("/contacts/21/media/email", test_email)
+  do_delete("/contacts/21/timezone")
+  do_put("/contacts/21/timezone", test_timezone)
+
+  puts "\nSummary:\n"
+  puts @summary
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flapjack
 version: !ruby/object:Gem::Version
-  version: 0.6.61
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-11 00:00:00.000000000 Z
+date: 2013-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dante
@@ -301,6 +301,54 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ice_cube
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: tzinfo
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -359,6 +407,7 @@ files:
 - dist/puppet/sqlite3/manifests/dev.pp
 - etc/flapjack_config.yaml.example
 - features/events.feature
+- features/notification_rules.feature
 - features/notifications.feature
 - features/packaging-lintian.feature
 - features/steps/events_steps.rb
@@ -381,7 +430,9 @@ files:
 - lib/flapjack/data/global.rb
 - lib/flapjack/data/message.rb
 - lib/flapjack/data/notification.rb
+- lib/flapjack/data/notification_rule.rb
 - lib/flapjack/data/tag.rb
+- lib/flapjack/data/tag_set.rb
 - lib/flapjack/executive.rb
 - lib/flapjack/filters/acknowledgement.rb
 - lib/flapjack/filters/base.rb
@@ -422,6 +473,7 @@ files:
 - spec/lib/flapjack/data/event_spec.rb
 - spec/lib/flapjack/data/global_spec.rb
 - spec/lib/flapjack/data/message_spec.rb
+- spec/lib/flapjack/data/notification_rule_spec.rb
 - spec/lib/flapjack/data/notification_spec.rb
 - spec/lib/flapjack/data/tag_spec.rb
 - spec/lib/flapjack/executive_spec.rb
@@ -464,9 +516,12 @@ files:
 - tmp/create_events_ok_failure_ack.rb
 - tmp/dummy_entities.json
 - tmp/generate_nagios_test_hosts.rb
+- tmp/notification_rules.rb
 - tmp/parse_config_yaml.rb
 - tmp/redis_delete_all_keys.rb
 - tmp/test_entities.json
+- tmp/test_json_post.rb
+- tmp/test_notification_rules_api.rb
 homepage: http://flapjack-project.com/
 licenses: []
 post_install_message: 
@@ -493,6 +548,7 @@ specification_version: 3
 summary: Intelligent, scalable, distributed monitoring notification system.
 test_files:
 - features/events.feature
+- features/notification_rules.feature
 - features/notifications.feature
 - features/packaging-lintian.feature
 - features/steps/events_steps.rb
@@ -509,6 +565,7 @@ test_files:
 - spec/lib/flapjack/data/event_spec.rb
 - spec/lib/flapjack/data/global_spec.rb
 - spec/lib/flapjack/data/message_spec.rb
+- spec/lib/flapjack/data/notification_rule_spec.rb
 - spec/lib/flapjack/data/notification_spec.rb
 - spec/lib/flapjack/data/tag_spec.rb
 - spec/lib/flapjack/executive_spec.rb