flapjack 0.6.39 → 0.6.40

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flapjack
 version: !ruby/object:Gem::Version
-  version: 0.6.39
+  version: 0.6.40
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-19 00:00:00.000000000 Z
+date: 2012-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemons
@@ -173,6 +173,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: async-rack
+  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: rack-fiber_pool
   requirement: !ruby/object:Gem::Requirement
@@ -380,6 +396,8 @@ files:
 - lib/flapjack/data/entity_check.rb
 - lib/flapjack/data/event.rb
 - lib/flapjack/data/global.rb
+- lib/flapjack/data/message.rb
+- lib/flapjack/data/notification.rb
 - lib/flapjack/executive.rb
 - lib/flapjack/filters/acknowledgement.rb
 - lib/flapjack/filters/base.rb
@@ -390,7 +408,6 @@ files:
 - lib/flapjack/filters/unscheduled_maintenance.rb
 - lib/flapjack/inifile.rb
 - lib/flapjack/jabber.rb
-- lib/flapjack/notification/common.rb
 - lib/flapjack/notification/email.rb
 - lib/flapjack/notification/email/alert.html.haml
 - lib/flapjack/notification/email/alert.text.erb
@@ -404,22 +421,9 @@ files:
 - lib/flapjack/oobetet.rb
 - lib/flapjack/pagerduty.rb
 - lib/flapjack/patches.rb
-- lib/flapjack/persistence/couch.rb
-- lib/flapjack/persistence/couch/connection.rb
-- lib/flapjack/persistence/couch/couch.rb
-- lib/flapjack/persistence/data_mapper.rb
-- lib/flapjack/persistence/data_mapper/data_mapper.rb
-- lib/flapjack/persistence/data_mapper/models/check.rb
-- lib/flapjack/persistence/data_mapper/models/check_template.rb
-- lib/flapjack/persistence/data_mapper/models/event.rb
-- lib/flapjack/persistence/data_mapper/models/node.rb
-- lib/flapjack/persistence/data_mapper/models/related_check.rb
-- lib/flapjack/persistence/sqlite3.rb
-- lib/flapjack/persistence/sqlite3/sqlite3.rb
 - lib/flapjack/pikelet.rb
+- lib/flapjack/rack_logger.rb
 - lib/flapjack/redis_pool.rb
-- lib/flapjack/transports/beanstalkd.rb
-- lib/flapjack/transports/result.rb
 - lib/flapjack/utility.rb
 - lib/flapjack/version.rb
 - lib/flapjack/web.rb
@@ -430,8 +434,6 @@ files:
 - lib/flapjack/web/views/contacts.haml
 - lib/flapjack/web/views/index.haml
 - lib/flapjack/web/views/self_stats.haml
-- lib/flapjack/worker/application.rb
-- lib/flapjack/worker/cli.rb
 - spec.old/check_sandbox/echo
 - spec.old/check_sandbox/sandboxed_check
 - spec.old/configs/flapjack-notifier-couchdb.ini
@@ -467,6 +469,9 @@ files:
 - spec/lib/flapjack/data/entity_check_spec.rb
 - spec/lib/flapjack/data/entity_spec.rb
 - 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_spec.rb
 - spec/lib/flapjack/executive_spec.rb
 - spec/lib/flapjack/filters/acknowledgement_spec.rb
 - spec/lib/flapjack/filters/delays_spec.rb
@@ -481,11 +486,13 @@ files:
 - spec/lib/flapjack/pagerduty_spec.rb
 - spec/lib/flapjack/pikelet_spec.rb
 - spec/lib/flapjack/redis_pool_spec.rb
+- spec/lib/flapjack/utility_spec.rb
 - spec/lib/flapjack/web_spec.rb
 - spec/spec_helper.rb
 - spec/support/profile_all_formatter.rb
 - spec/support/uncolored_doc_formatter.rb
 - tasks/events.rake
+- tasks/profile.rake
 - tmp/acknowledge.rb
 - tmp/create_config_yaml.rb
 - tmp/create_events_failure.rb
@@ -543,6 +550,9 @@ test_files:
 - spec/lib/flapjack/data/entity_check_spec.rb
 - spec/lib/flapjack/data/entity_spec.rb
 - 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_spec.rb
 - spec/lib/flapjack/executive_spec.rb
 - spec/lib/flapjack/filters/acknowledgement_spec.rb
 - spec/lib/flapjack/filters/delays_spec.rb
