murakumo 0.3.1 → 0.3.2

data/etc/murakumo.server

@@ -72,8 +72,23 @@ max-ip-num: 8
 #domain: ap-northeast-1.compute.internal
 #enable-cache: true
 
+#notification:
+#  host: my.smtp.server
+#  #port: 25
+#  sender: sender@mail.from
+#  recipients:
+#    - recipient1@mail.to
+#    - recipient2@mail.to
+#  #helo: my.domain
+#  #account: my_name
+#  #password: my_password
+#  #open_timeout: 30
+#  #read_timeout: 60
+
+# Ip address, hostname, ttl
 host: $ip_addr, $hostname, 60
 
+# alias hostname, ttl, master/secondary/backup
 #alias:
 #  - foo,60,master
 #  - bar,60,backup
@@ -84,6 +99,8 @@ host: $ip_addr, $hostname, 60
 #    timeout: 5
 #    healthy: 2
 #    unhealthy: 2
+#    #on_activate: /foo/bar/zoo.sh   # args: address name status
+#    #on_inactivate: /foo/bar/zoo.sh # args: address name status
 #    script: |
 #      tcp_check 80
 #  bar:

data/etc/murakumo.yml.example

@@ -12,10 +12,23 @@ max-ip-num: 8
 #domain: ap-northeast-1.compute.internal
 #enable-cache: true
 
+#notification:
+#  host: my.smtp.server
+#  #port: 25
+#  sender: sender@mail.from
+#  recipients:
+#    - recipient1@mail.to
+#    - recipient2@mail.to
+#  #helo: my.domain
+#  #account: my_name
+#  #password: my_password
+#  #open_timeout: 30
+#  #read_timeout: 60
+
 # Ip address, hostname, ttl
 host: 10.11.12.13, my-host, 60
 
-# alias hostname, ttl, master/backup
+# alias hostname, ttl, master/secondary/backup
 alias: 
   - foo,60,master
   - bar,60,master
@@ -26,6 +39,8 @@ health-check:
     timeout: 5
     healthy: 2
     unhealthy: 2
+    #on_activate: /foo/bar/zoo.sh   # args: address name status
+    #on_inactivate: /foo/bar/zoo.sh # args: address name status
     script: |
       tcp_check 80
   bar:

data/lib/cli/murakumo_options.rb

@@ -183,14 +183,64 @@ def murakumo_parse_args
       hostnames = [options[:host][0].downcase] + options[:aliases].map {|i| i[0].downcase }
 
       if hostnames.length != hostnames.uniq.length
-        raise OptionParser::ParseError, 'same hostname was found'
+        parse_error('same hostname was found')
       end
 
       # health check
       if options.config_file and (health_check = options.config_file['health-check'])
-        unless health_check.kind_of?(Hash) and health_check.all? {|k, v| v.has_key?('script') }
-          raise OptionParser::ParseError, 'configuration of a health check is not right'
+        health_check.kind_of?(Hash) or parse_error('configuration of a health check is not right')
+
+        health_check.each do |name, conf|
+          if (conf['script'] || '').empty?
+            parse_error('configuration of a health check is not right', "#{name}/script")
+          end
+
+          %w(on_activate on_inactivate).each do |key|
+            next unless conf[key]
+            path = conf[key] = conf[key].strip
+
+            if FileTest.directory?(path) or not FileTest.executable?(path)
+              parse_error('configuration of a health check is not right', "#{name}/#{key}")
+            end
+          end
+        end
+      end
+
+      # notification
+      if options.config_file and (ntfc = options.config_file['notification'])
+        ntfc.kind_of?(Hash) or parse_error('configuration of a notification is not right')
+
+        if (ntfc['host'] || '').empty?
+          parse_error('configuration of a notification is not right', 'host')
+        end
+
+        unless ntfc['recipients']
+          parse_error('configuration of a notification is not right', 'recipients')
         end
