flapjack 0.6.45 → 0.6.46

data/bin/flapjack-nagios-receiver

@@ -35,6 +35,7 @@ config = Flapjack::Configuration.new
 config.load(options.config)
 @config_env = config.all
 @redis_options = config.for_redis
+puts @redis_options.inspect
 
 if @config_env.nil? || @config_env.empty?
   puts "No config data for environment '#{FLAPJACK_ENV}' found in '#{options.config}'"
@@ -94,7 +95,7 @@ def process_input(redis)
 end
 
 def main
-  redis = Redis.new(@redis_options)
+  redis = Redis.new(@redis_options.merge(:driver => 'ruby'))
 
   while true
     process_input(redis)

data/lib/flapjack/configuration.rb

@@ -3,16 +3,6 @@
 require 'yaml'
 require 'logger'
 
-require 'flapjack/executive'
-
-require 'flapjack/gateways/api'
-require 'flapjack/gateways/jabber'
-require 'flapjack/gateways/oobetet'
-require 'flapjack/gateways/pagerduty'
-require 'flapjack/gateways/email'
-require 'flapjack/gateways/sms'
-require 'flapjack/gateways/web'
-
 module Flapjack
 
   class Configuration
@@ -62,37 +52,6 @@ module Flapjack
       redis_config
     end
 
-    PIKELET_TYPES = {'executive'  => Flapjack::Executive}
-
-    GATEWAY_TYPES = {'web'        => Flapjack::Gateways::Web,
-                     'api'        => Flapjack::Gateways::API,
-                     'jabber'     => Flapjack::Gateways::Jabber,
-                     'pagerduty'  => Flapjack::Gateways::Pagerduty,
-                     'oobetet'    => Flapjack::Gateways::Oobetet,
-                     'email'      => Flapjack::Gateways::Email,
-                     'sms'        => Flapjack::Gateways::Sms}
-
-    def pikelets
-      return {} unless @config_env
-      @config_env.inject({}) {|memo, (k, v)|
-        if klass = PIKELET_TYPES[k]
-          memo[klass] = v
-        end
-        memo
-      }
-    end
-
-    def gateways
-      return {} unless @config_env && @config_env['gateways'] &&
-        !@config_env['gateways'].nil?
-      @config_env['gateways'].inject({}) {|memo, (k, v)|
-        if klass = GATEWAY_TYPES[k]
-          memo[klass] = v
-        end
-        memo
-      }
-    end
-
     def load(filename)
       unless File.file?(filename)
         logger.error "Could not find file '#{filename}'"

data/lib/flapjack/coordinator.rb

@@ -20,6 +20,16 @@ require 'flapjack/redis_pool'
 require 'flapjack/pikelet'
 require 'flapjack/gateways/base'
 
+require 'flapjack/executive'
+
+require 'flapjack/gateways/api'
+require 'flapjack/gateways/jabber'
+require 'flapjack/gateways/oobetet'
+require 'flapjack/gateways/pagerduty'
+require 'flapjack/gateways/email'
+require 'flapjack/gateways/sms'
+require 'flapjack/gateways/web'
+
 module Flapjack
 
   class Coordinator
@@ -62,12 +72,14 @@ module Flapjack
 
       EM.synchrony do
 
-        @config.pikelets.each_pair do |pikelet_class, pikelet_cfg|
+        config_env = @config.all
+
+        pikelets(config_env).each_pair do |pikelet_class, pikelet_cfg|
           next unless pikelet_cfg['enabled']
           build_pikelet(pikelet_class, pikelet_cfg)
         end
 
-        @config.gateways.each_pair do |gateway_class, gateway_cfg|
+        gateways(config_env).each_pair do |gateway_class, gateway_cfg|
           # TODO split out gateway logic to build_gateway
           next unless gateway_cfg['enabled']
           build_pikelet(gateway_class, gateway_cfg)
@@ -250,6 +262,38 @@ module Flapjack
       (class << klass; self; end).included_modules
     end
 
+    PIKELET_TYPES = {'executive'  => Flapjack::Executive}
+
+    GATEWAY_TYPES = {'web'        => Flapjack::Gateways::Web,
+                     'api'        => Flapjack::Gateways::API,
+                     'jabber'     => Flapjack::Gateways::Jabber,
+                     'pagerduty'  => Flapjack::Gateways::Pagerduty,
+                     'oobetet'    => Flapjack::Gateways::Oobetet,
+                     'email'      => Flapjack::Gateways::Email,
+                     'sms'        => Flapjack::Gateways::Sms}
+
+
+    def pikelets(config_env)
+      return {} unless config_env
+      config_env.inject({}) {|memo, (k, v)|
+        if klass = PIKELET_TYPES[k]
+          memo[klass] = v
+        end
+        memo
+      }
+    end
+
+    def gateways(config_env)
+      return {} unless config_env && config_env['gateways'] &&
+        !config_env['gateways'].nil?
+      config_env['gateways'].inject({}) {|memo, (k, v)|
+        if klass = GATEWAY_TYPES[k]
+          memo[klass] = v
+        end
+        memo
+      }
+    end
+
   end
 
 end

data/lib/flapjack/gateways/jabber.rb

@@ -121,7 +121,7 @@ module Flapjack
         action       = nil
         entity_check = nil
         case
-        when command =~ /^ACKID\s+(\d+)(?:\s*(.*?)(?:\s*duration.*?(\d+.*\w+.*))?)$/i;
+        when command =~ /^ACKID\s+(\d+)(?:\s*(.*?)(?:\s*duration:.*?(\w+.*))?)$/i;
           ackid        = $1
           comment      = $2
           duration_str = $3

data/lib/flapjack/version.rb

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

data/spec/lib/flapjack/coordinator_spec.rb

@@ -27,8 +27,7 @@ describe Flapjack::Coordinator do
   it "runs undaemonized" do
     EM.should_receive(:synchrony).and_yield
     config.should_receive(:for_redis).and_return({})
-    config.should_receive(:pikelets).and_return(Flapjack::Executive => {'enabled' => 'yes'})
-    config.should_receive(:gateways).and_return({})
+    config.should_receive(:all).and_return('executive' => {'enabled' => 'yes'})
 
     fc = Flapjack::Coordinator.new(config)
     fc.should_receive(:build_pikelet)
@@ -39,8 +38,7 @@ describe Flapjack::Coordinator do
     EM.should_receive(:synchrony).and_yield
 
     config.should_receive(:for_redis).and_return({})
-    config.should_receive(:pikelets).and_return(Flapjack::Executive => {'enabled' => 'yes'})
-    config.should_receive(:gateways).and_return({})
+    config.should_receive(:all).and_return('executive' => {'enabled' => 'yes'})
 
     fc = Flapjack::Coordinator.new(config)
     fc.should_receive(:build_pikelet)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flapjack
 version: !ruby/object:Gem::Version
-  version: 0.6.45
+  version: 0.6.46
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-09 00:00:00.000000000 Z
+date: 2012-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemons