flapjack 0.6.43 → 0.6.44

data/bin/flapjack

@@ -33,7 +33,9 @@ end.parse!(ARGV)
 
 FLAPJACK_ENV = ENV['FLAPJACK_ENV'] || 'development'
 
-config_env, redis_options = Flapjack::Configuration.new.load(options.config)
+config = Flapjack::Configuration.new
+config.load(options.config)
+config_env = config.all
 
 if config_env.nil? || config_env.empty?
   puts "No config data for environment '#{FLAPJACK_ENV}' found in '#{options.config}'"
@@ -50,7 +52,7 @@ end
 
 require 'flapjack/coordinator'
 
-coordinator = Flapjack::Coordinator.new(config_env, redis_options)
+coordinator = Flapjack::Coordinator.new(config)
 coordinator.log_file = (config_env['log_file'] || 'log/flapjack.log')
 coordinator.pid_file = pid_file
 

data/bin/flapjack-nagios-receiver

@@ -31,7 +31,10 @@ end.parse!(ARGV)
 
 FLAPJACK_ENV = ENV['FLAPJACK_ENV'] || 'development'
 
-@config_env, @redis_options = Flapjack::Configuration.new.load(options.config)
+config = Flapjack::Configuration.new
+config.load(options.config)
+@config_env = config.all
+@redis_options = @config.for_redis
 
 if @config_env.nil? || @config_env.empty?
   puts "No config data for environment '#{FLAPJACK_ENV}' found in '#{options.config}'"

data/bin/flapjack-populator

@@ -43,7 +43,10 @@ end.parse!(ARGV)
 
 FLAPJACK_ENV = ENV['FLAPJACK_ENV'] || 'development'
 
-config_env, redis_options = Flapjack::Configuration.new.load(options.config)
+config = Flapjack::Configuration.new
+config.load(options.config)
+config_env = config.all
+redis_options = config.for_redis
 
 if config_env.nil? || config_env.empty?
   puts "No config data for environment '#{FLAPJACK_ENV}' found in '#{options.config}'"

data/etc/flapjack_config.yaml.example

@@ -9,16 +9,17 @@ quickstart:
     enabled: yes
     email_queue: email_notifications
     notification_log_file: log/flapjack-notification.log
-  email_notifier:
-    enabled: yes
-    queue: email_notifications
-    smtp_config:
-      address: "localhost"
-      domain: 'localhost.localdomain'
-      port: 25
-  web:
-    enabled: yes
-    port: 5080
+  gateways:
+    email:
+      enabled: yes
+      queue: email_notifications
+      smtp_config:
+        address: "localhost"
+        domain: 'localhost.localdomain'
+        port: 25
+    web:
+      enabled: yes
+      port: 5080
 
 development:
   pid_file: tmp/pids/flapjack.pid
@@ -34,97 +35,100 @@ development:
     sms_queue: sms_notifications
     jabber_queue: jabber_notifications
     notification_log_file: log/flapjack-notification.log