+
+        %w(port open_timeout read_timeout).each do |key|
+          if ntfc[key] and /\A\d+\Z/ !~ ntfc[key].to_s
+            parse_error('configuration of a notification is not right', key)
+          end
+        end
+
+        ntfc_args = [ntfc['host']]
+        ntfc_args << ntfc['port'].to_i if ntfc['port']
+        ntfc_args << ntfc['account'] if ntfc['account']
+        ntfc_args << ntfc['password'] if ntfc['password']
+
+        options[:notification] = ntfc_h = {:args => ntfc_args}
+
+        ntfc_h[:sender] = ntfc['sender'] || 'murakumo@localhost.localdomain'
+
+        if ntfc['recipients'].kind_of?(Array)
+          ntfc_h[:recipients] = ntfc['recipients']
+        else
+          ntfc_h[:recipients] = ntfc['recipients'].to_s.split(/\s*,\s*/).select {|i| not i.empty? }
+        end
+
+        ntfc_h[:open_timeout] = ntfc['open_timeout'].to_i if ntfc['open_timeout']
+        ntfc_h[:read_timeout] = ntfc['read_timeout'].to_i if ntfc['read_timeout']
       end
     end
 

data/lib/misc/murakumo_const.rb

@@ -1,5 +1,5 @@
 module Murakumo
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 
   # Priority
   MASTER = 1

data/lib/srv/murakumo_cloud.rb

@@ -77,8 +77,12 @@ module Murakumo
           health_check.each do |name, conf|
             name = name.downcase
 
+            if options[:notification]
+              conf = conf.merge(:notification => options[:notification])
+            end
+
             if datas.any? {|i| i[0] == name }
-              checker = HealthChecker.new(name, self, @logger, conf)
+              checker = HealthChecker.new(@address, name, self, @logger, conf)
               @health_checkers[name] = checker
               # ヘルスチェックはまだ起動しない
             else
@@ -167,6 +171,10 @@ module Murakumo
         hash['health-check'] = @options.config_file['health-check']
       end
 
+      if @options.config_file and @options.config_file['notification']
+        hash['notification'] = @options.config_file['notification']
+      end
+
       return hash
     end
 

data/lib/srv/{murakumo_health_checker_context.rb → murakumo_health_check_context.rb}

@@ -1,4 +1,5 @@
 require 'net/http'
+require 'net/smtp'
 require 'socket'
 
 require 'misc/murakumo_const'
@@ -6,7 +7,7 @@ require 'misc/murakumo_const'
 module Murakumo
 
   # ヘルスチェックのコンテキスト
-  class HealthCheckerContext
+  class HealthCheckContext
 
     def initialize(vars = {})
       vars.each do |name, val|
@@ -37,6 +38,14 @@ module Murakumo
       return false
     end
 
+    # SMTPチェッカー
+    def smtp_check(*args)
+      Net::SMTP.start(*args) {|smtp| true }
+    rescue => e
+      @logger.debug("#{@name}: #{e.message}")
+      return false
+    end
+
     # MySQLのドライバがあれば、MySQLチェッカーを定義
     mysql_class = nil
 
@@ -91,6 +100,6 @@ module Murakumo
     rescue LoadError
     end
 
-  end # HealthCheckerContext
+  end # HealthCheckContext
 
 end # Murakumo

data/lib/srv/murakumo_health_check_notifier.rb

@@ -0,0 +1,56 @@
+require 'net/smtp'
+require 'resolv-replace'
+require 'time'
+
+module Murakumo
+
+  class HealthCheckNotifier
+
+    def initialize(address, name, logger, options)
+      @address = address
+      @name = name
+      @logger = logger
+      @args = options[:args]
+      @sender = options[:sender]
+      @recipients = options[:recipients]
+      @open_timeout = options[:open_timeout]
+      @read_timeout = options[:read_timeout]
+    end
+
+    def notify_active
+      notify('Active', "#{@name} changed into the activity status.")
+    end
+
+    def notify_inactive
+      notify('Inactive', "#{@name} changed into the inactivity status.")
+    end
+
+    private
+    def notify(status, body)
+      Net::SMTP.start(*@args) do |smtp|
+        smtp.open_timeout = @open_timeout if @open_timeout
+        smtp.read_timeout = @read_timeout if @read_timeout
+
+        smtp.send_mail(<<-EOS, @sender, *@recipients)
+From: Murakumo Notifier <#{@sender}>
+To: #{@recipients.join(', ')}
+Subject: #{@name}/#{@address} => #{status}
+Date: #{Time.now.rfc2822}
+
+Address: #{@address}
+Name: #{@name}
+Status: #{status}
+
+#{body.strip}
+        EOS
+      end
+
+      @logger.info("sent the notice: #{status}")
+    rescue Exception => e
+      message = (["#{e.class}: #{e.message}"] + (e.backtrace || [])).join("\n\tfrom ")
+      @logger.error("healthcheck failed: #{@name}: #{message}")
+    end
+
+  end # HealthCheckNotifier
+
+end # Murakumo

data/lib/srv/murakumo_health_checker.rb

@@ -1,14 +1,17 @@
 require 'timeout'
+require 'open3'
 require 'resolv-replace'
 
-require 'srv/murakumo_health_checker_context'
+require 'srv/murakumo_health_check_context'
+require 'srv/murakumo_health_check_notifier'
 require 'misc/murakumo_const'
 
 module Murakumo
 
   class HealthChecker
 
-    def initialize(name, cloud, logger, options)
+    def initialize(address, name, cloud, logger, options)
+      @address = address
       @name = name
       @cloud = cloud
       @logger = logger
@@ -32,6 +35,15 @@ module Murakumo
       @script = options['script']
       raise "health check script of #{@name} is not found" unless @script
       @script = File.read(script) if File.exists?(@script)
+
+      # 通知オブジェクトの設定
+      if options[:notification]
+        @notifier = HealthCheckNotifier.new(@address, @name, @logger, options[:notification])
+      end
+
+      # イベントハンドラの設定
+      @on_activate = options['on_activate']
+      @on_inactivate = options['on_inactivate']
     end
 
     def good
@@ -71,6 +83,15 @@ module Murakumo
 
       status = @normal_health ? 'healthy' : 'unhealthy'
       @logger.info("health condition changed: #{@name}: #{status}")
+
+      case activity
+      when ACTIVE
+        @notifier.notify_active if @notifier
+        handle_event(@on_activate, 'Active') if @on_activate
+      when INACTIVE
+        @notifier.notify_inactive if @notifier
+        handle_event(@on_inactivate, 'Inactive') if @on_inactivate
+      end
     end
 
     def start
@@ -98,7 +119,7 @@ module Murakumo
 
             begin
               retval = timeout(@timeout) {
-                HealthCheckerContext.new(:name => @name, :logger => @logger, :options => @options).instance_eval(@script)
+                HealthCheckContext.new(:name => @name, :logger => @logger, :options => @options).instance_eval(@script)
               }
             rescue Timeout::Error
               retval = false
@@ -133,6 +154,22 @@ module Murakumo
     def alive?
       @alive
     end
+
+    private
+
+    def handle_event(handler, status)
+      Open3.popen3("#{@on_activate} '#{@address}' '#{@name}' '#{status}'") do |stdin, stdout, stderr|
+        out = stdout.read.strip
+        @logger.info(out) unless out.empty?
+
+        err = stderr.read.strip
+        @logger.error(err) unless err.empty?
+      end
+    rescue Exception => e
+      message = (["#{e.class}: #{e.message}"] + (e.backtrace || [])).join("\n\tfrom ")
+      @logger.error("#{@name}: #{message}")
+    end
+
   end # HealthChecker
 
 end # Murakumo

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: murakumo
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - winebarrel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-23 00:00:00 Z
+date: 2011-11-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rubydns
@@ -93,23 +93,24 @@ extra_rdoc_files: []
 
 files: 
 - README
-- bin/murakumo
 - bin/murakumo-install-init-script
 - bin/mrkmctl
-- lib/cli/mrkmctl.rb
-- lib/cli/murakumo.rb
+- bin/murakumo
 - lib/cli/murakumo_options.rb
+- lib/cli/mrkmctl.rb
 - lib/cli/mrkmctl_options.rb
-- lib/misc/murakumo_const.rb
+- lib/cli/murakumo.rb
+- lib/srv/murakumo_health_check_notifier.rb
 - lib/srv/murakumo_server.rb
-- lib/srv/murakumo_health_checker_context.rb
 - lib/srv/murakumo_health_checker.rb
 - lib/srv/murakumo_cloud.rb
-- etc/murakumo.server
-- etc/murakumo.yml.example
-- etc/gai.conf.example
+- lib/srv/murakumo_health_check_context.rb
+- lib/misc/murakumo_const.rb
 - etc/murakumo-update-config-for-ec2
+- etc/gai.conf.example
+- etc/murakumo.yml.example
 - etc/dhclient-script.patch
+- etc/murakumo.server
 homepage: https://bitbucket.org/winebarrel/murakumo
 licenses: []
 
@@ -139,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.1
 signing_key: 
 specification_version: 3
 summary: Murakumo is the internal DNS server which manages name information using a gossip protocol.