@@ -557,6 +567,7 @@ test_files:
 - spec/lib/flapjack/pagerduty_spec.rb
 - spec/lib/flapjack/pikelet_spec.rb
 - spec/lib/flapjack/redis_pool_spec.rb
+- spec/lib/flapjack/utility_spec.rb
 - spec/lib/flapjack/web_spec.rb
 - spec/spec_helper.rb
 - spec/support/profile_all_formatter.rb

data/lib/flapjack/notification/common.rb

@@ -1,23 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'flapjack/pikelet'
-
-module Flapjack
-  module Notification
-
-    module Common
-
-      include Flapjack::Pikelet
-
-      # TODO to make this testable, work out a supported way to make the passed redis connection
-      # use the test db
-      def perform(notification)
-        bootstrap
-        @logger.debug "Woo, got a notification to send out: #{notification.inspect}"
-        dispatch(notification, :logger => @logger, :redis => ::Resque.redis)
-      end
-
-    end
-  end
-end
-

data/lib/flapjack/persistence/couch.rb

@@ -1,5 +0,0 @@
-#!/usr/bin/env ruby
-
-require File.join(File.dirname(__FILE__), 'couch', 'couch')
-require File.join(File.dirname(__FILE__), 'couch', 'connection')
-

data/lib/flapjack/persistence/couch/connection.rb

@@ -1,66 +0,0 @@
-#!/usr/bin/env ruby
-
-module Flapjack
-  module Persistence
-    class Couch
-      class Connection
-        class << self
-          attr_accessor :host, :port
-          def setup(options={})
-            @host = options[:host]
-            @port = options[:port]
-            @database = options[:database]
-          end
-  
-          def get(id)
-            uri = "/#{@database}/#{id}"
-            req = ::Net::HTTP::Get.new(uri)
-            request(req)
-          end
-  
-          def post(options={})
-            document = options[:document]
-            uri = "/#{@database}/"
-  
-            req = ::Net::HTTP::Post.new(uri)
-            req["content-type"] = "application/json"
-            req.body = document.to_json
-  
-            request(req) 
-          end
-  
-          def put(options={})
-            document = options[:document]
-            uri = "/#{@database}/#{(options[:document]["id"] || options[:document]["_id"])}"
-  
-            req = ::Net::HTTP::Put.new(uri)
-            req["content-type"] = "application/json"
-            req.body = document.to_json
-  
-            request(req) 
-          end
-
-          def delete(options={})
-            document = options[:document]
-
-            uri = "/#{@database}/#{(options[:document]["id"] || options[:document]["_id"])}"
-  
-            req = ::Net::HTTP::Put.new(uri)
-            req["content-type"] = "application/json"
-            req.body = document.to_json
-
-            request(req)
-          end
-  
-          def request(request)
-            response = Net::HTTP.start(@host, @port) {|http| http.request(request)}
-           
-            @parser = Yajl::Parser.new
-            hash = @parser.parse(response.body)
-          end
-        end
-      end
-    end # class Couch
-  end # module Persistence
-end # module Flapjack
-

data/lib/flapjack/persistence/couch/couch.rb

@@ -1,63 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'net/http'
-require 'yajl/json_gem'
-
-module Flapjack
-  module Persistence
-    class Couch
-
-      attr_accessor :config
-
-      def initialize(options={})
-        @options = options
-        @config = OpenStruct.new(options)
-        @log = @config.log
-        
-        Flapjack::Persistence::Couch::Connection.setup(@options)
-      end
-
-      def any_parents_failed?(id)
-        id == "1" ? false : true
-      end
-
-      def save_check(attrs)
-        true
-      end
-
-      def get_check(id)
-        id == "4" ? nil : true
-      end
-
-      def delete_check(id)
-        true
-      end
-
-      def all_checks
-        [true, true, true]
-      end
-
-      def save_check_relationship(attrs)
-        true
-      end
-
-      def create_event(result)
-        true
-      end
-
-      def all_events_for(id)
-        [true, true, true]
-      end
-
-      def all_events
-        [true, true, true]
-      end
-
-      def all_check_relationships
-        [true, true, true]
-      end
-
-    end # class Couch
-  end # module Persistence
-end # module Flapjack
-

data/lib/flapjack/persistence/data_mapper.rb

