naminori 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77e9e92c2424a9499aeee50be651f668afc050a1
-  data.tar.gz: 9802a517be8a05f7759b384fa3bb142f6cb2a8f5
+  metadata.gz: 58042c9fc2a028c2477172fb869d01bd6bea87f8
+  data.tar.gz: 7157f21c3e7187ae21819186dbea5bb005b1436c
 SHA512:
-  metadata.gz: 9abed3bdce6ca095c08211612dcfb981bd639fb127edfdadf69384c0fa3dd84a5d473aff87906b8fe2b3cf52122fcc4e1beb0dd88bb7be1235defd55c935ae92
-  data.tar.gz: 393f9c42eb59c33a8287418eed10c59f4ce765bb7ab626a4a70b5abfc98e6153691e9e1233fbae60659107ea6bb77d0c7d8cbfc07dbbac7af41248bd9f7c0dfc
+  metadata.gz: 242c270180459d79ee1e8ce31e4cf4a5369c253a2ad4eaff1a96753510ca1e94a5cdaa3582a3b740d9ad556c30b11bf665877fe756de0ed2c5644bc84ccb07e7
+  data.tar.gz: 8ec7daa5745f5be8c0782ca99902221022ae3967569be731687a4239c80e173d3b48947ea688350208827ef41fa3048fdcc176d69c09dfdb41b9def1960a2bee

data/README.md

@@ -18,22 +18,25 @@ Or install it yourself as:
 ## Usage
 
 ### exemple
-
 ####  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
+
 ```ruby
 #! /usr/bin/env ruby
 require 'rubygems'
 require 'naminori'
 
-notifier_options = {
+Naminori::Notifier::Configure.instance.set({
   webhook_url: "https://hooks.slack.com/services/XXXXXX",
-  channel: "#pyama"
-}
+  channel: "#pyama",
+  user:    "#naminori"
+})
 
 service_options = {
   vip:"192.168.77.9",
-  role: "dns",
-  notifier: Naminori::Notifier.get_notifier("slack" ,notifier_options)
+  role: "dns"
 }
 
 case
@@ -45,7 +48,40 @@ end
 
 ```
 
+#### example loadbarance serf config
+```
+{
+  "event_handlers": [
+    "/opt/serf/event_handlers/envent_example.rb"
+  ],
+  "interface": "enp0s9",
+  "discover": "cache-dns",
+  "tags": {
+    "role": "lb"
+  },
+  "log_level": "debug"
+}
+```
+
+#### example dns serf config
+```
+{
+  "event_handlers": [
+
+  ],
+  "interface": "enp0s8",
+  "discover": "cache-dns",
+  "tags": {
+    "role": "dns"
+  }
+}
+```
+
 #### 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'
@@ -65,7 +101,7 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:/root/bin
 
 
 
-#### Service Event
+### Service Event Detail
 ```
 Naminori::Service.event(service_name, lb_name, options)
 ```
@@ -73,18 +109,19 @@ Naminori::Service.event(service_name, lb_name, options)
   dns or http
 * lb_name:
   lvs
-* options(dns_default)
+* options
+
 ```
+#dns default
         {
-          role: "dns",              # role name
-          port: "53",               # service port
-          protocol: ["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
+          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
         }
 ```
 ## Author

data/lib/naminori.rb

@@ -7,6 +7,7 @@ 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'

data/lib/naminori/lb/base.rb

@@ -13,7 +13,7 @@ module Naminori
         def notifier(type, options)
           message = "#{type} member ip:#{options[:rip]} protocol:#{options[:protocol]} in vip:#{options[:vip]}"
           puts message
-          options[:service].config.notifier.send(type, message) if options[:service].config.notifier
+          Naminori::Notifier.notifier(type, message) if Naminori::Notifier::Configure.instance.enable?
         end
       end
     end

data/lib/naminori/lb/lvs.rb

@@ -45,7 +45,7 @@ module Naminori
         end
 
         def lvs_option(rip, service)
-          { service: service, vip: service.config.vip, rip: rip, protocols: service.config.protocol, port: service.config.port, method: service.config.method }
+          { service: service, vip: service.config.vip, rip: rip, protocols: service.config.protocols, port: service.config.port, method: service.config.method }
         end
 
         def command_option(type, ops)

data/lib/naminori/naminori.rb

@@ -7,5 +7,8 @@ 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.rb

@@ -2,10 +2,18 @@
 module Naminori
   class Notifier
     class << self
-      def get_notifier(notifier, options={})
+      def notifier(type, message)
+        config = Naminori::Notifier::Configure.instance
+        case
+        when config.webhook_url && config.user && config.channel
+          get_notifier("slack").notifier(type, message)
+        end
+      end
+
+      def get_notifier(notifier)
         case notifier
         when "slack"
-          Naminori::Notifier::Slack.new(options)
+          Naminori::Notifier::Slack.new
         end
       end
     end

data/lib/naminori/notifier/base.rb

@@ -3,20 +3,13 @@ module Naminori
   class Notifier
     class Base
       attr_reader :config
-      def initialize(options={})
-        @config = Naminori::Notifier::Configure.new(
-          default_config.merge(options)
-        )
+      def initialize()
+        @config = Naminori::Notifier::Configure.instance
       end
 
-      def send(type, message)
+      def notifier(type, message)
         raise "Called abstract method: add_server"
       end
-
-      def default_config
-        raise "Called abstract method: default_config"
-      end
-
     end
   end
 end

data/lib/naminori/notifier/configure.rb

@@ -1,13 +1,20 @@
 #! /usr/bin/env ruby
+require 'singleton'
 module Naminori
   class Notifier
     class Configure
+      include Singleton
       attr_reader :webhook_url, :channel, :user
-      def initialize(options)
+
+      def set(options)
         @webhook_url = options[:webhook_url]
         @channel     = options[:channel]
         @user        = options[:user]
       end
+
+      def enable?
+        webhook_url && channel && user
+      end
     end
   end
 end

data/lib/naminori/notifier/slack.rb

@@ -2,21 +2,13 @@
 module Naminori
   class Notifier
     class Slack < Base
-      def send(type, message)
+      def notifier(type, message)
         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:"
+        notifier.ping  icon + Time.new.strftime("%H:%M:%S ") + message, icon_emoji: ":sparkle:"
       rescue => e
         p e
       end
-
-      def default_config
-        {
-          webhook_url: "",
-          channel: "general",
-          user: "naminori-notifier"
-        }
-      end
     end
   end
 end

data/lib/naminori/service.rb

@@ -10,6 +10,8 @@ module Naminori
         case service_name
         when "dns"
           Naminori::Service::Dns
+        when "http"
+          Naminori::Service::Http
         end
       end
     end

data/lib/naminori/service/configure.rb

@@ -2,17 +2,16 @@
 module Naminori
   class Service
     class Configure
-      attr_reader :role, :port, :protocol, :vip, :method, :query, :retry, :timeout, :notifier
+      attr_reader :role, :port, :protocols, :vip, :method, :query, :retry, :timeout
       def initialize(options)
-        @role     = options[:role]
-        @port     = options[:port]
-        @protocol = options[:protocol]
-        @vip      = options[:vip]
-        @method   = options[:method]
-        @query    = options[:query]
-        @retry    = options[:retry]
-        @timeout  = options[:timeout]
-        @notifier = options[:notifier]
+        @role      = options[:role]
+        @port      = options[:port]
+        @protocols = options[:protocols]
+        @vip       = options[:vip]
+        @method    = options[:method]
+        @query     = options[:query]
+        @retry     = options[:retry]
+        @timeout   = options[:timeout]
       end
     end
   end

data/lib/naminori/service/dns.rb

@@ -15,15 +15,15 @@ module Naminori
 
       def default_config
         {
-          role: "dns",
-          port: "53",
-          protocol: ["udp", "tcp"],
-          vip: "192.168.77.9",
-          method: "nat",
-          query: "pepabo.com",
-          retry: 3,
-          timeout: 3,
-          notifier: nil
+          role:      "dns",
+          port:      "53",
+          protocols: ["udp", "tcp"],
+          vip:       "192.168.77.9",
+          method:    "nat",
+          query:     "pepabo.com",
+          retry:     3,
+          timeout:   3,
+          notifier:  nil
         }
       end
     end

data/lib/naminori/service/http.rb

@@ -0,0 +1,32 @@
+#! /usr/bin/env ruby
+module Naminori
+  class Service
+    class Http < Naminori::Service::Base
+
+      def healty?(ip)
+        http = Net::HTTP.new(ip, config.port)
+        http.open_timeout = config.timeout
+
+        begin
+          http.get("/#{@query}")
+        rescue => e
+          false
+        end
+      end
+
+      def default_config
+        {
+          role:       "http",
+          port:       "80",
+          protocols:  ["tcp"],
+          vip:        "192.168.77.9",
+          method:     "nat",
+          query:      "index.html",
+          retry:      3,
+          timeout:    3,
+          notifier:   nil
+        }
+      end
+    end
+  end
+end

data/lib/naminori/version.rb

@@ -1,3 +1,3 @@
 module Naminori
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/naminori.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'slack-notifier', "~> 1.2"
-  spec.add_development_dependency "bundler", "~> 1.9.8"
+  spec.add_development_dependency "bundler", ">= 1.7.6"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: naminori
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - kazuhiko yamahsita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-21 00:00:00.000000000 Z
+date: 2015-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-notifier
@@ -28,16 +28,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.8
+        version: 1.7.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.8
+        version: 1.7.6
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -93,6 +93,7 @@ files:
 - lib/naminori/service/base.rb
 - lib/naminori/service/configure.rb
 - lib/naminori/service/dns.rb
+- lib/naminori/service/http.rb
 - lib/naminori/version.rb
 - naminori.gemspec
 homepage: http://ten-snapon.com
@@ -115,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: LoadBarancer library on Serf.