naminori 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9613921c03bceebc050a914297919fe5f775d604
-  data.tar.gz: 35099756e8655cb6b4e5e701715588b000a67971
+  metadata.gz: 211f84aefe99edcff09ec2e6cc5c4566c82e58bb
+  data.tar.gz: 287a42d2cb81de3be55d92c7a7db79ab884471ac
 SHA512:
-  metadata.gz: 7d7591a77ea8bd35e685a8d500b4d0443a3cfa6b96869f9b116cbf3e26e55d70fb2e8c135a2cb578d6506768075cf5985c9cef3fc6410660b29df236509bcc39
-  data.tar.gz: c123f60e9b2424f6aac66ba3a5f4edb4dade94c93fd2816416a351020fa0e797541bcbf47662ff7c6f7346c8cc75266d6e0ee81cb6e078d99160bb663009bd3e
+  metadata.gz: 4317b5996c31afb0ec4adb1dd2adbcf2d1fa4f143c471797b77bb7996d3f3533e67f817962c4148feb39c5bdaf876544ebd7ee347d8d6100adfe1f971743a587
+  data.tar.gz: a4ed6a67a9787ceee61fa71dfc206122ae8f494f6aab7c6ca6fba5acec063d2f98f02d804d87ca69139c9c8bb7cde6837cefc7ebd53da3da1af9803e125b68f9

data/README.md

@@ -21,30 +21,33 @@ Or install it yourself as:
 ####  envent_example.rb
 1. check the event classification
 2. add or delete rip if these member-join or member-leave(faile)
-3. enent target LoadBaranser is health_check with fetch member
+3. health_check with fetch member
 
 ```ruby
 #! /usr/bin/env ruby
 require 'rubygems'
 require 'naminori'
 
-Naminoti::Notifier.configure do
-  webhook_url "https://hooks.slack.com/services/XXXXXX"
-  channel     "#pyama"
+Naminori.configure do |config|
+  config.notifier :slack do
+    webhook_url "https://hooks.slack.com/services/XXXXXX"
+    channel     "#pyama"
+  end
+
+  config.service :dns_server do
+    service  :dns
+    protocol "udp"
+    vip      "192.68.77.9"
+  end
+
+  config.service :dns_server do
+    service  :dns
+    protocol "tcp"
+    vip      "192.68.77.9"
+  end
 end
 
-service_options = {
-  vip:"192.168.77.9",
-  role: "dns",
-  notifier: Naminori::Notifier.get_notifier("slack" ,notifier_options)
-}
-
-case
-when Naminori::Serf.role?("dns")
-  Naminori::Service::Dns.event("lvs", service_options)
-when Naminori::Serf.role?("lb")
-  Naminori::Service::Dns.health_check("lvs", service_options)
-end
+Naminori.run
 
 ```
 
@@ -57,7 +60,7 @@ end
   "interface": "enp0s9",
   "discover": "cache-dns",
   "tags": {
-    "role": "lb"
+    "role": "lb_server"
   },
   "log_level": "debug"
 }
@@ -72,55 +75,45 @@ end
   "interface": "enp0s8",
   "discover": "cache-dns",
   "tags": {
-    "role": "dns"
+    "role": "dns_server"
   }
 }
 ```
 
-#### health_check_example.rb
-1. Using cron to the health check of the service
-2. Service is removed from the member if that is not healthy
-   * Parameter [query, timeout ,retry]
-
-```ruby
-#! /usr/bin/env ruby
-require 'rubygems'
-require 'naminori'
-
-service_options = { vip:"192.168.77.9", role: "dns" }
-
-Naminori::Service::Dns.health_check("lvs", service_options)
-```
 ```zsh
 # crontab -l
 # Chef Name: health_check
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:/root/bin
-* * * * * for i in `seq 0 10 59`;do (sleep ${i}; /opt/serf/event_handlers/health_check_example.rb)& done;
+* * * * * for i in `seq 0 10 59`;do (sleep ${i}; /opt/serf/event_handlers/event_example.rb)& done;
 ```
 
-### Service Event Detail
+### default parameter
+#### DNS
 ```
-Naminori::Service::Dns.event(lb_name, options)
+{
+  lb: "lvs"                  # lb type
+  port: "53",                # service port
+  protocol: "udp"            # protocol
+  vip: "192.168.77.9",       # service vip
+  method: "nat",             # lvs_method gateway/ip/nat
+  query: "pepabo.com",       # health_check_query
+  retry_c: 3,                # health_check_retry_c_count
+  timeout: 3,                # health_check_time_out
+}
 ```
-* service_name:
-  dns or http
-* lb_name:
-  lvs
-* options
-
+#### HTTP
 ```
-#dns default
-        {
-          role: "dns",               # role name
-          port: "53",                # service port
-          protocols: ["udp", "tcp"], # protocol(array)
-          vip: "192.168.77.9",       # service vip
-          method: "gateway",         # lvs_method gateway/ip/nat
-          query: "pepabo.com",       # health_check_query
-          retry: 3,                  # health_check_retry_count
-          timeout: 3,                # health_check_time_out
-          notifier: nil              # notifier
-        }
+{
+  lb:         "lvs",
+  port:       "80",
+  protocol:   "tcp",
+  vip:        "192.168.77.9",
+  method:     "nat",
+  query:      "index.html",
+  retry_c:    3,
+  timeout:    3
+}
 ```
+
 ## Author
 * pyama

data/lib/naminori.rb

@@ -1,15 +1,14 @@
 require "naminori/version"
+require "naminori/attribute"
+require 'naminori/configure'
 require 'naminori/serf'
-require 'naminori/lb'
 require 'naminori/lb/base'
 require 'naminori/lb/lvs'
-require 'naminori/service'
 require 'naminori/service/base'
 require 'naminori/service/configure'
 require 'naminori/service/dns'
 require 'naminori/service/http'
 require 'naminori/notifier'
-require 'naminori/notifier/base'
 require 'naminori/notifier/configure'
 require 'naminori/notifier/slack'
 require 'resolv'
@@ -17,5 +16,24 @@ require 'slack-notifier'
 
 
 module Naminori
-  # Your code goes here...
+  def self.run
+    Naminori.configure.service.each do |s|
+      service = Object.const_get("Naminori::Service::#{s.service.to_s.capitalize}").new(s)
+      service.run
+      health_check(service)
+    end if Naminori.configure.service
+  end
+
+  def self.health_check(service)
+    if members = Naminori::Serf.get_alive_member_by_role(service.config.role.to_s)
+      members.each do |member|
+        ip = member[:ip]
+        if service.healty?(ip)
+          Object.const_get("Naminori::Lb::#{service.config.lb.to_s.capitalize}").add_member(ip, service)
+        elsif service.config.retry_c.times.all? { sleep 1; !service.healty?(ip) }
+          Object.const_get("Naminori::Lb::#{service.config.lb.to_s.capitalize}").delete_member(ip, service)
+        end
+      end
+    end
+  end
 end

data/lib/naminori/attribute.rb

@@ -0,0 +1,11 @@
+module Naminori
+  module Attribute
+    def attribute(name)
+      define_method(name, ->(val=nil){
+        @config ||= {}
+        @config[name] = val if val
+        @config[name]
+      })
+    end
+  end
+end

data/lib/naminori/configure.rb

@@ -0,0 +1,31 @@
+module Naminori
+  class Configure
+    def initialize
+        @_config ||= {}
+    end
+
+    def self.resource(resource_name)
+      define_method(resource_name, ->(name=nil, &block){
+        if name
+          config = Object.const_get("Naminori::#{resource_name.capitalize}::Configure").new(name)
+          config.instance_eval(&block) if block
+          @_config[resource_name] ||= []
+          @_config[resource_name] << config
+        end
+        @_config[resource_name]
+      })
+    end
+
+    resource :service
+    resource :notifier
+    resource :lb
+  end
+
+  def self.configure(&block)
+    if block
+      @__config = Configure.new
+      @__config.instance_eval(&block)
+    end
+    @__config
+  end
+end

data/lib/naminori/lb/base.rb

@@ -9,9 +9,9 @@ module Naminori
         def delete_member(rip, service)
           raise "Called abstract method: add_member"
         end
-        
-        def notifier(type, options)
-          message = "#{type} member ip:#{options[:rip]} protocol:#{options[:protocol]} in vip:#{options[:vip]}"
+      
+        def notify(type, rip, service)
+          message = "#{type} member ip:#{rip} protocol:#{service.config.protocol} in vip:#{service.config.vip}"
           puts message
           Naminori::Notifier.notify(type, message)
         end

data/lib/naminori/lb/lvs.rb

@@ -4,57 +4,38 @@ module Naminori
     class Lvs < Naminori::Lb::Base
       class << self
         def add_member(rip, service)
-          transaction("add", lvs_option(rip, service)) if service.healty?(rip)
+          transaction("add", rip, service) if service.healty?(rip) && exist_ip?(service.config.vip, service) && !exist_ip?(rip, service)
         end
 
         def delete_member(rip, service)
-          transaction("delete", lvs_option(rip, service))
+          transaction("delete", rip, service) if exist_ip?(rip, service)
         end
 
-        def transaction(type, ops)
-          ops[:protocols].collect do |protocol|
-            merge_option =  ops.merge({ protocol: protocol })
-            if self.send("#{type}?", merge_option) && system("ipvsadm #{command_option(type, merge_option)}")
-              notifier(type, merge_option)
-              true
-            end
-          end.all? {|res| res }
-        end
-
-        def add?(ops)
-          vip_exists?(ops) && !delete?(ops)
-        end
-
-        def delete?(ops)
-          fetch_service(ops).each do |line|
-            return true if line.match(/#{ops[:rip]}:/)
+        def transaction(type, rip, service)
+          if system("ipvsadm #{command_option(type, rip, service)}")
+            notify(type, rip, service)
           end
-          false
         end
 
-        def vip_exists?(ops)
-          fetch_service(ops).each do |line|
-            return true if line.match(/#{ops[:vip]}:/)
+        def exist_ip?(ip, service)
+          fetch_service(service).find do |line|
+            line.match(/#{ip}/)
           end
-          false
         end
 
-        def fetch_service(ops)
-          service = `ipvsadm -Ln --#{ops[:protocol]}-service #{ops[:vip]}:#{ops[:port]}`.split("\n")
-          raise "fetch errror!" unless service
-          service
-        end
-
-        def lvs_option(rip, service)
-          { service: service, vip: service.config.vip, rip: rip, protocols: service.config.protocols, port: service.config.port, method: service.config.method }
+        def fetch_service(service)
+          unless result = `ipvsadm -Ln --#{service.config.protocol}-service #{service.config.vip}:#{service.config.port}`.split("\n")
+            raise "fetch errror!"
+          end
+          result 
         end
 
-        def command_option(type, ops)
+        def command_option(type, rip, service)
           case
           when type == "add"
-            "--#{type}-server --#{ops[:protocol]}-service #{ops[:vip]}:#{ops[:port]} -r #{ops[:rip]}:#{ops[:port]} #{method_option(ops[:method])}"
+            "--#{type}-server --#{service.config.protocol}-service #{service.config.vip}:#{service.config.port} -r #{rip}:#{service.config.port} #{method_option(service.config.method)}"
           when type == "delete"
-            "--#{type}-server --#{ops[:protocol]}-service #{ops[:vip]}:#{ops[:port]} -r #{ops[:rip]}:#{ops[:port]}"
+            "--#{type}-server --#{service.config.protocol}-service #{service.config.vip}:#{service.config.port} -r #{rip}:#{service.config.port}"
           end
         end
 
@@ -68,7 +49,6 @@ module Naminori
             "-i"
           end
         end
-
       end
     end
   end

data/lib/naminori/notifier.rb

@@ -3,23 +3,11 @@ module Naminori
   module Notifier
     class << self
       def notify(type, message)
-        case
-        when Naminori::Notifier.config.slack_enable?
-          get_notifier("slack").notify(type, message)
-        end
-      end
-
-      def get_notifier(notifier)
-        case notifier
-        when "slack"
-          Naminori::Notifier::Slack.new
-        end
-      end
-
-      def configure(&block)
-        Naminori::Notifier.config(&block)
+        return true unless Naminori.configure.notifier 
+        Naminori.configure.notifier.all? do |config|
+          Object.const_get("Naminori::Notifier::#{config.type.to_s.capitalize}").notify(type, message, config)
+        end 
       end
     end
   end
-  
 end

data/lib/naminori/notifier/configure.rb

@@ -1,38 +1,19 @@
 #! /usr/bin/env ruby
+require 'naminori'
 module Naminori
   module Notifier
     class Configure
-      def clear
-        instance_variables.each do |v|
-          instance_variable_set(v, nil)
-        end
-      end
-
-      def slack_enable?
-        webhook_url && channel && user
-      end
+      extend Naminori::Attribute
+      attr_accessor :config
 
-      def webhook_url(url=nil)
-        @_webhook_url = url if url
-        @_webhook_url
+      def initialize(name)
+        type name
       end
       
-      def channel(channel=nil)
-        @_channel = channel if channel 
-        @_channel
-      end
-
-      def user(user=nil)
-        @_user = user if user 
-        @_user
-      end
-    end
-
-    def self.config(&block)
-      @_config ||= Naminori::Notifier::Configure.new
-      @_config.instance_eval(&block) if block
-      @_config
+      attribute :type
+      attribute :webhook_url
+      attribute :channel
+      attribute :user
     end
   end
-
 end

data/lib/naminori/notifier/slack.rb

@@ -1,19 +1,21 @@
 #! /usr/bin/env ruby
 module Naminori
   module Notifier
-    class Slack < Base
-      def notify(type, message)
-        icon = type == "add" ? ":white_check_mark:" : ":no_entry_sign:"
-        notifier = ::Slack::Notifier.new(
-          Naminori::Notifier.config.webhook_url,
-          {
-            channel: Naminori::Notifier.config.channel, 
-            username: Naminori::Notifier.config.user
-          }
-        )
-        notifier.ping  icon + message, icon_emoji: ":sparkle:"
-      rescue => e
-        p e
+    class Slack
+      class << self
+        def notify(type, message, config)
+          icon = type == "add" ? ":white_check_mark:" : ":no_entry_sign:"
+          notifier = ::Slack::Notifier.new(
+            config.webhook_url,
+            {
+              channel: config.channel, 
+              username: config.user
+            }
+          )
+          notifier.ping  icon + message, icon_emoji: ":sparkle:"
+        rescue => e
+          p e
+        end
       end
     end
   end

data/lib/naminori/serf.rb

@@ -2,13 +2,16 @@
 module Naminori
   class Serf
     @@event = nil
+
     class << self
       def gets
         @@event ||= STDIN.gets.chomp.match(/(?<node>.+?)\t(?<ip>.+?)\t(?<role>.+?)\t/)
+      rescue
+        @@event
       end
 
       def event_message
-        puts "event:#{ENV['SERF_EVENT']} value:#{get}"
+        puts "event:#{ENV['SERF_EVENT']} value:#{gets}" if gets
       end
 
       def join?
@@ -24,7 +27,7 @@ module Naminori
       end
 
       def role?(role)
-        gets[:role] == role
+        gets && gets[:role] == role
       end
 
       def get_alive_member_by_role(role)

data/lib/naminori/service/base.rb

@@ -3,41 +3,23 @@ module Naminori
   class Service
     class Base
       attr_reader :config
-      class << self
-        def event(lb_name, options)
+      def initialize(config_klass)
+        config_klass.config = default_config.merge(config_klass.config)
+        @config = config_klass
+      end
+
+      def run
+        if Naminori::Serf.role?(config.role.to_s)
+          ip = Naminori::Serf.gets[:ip] 
           case
           when Naminori::Serf.join?
-            Naminori::Lb.get_lb(lb_name).add_member(event_ip, self.new(options))
+            Object.const_get("Naminori::Lb::#{config.lb.to_s.capitalize}").add_member(ip, self)
           when Naminori::Serf.leave? || Naminori::Serf.failed?
-            Naminori::Lb.get_lb(lb_name).delete_member(event_ip, self.new(options))
+            Object.const_get("Naminori::Lb::#{config.lb.to_s.capitalize}").delete_member(ip, self)
           end
         end
-
-        def event_ip
-          Naminori::Serf.gets[:ip]
-        end
-      
-        def health_check(lb_name, options)
-          service = self.new(options)
-          members = Naminori::Serf.get_alive_member_by_role(service.config.role)
-          members.each do |member|
-            ip = member[:ip]
-            if service.healty?(ip)
-              Naminori::Lb.get_lb(lb_name).add_member(ip, service)
-            elsif service.config.retry.times.all? { sleep 1; !service.healty?(ip) }
-              Naminori::Lb.get_lb(lb_name).delete_member(ip, service)
-            end
-          end if members
-        end
-        
-      end
-
-      def initialize(options)
-        @config = Naminori::Service::Configure.new(
-          default_config.merge(options)
-        )
       end
-      
+    
       def healty?(ip)
         raise "Called abstract method: healty?"
       end
@@ -45,7 +27,7 @@ module Naminori
       def default_config
         raise "Called abstract method: default_config"
       end
-
+        
     end
   end
 end

data/lib/naminori/service/configure.rb

@@ -2,17 +2,22 @@
 module Naminori
   class Service
     class Configure
-      attr_reader :role, :port, :protocols, :vip, :method, :query, :retry, :timeout
-      def initialize(options)
-        @role      = options[:role]
-        @port      = options[:port]
-        @protocols = options[:protocols]
-        @vip       = options[:vip]
-        @method    = options[:method]
-        @query     = options[:query]
-        @retry     = options[:retry]
-        @timeout   = options[:timeout]
+      extend Naminori::Attribute
+      attr_accessor :config
+      def initialize(name)
+        role name
       end
+
+      attribute :role
+      attribute :service
+      attribute :lb
+      attribute :port
+      attribute :protocol
+      attribute :vip
+      attribute :method
+      attribute :query
+      attribute :retry_c
+      attribute :timeout
     end
   end
 end

data/lib/naminori/service/dns.rb

@@ -2,26 +2,26 @@
 module Naminori
   class Service
     class Dns < Naminori::Service::Base
-
       def healty?(ip)
         dns = Resolv::DNS.new(:nameserver => ip )
         dns.timeouts = config.timeout
         begin
-          dns.getaddress(@config.query)
-        rescue => e
+          dns.getaddress(config.query)
+        rescue
           false
         end
       end
 
       def default_config
         {
+          lb:        "lvs",
           role:      "dns",
           port:      "53",
-          protocols: ["udp", "tcp"],
+          protocol:  "udp",
           vip:       "192.168.77.9",
           method:    "nat",
           query:     "pepabo.com",
-          retry:     3,
+          retry_c:   3,
           timeout:   3
         }
       end

data/lib/naminori/service/http.rb

@@ -8,21 +8,22 @@ module Naminori
         http.open_timeout = config.timeout
 
         begin
-          http.get("/#{@query}")
-        rescue => e
+          http.get("/#{config.query}")
+        rescue
           false
         end
       end
 
       def default_config
         {
+          lb:         "lvs",
           role:       "http",
           port:       "80",
-          protocols:  ["tcp"],
+          protocol:   "tcp",
           vip:        "192.168.77.9",
           method:     "nat",
           query:      "index.html",
-          retry:      3,
+          retry_c:    3,
           timeout:    3
         }
       end

data/lib/naminori/version.rb

@@ -1,3 +1,3 @@
 module Naminori
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: naminori
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - kazuhiko yamahsita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-09 00:00:00.000000000 Z
+date: 2015-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-notifier
@@ -80,16 +80,14 @@ files:
 - README.md
 - Rakefile
 - lib/naminori.rb
-- lib/naminori/lb.rb
+- lib/naminori/attribute.rb
+- lib/naminori/configure.rb
 - lib/naminori/lb/base.rb
 - lib/naminori/lb/lvs.rb
-- lib/naminori/naminori.rb
 - lib/naminori/notifier.rb
-- lib/naminori/notifier/base.rb
 - lib/naminori/notifier/configure.rb
 - lib/naminori/notifier/slack.rb
 - lib/naminori/serf.rb
-- lib/naminori/service.rb
 - lib/naminori/service/base.rb
 - lib/naminori/service/configure.rb
 - lib/naminori/service/dns.rb

data/lib/naminori/lb.rb

@@ -1,13 +0,0 @@
-#! /usr/bin/env ruby
-module Naminori
-  class Lb
-    class << self
-      def get_lb(lb_name)
-        case lb_name
-        when "lvs"
-          Naminori::Lb::Lvs
-        end
-      end
-    end
-  end
-end

data/lib/naminori/naminori.rb

@@ -1,14 +0,0 @@
-#! /usr/bin/env ruby
-require File.dirname(__FILE__) + '/serf'
-require File.dirname(__FILE__) + '/lb'
-require File.dirname(__FILE__) + '/lb/base'
-require File.dirname(__FILE__) + '/lb/lvs'
-require File.dirname(__FILE__) + '/service'
-require File.dirname(__FILE__) + '/service/base'
-require File.dirname(__FILE__) + '/service/configure'
-require File.dirname(__FILE__) + '/service/dns'
-require File.dirname(__FILE__) + '/service/http'
-require 'resolv'
-require 'net/http'
-require 'net/https'
-

data/lib/naminori/notifier/base.rb

@@ -1,10 +0,0 @@
-#! /usr/bin/env ruby
-module Naminori
-  module Notifier
-    class Base
-      def notifier(type, message)
-        raise "Called abstract method: add_server"
-      end
-    end
-  end
-end

data/lib/naminori/service.rb

@@ -1,19 +0,0 @@
-#! /usr/bin/env ruby
-module Naminori
-  class Service
-    class << self
-      def event(service_name, lb_name, options={})
-        get_service(service_name).event(lb_name, options)
-      end
-
-      def get_service(service_name)
-        case service_name
-        when "dns"
-          Naminori::Service::Dns
-        when "http"
-          Naminori::Service::Http
-        end
-      end
-    end
-  end
-end