@@ -1,3 +0,0 @@
-#!/usr/bin/env ruby 
-
-require File.join(File.dirname(__FILE__), 'data_mapper', 'data_mapper')

data/lib/flapjack/persistence/data_mapper/data_mapper.rb

@@ -1,67 +0,0 @@
-#!/usr/bin/env ruby 
-
-require 'dm-core'
-require 'dm-validations'
-require 'dm-types'
-require 'dm-timestamps'
-
-Dir.glob(File.join(File.dirname(__FILE__), 'models', '*.rb')).each do |model|
-  require model
-end
-
-module Flapjack
-  module Persistence
-    class DataMapper
-      def initialize(options={})
-        @options = options
-        @config = OpenStruct.new(options)
-        @log = @config.log
-        connect
-      end
-
-      def any_parents_failed?(result)
-        check = Check.get(result.check_id)
-        if check
-          check.worst_parent_status != 0
-        else
-          @log.warning("Check with id #{result.check_id} doesn't exist!")
-          false # this will notify
-        end
-      end
-
-      def save(result)
-        check = Check.get(result.check_id)
-        if check
-          check.status = result.status
-          check.save
-        else
-          @log.warning("Check with id #{result.check_id} doesn't exist!")
-          true
-        end
-      end
-
-      def create_event(result)
-        event = Event.new(:check_id => result.check_id)
-        event.save
-      end
-
-      private 
-      def connect
-        raise ArgumentError, "Database URI wasn't specified" unless @config.uri
-        ::DataMapper.setup(:default, @config.uri)
-        validate_structure
-      end
-
-      def validate_structure
-        begin
-          ::DataMapper.repository(:default).adapter.execute("SELECT 'id' FROM 'checks';")
-        rescue Sqlite3Error => e
-          @log.warning("The specified database doesn't appear to have any structure!")
-          @log.warning("Exiting.")
-          raise
-        end
-      end
-    end
-  end
-end
-

data/lib/flapjack/persistence/data_mapper/models/check.rb

@@ -1,90 +0,0 @@
-#!/usr/bin/env ruby
-
-class Check
-  include DataMapper::Resource
-
-  timestamps :at
-
-  has n, :related_checks, :child_key => [:child_id, :parent_id]
-  has n, :events
-
-  #has n, :parent_checks, :through => :related_checks,
-  #       :child_key => :child_id,  :class_name => "Check"
-  #has n, :child_checks,  :through => :related_checks,
-  #       :child_key => :parent_id, :class_name => "Check"
-
-  belongs_to :node
-  belongs_to :check_template
-
-  property :id, Serial, :key => true
-  property :command, Text, :nullable => false
-  property :params, Yaml
-  property :name, String, :nullable => false
-  property :enabled, Boolean, :default => false
-  property :status, Integer, :default => 0
-
-  # dm-timestamps
-  property :created_at, DateTime
-  property :updated_at, DateTime
-  property :deleted_at, ParanoidDateTime
-
-  # copy command onto check
-  before :valid? do
-    if self.check_template && self.command.blank?
-      self.command = self.check_template.command
-      self.name = self.check_template.name
-      self.params = (self.check_template.params || {})
-    end
-  end
-
-  def parameters_and_values
-    names = parameter_names_from_command
-    hash = {}
-    names.each { |name| hash[name] = params ? params[name] : "" }
-    hash["$FQDN"] = self.node_fqdn # pkey of node check belongs to
-    hash
-  end
-
-  def parameter_names_from_command
-    self.command.split.grep(/\$\w/)
-  end
-
-  def executed_command
-    c = self.command
-    parameters_and_values.each_pair do |param, value|
-      value = value.to_s
-      c.gsub!(param, value)
-    end
-    return c
-  end
-
-  # FIXME: this should work through related checks association, but doesn't
-  def parent_checks
-    RelatedCheck.all(:child_id => self.id).map {|rc| rc.parent_check}
-  end
-
-  def child_checks
-    RelatedCheck.all(:parent_id => self.id).map {|rc| rc.child_check}
-  end
-
-  def worst_parent_status
-    if parent_checks.size > 0
-      self.parent_checks.map { |parent| parent.status }.sort.pop
-    else
-      0
-    end
-  end
-
-
-  def pretty_print_status
-    case self.status
-    when 0
-      "good"
-    when 1
-      "bad"
-    when 2
-      "ugly"
-    end
-  end
-
-end