-  email_notifier:
-    enabled: yes
-    queue: email_notifications
-    smtp_config:
-      port: 2525
-      # address: "localhost"
-      # port: 25
-      # domain: 'localhost.localdomain'
-      # user_name: nil
-      # password: nil
-      # authentication: nil
-      # enable_starttls_auto: true
-  sms_notifier:
-    enabled: yes
-    queue: sms_notifications
-    username: "ermahgerd"
-    password: "xxxx"
-  jabber_gateway:
-    enabled: yes
-    queue: jabber_notifications
-    server: "jabber.domain.tld"
-    port: 5222
-    jabberid: "flapjack@jabber.domain.tld"
-    password: "good-password"
-    alias: "flapjack"
-    rooms:
-      - "gimp@conference.jabber.domain.tld"
-      - "log@conference.jabber.domain.tld"
-  oobetet:
-    enabled: yes
-    server: "jabber.domain.tld"
-    port: 5222
-    jabberid: "flapjacktest@jabber.domain.tld"
-    password: "nuther-good-password"
-    alias: "flapjacktest"
-    watched_check: "PING"
-    watched_entity: "foo.bar.net"
-    max_latency: 300
-    pagerduty_contact: "11111111111111111111111111111111"
-    rooms:
-      - "flapjacktest@conference.jabber.domain.tld"
-      - "gimp@conference.jabber.domain.tld"
-      - "log@conference.jabber.domain.tld"
-  pagerduty_gateway:
-    enabled: yes
-    queue: pagerduty_notifications
-  web:
-    enabled: yes
-    port: 5080
-    access_log: "log/web_access.log"
-  api:
-    enabled: yes
-    port: 5081
-    access_log: "log/api_access.log"
+  gateways:
+    email:
+      enabled: yes
+      queue: email_notifications
+      smtp_config:
+        port: 2525
+        # address: "localhost"
+        # port: 25
+        # domain: 'localhost.localdomain'
+        # user_name: nil
+        # password: nil
+        # authentication: nil
+        # enable_starttls_auto: true
+    sms:
+      enabled: yes
+      queue: sms_notifications
+      username: "ermahgerd"
+      password: "xxxx"
+    jabber:
+      enabled: yes
+      queue: jabber_notifications
+      server: "jabber.domain.tld"
+      port: 5222
+      jabberid: "flapjack@jabber.domain.tld"
+      password: "good-password"
+      alias: "flapjack"
+      rooms:
+        - "gimp@conference.jabber.domain.tld"
+        - "log@conference.jabber.domain.tld"
+    oobetet:
+      enabled: yes
+      server: "jabber.domain.tld"
+      port: 5222
+      jabberid: "flapjacktest@jabber.domain.tld"
+      password: "nuther-good-password"
+      alias: "flapjacktest"
+      watched_check: "PING"
+      watched_entity: "foo.bar.net"
+      max_latency: 300
+      pagerduty_contact: "11111111111111111111111111111111"
+      rooms:
+        - "flapjacktest@conference.jabber.domain.tld"
+        - "gimp@conference.jabber.domain.tld"
+        - "log@conference.jabber.domain.tld"
+    pagerduty:
+      enabled: yes
+      queue: pagerduty_notifications
+    web:
+      enabled: yes
+      port: 5080
+      access_log: "log/web_access.log"
+    api:
+      enabled: yes
+      port: 5081
+      access_log: "log/api_access.log"
 
 test:
   redis:
     database: 14
-  email_notifier:
-    instances: 1
-  sms_notifier:
-    instances: 1
-    username: "ermahgerd"
-    password: "xxxx"
-  web:
-    instances: 1
-
+  gateways:
+    email:
+      instances: 1
+    sms:
+      instances: 1
+      username: "ermahgerd"
+      password: "xxxx"
+    web:
+      instances: 1
 
 staging:
   redis:
     database: 15
-  email_notifier:
-    instances: 1
-  sms_notifier:
-    instances: 1
-    username: "ermahgerd"
-    password: "xxxx"
-  web:
-    instances: 1
+  gateways:
+    email:
+      instances: 1
+    sms:
+      instances: 1
+      username: "ermahgerd"
+      password: "xxxx"
+    web:
+      instances: 1
 
 production:
   redis:
     database: 12
-  email_notifier:
-    instances: 1
-  sms_notifier:
-    instances: 1
-    username: "ermahgerd"
-    password: "xxxx"
-  web:
-    instances: 1
+  gateways:
+    email:
+      instances: 1
+    sms:
+      instances: 1
+      username: "ermahgerd"
+      password: "xxxx"
+    web:
+      instances: 1
 
 profile:
   redis:
@@ -134,20 +138,21 @@ profile:
   executive:
     enabled: yes
     notification_log_file: log/flapjack-notification.log
-  email_notifier:
-    enabled: no
-    queue: email_notifications
-  jabber_gateway:
-    enabled: yes
-    queue: jabber_notifications
-    server: "jabber.domain.tld"
-    port: 5222
-    jabberid: "flapjack@jabber.domain.tld"
-    password: "good-password"
-    alias: "flapjack"
-    rooms:
-      - "gimp@conference.jabber.domain.tld"
-      - "log@conference.jabber.domain.tld"
-  web:
-    enabled: no
-    port: 5080
+  gateways:
+    email:
+      enabled: no
+      queue: email_notifications
+    jabber:
+      enabled: yes
+      queue: jabber_notifications
+      server: "jabber.domain.tld"
+      port: 5222
+      jabberid: "flapjack@jabber.domain.tld"
+      password: "good-password"
+      alias: "flapjack"
+      rooms:
+        - "gimp@conference.jabber.domain.tld"
+        - "log@conference.jabber.domain.tld"
+    web:
+      enabled: no
+      port: 5080

data/features/steps/notifications_steps.rb

@@ -128,10 +128,10 @@ When /^the SMS notification handler runs successfully$/ do
   # returns success by default - currently matches all addresses, maybe load from config?
   stub_request(:get, /.*/)
   # TODO load config from cfg file instead?
-  Flapjack::Notification::Sms.instance_variable_set('@config', {'username' => 'abcd', 'password' => 'efgh'})
+  Flapjack::Gateways::Sms.instance_variable_set('@config', {'username' => 'abcd', 'password' => 'efgh'})
 
   lambda {
-    Flapjack::Notification::Sms.dispatch(@sms_notification, :logger => @logger, :redis => @redis)
+    Flapjack::Gateways::Sms.dispatch(@sms_notification, :logger => @logger, :redis => @redis)
   }.should_not raise_error
   @sms_sent = true
 end
@@ -140,16 +140,16 @@ When /^the SMS notification handler fails to send an SMS$/ do
   stub_request(:any, /.*/).to_return(:status => [500, "Internal Server Error"])
 
   lambda {
-    Flapjack::Notification::Sms.dispatch(@sms_notification, :logger => @logger, :redis => @redis)
+    Flapjack::Gateways::Sms.dispatch(@sms_notification, :logger => @logger, :redis => @redis)
   }.should raise_error
   @sms_sent = false
 end
 
 When /^the email notification handler runs successfully$/ do
   Resque.redis = @redis
-  Flapjack::Notification::Email.bootstrap(:config => {})
+  Flapjack::Gateways::Email.bootstrap(:config => {})
   lambda {
-    Flapjack::Notification::Email.perform(@email_notification)
+    Flapjack::Gateways::Email.perform(@email_notification)
   }.should_not raise_error
 end
 
@@ -160,7 +160,7 @@ When /^the email notification handler fails to send an email$/ do
   pending
   lambda {
     @email_notification['address'] = nil
-    Flapjack::Notification::Email.perform(@email_notification)
+    Flapjack::Gateways::Email.perform(@email_notification)
   }.should_not raise_error
 end
 

data/lib/flapjack/configuration.rb

@@ -3,6 +3,16 @@
 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
@@ -19,6 +29,70 @@ module Flapjack
       @logger
     end
 
+    # TODO reduce/remove the use of this, just access parts
+    def all
+      @config_env
+    end
+
+    def for_redis
+      return unless @config_env
+
+      redis_defaults = {'host' => 'localhost',
+                        'port' => 6379,
+                        'path' => nil,
+                        'db'   => 0}
+
+      @config_env['redis'] = {} unless @config_env.has_key?('redis')
+
+      redis = @config_env['redis']
+      redis_defaults.each_pair do |k,v|
+        next if redis.has_key?(k) && redis[k] &&
+          !(redis[k].is_a?(String) && redis[k].empty?)
+        redis[k] = v
+      end
+
+      redis_path = (redis['path'] || nil)
+      base_opts = {:db => (redis['db'] || 0)}
+      redis_config = base_opts.merge(
+        (redis_path ? { :path => redis_path } :
+                      { :host => (redis['host'] || '127.0.0.1'),
+                        :port => (redis['port'] || 6379)})
+      )
+
+      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}'"
@@ -37,34 +111,12 @@ module Flapjack
         return
       end
 
-      config_env = config[FLAPJACK_ENV]
+      @config_env = config[FLAPJACK_ENV]
 
-      if config_env.nil?
+      if @config_env.nil?
         logger.error "No config data for environment '#{FLAPJACK_ENV}' found in '#{filename}'"
         return
       end
-
-      redis_defaults = {'host' => 'localhost',
-                        'port' => 6379,
-                        'path' => nil,
-                        'db'   => 0}
-
-      config_env['redis'] = {} unless config_env.has_key?('redis')
-      redis_defaults.each_pair do |k,v|
-        next if config_env['redis'].has_key?(k) && (config_env['redis'][k] &&
-          !(config_env['redis'][k].is_a?(String) && config_env['redis'][k].empty?))
-        config_env['redis'][k] = v
-      end
-
-      redis_path = (config_env['redis']['path'] || nil)
-      base_opts = {:db => (config_env['redis']['db'] || 0)}
-      redis_config = base_opts.merge(
-        (redis_path ? { :path => redis_path } :
-                      { :host => (config_env['redis']['host'] || '127.0.0.1'),
-                        :port => (config_env['redis']['port'] || 6379)})
-      )
-
-      return config_env, redis_config
     end
 
   end