etcd-tools 0.1.4 → 0.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTA1MTQ3MGQ3ZTdkMDMxYmFlN2VhOGE3ZjNmYmQwNjI2MmI4MTBjNA==
+    NjJmMWFjMTQ0ZTg4YTU1ZWYzODEyNzFkMTcxMzlkNzljYjM0ZTMyMw==
   data.tar.gz: !binary |-
-    NGZiZTcxNzMxZmVjZjE4OTRiYzk0Mjc5YjBmNTg2YWI1NTk0MGU4YQ==
+    NTY4ZDgzNWM2MWNhNDhmZTc4MzYzOGZjNWQ4YTNiZWMwMzU0NmE2OA==
 SHA512:
   metadata.gz: !binary |-
-    ZmQxZjc5NmRjYTlhMjEzMmMyMWNkYzk2OWM2NjEzZDI1OTkwYjJjMjUzYzli
-    MWVkYmM4ZWQwMjRkNzg5OWI0NzMzNGQ0ZTRhNGNiZDE3M2FhZjkyMjlhN2Q1
-    OTFmMjFmYTFhMmQ3ODM1MWI1NmQ2OTBkMmE5ODVmZjA3NWY2NjA=
+    M2NkMGYxZjRlYTNkMDM3MGIxZjk4ZmQ5ZTBmMzA4NjhmZGZkNGJjMjFiMGM0
+    YjFjNTc3MDdjMTk5MmQ5ZTUyNjcyMjQ3NTQyMTRlNmI0ZDcwN2Y3NWZjZmJm
+    NmY5ODkzMTA5NTdjOTkzNTQ4OTE1MTJiZDNkOGI0ZmY1ZmZmM2U=
   data.tar.gz: !binary |-
-    ZjA0Mjc4MzNkMmExZDYxN2RjNmZhNjU2N2EwMDJkMDA3NjcwYjkxZWVkYWQ3
-    OTczOTg5OWE3ODYyYWZkMzY0ODIxYmI4MzRlM2ZmYjI2ZmU4NGUxMGJlNGIy
-    NjYzMTQ5ZGJmNmFjZTQ0MDgxMDViNGI1YWNhNzhmZGVkOWQ2NjA=
+    ZjU0OWE3ODM1MTM1MDM1Njk3MmYzYWZlNTZmMDk1NGU0MTQ5NzdhY2EzZWI1
+    OTEyNDlmZmExYzJlZWQzNThjMGE4ZjAxM2JjOTJjOWQyOGRmZDJkYWNkNGEy
+    Mjk0NTY4MDllMzRjNjk2YTc1Yzk0ZGU1NDExOWJiMjdlNzE3ZTA=

data/bin/etcd-erb

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require 'etcd-tools/etcd_erb'
-EtcdTools::EtcdERB.new
+require 'etcd-tools/cli/etcd_erb'
+EtcdTools::Cli::EtcdERB.new

data/bin/etcd-watchdog-vip

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
-require 'etcd-tools/etcd_watchdog_vip'
-app = EtcdTools::VipWatchdog.new
+require 'etcd-tools/watchdog/vip'
+app = EtcdTools::Watchdog::Vip.new
 app.run

data/bin/etcd2yaml

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require 'etcd-tools/cli/etcd2yaml'
+EtcdTools::Cli::Etcd2Yaml.new

data/bin/yaml2etcd

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require 'etcd-tools/yaml2etcd'
-EtcdTools::Yaml2Etcd.new
+require 'etcd-tools/cli/yaml2etcd'
+EtcdTools::Cli::Yaml2Etcd.new

data/lib/etcd-tools/cli/etcd2yaml.rb

@@ -0,0 +1,62 @@
+require 'optparse'
+require 'yaml'
+require 'etcd-tools/etcd'
+
+module EtcdTools
+  module Cli
+    class Etcd2Yaml
+      include EtcdTools::Etcd
+
+      def optparse
+        @options = Hash.new
+
+        @options[:url] = ENV['ETCDCTL_ENDPOINT']
+        @options[:url] ||= "http://127.0.0.1:4001"
+        @options[:root_path] = "/config"
+
+        OptionParser.new do |opts|
+          opts.banner = "Parses ETCD tree into structured YAML\n\nUsage: #{$0} [OPTIONS]"
+          opts.separator ""
+          opts.separator "Connection options:"
+          opts.on("-u", "--url HOST", "URL endpoint of the ETCD service (ETCDCTL_ENDPOINT envvar also applies) [DEFAULT: http://127.0.0.1:4001]") do |param|
+            @options[:url] = param
+          end
+          opts.separator ""
+          opts.separator "Common options:"
+          opts.on("-r", "--root-path PATH", "root PATH of ETCD tree to extract the data from [DEFAULT: /config]") do |param|
+            @options[:root_path] = param
+          end
+          opts.on("-v", "--verbose", "run verbosely") do |param|
+            @options[:verbose] = param
+          end
+          opts.on_tail("-h", "--help", "show usage") do |param|
+            puts opts;
+            exit! 0
+          end
+        end.parse!
+      end
+
+      def initialize
+        self.optparse
+
+        begin
+          @etcd = etcd_connect @options[:url]
+        rescue Exception => e
+          $stderr.puts "Failed to connect to ETCD!"
+          $stderr.puts e.message
+          exit! 1
+        end
+
+        begin
+          hash = etcd2hash @etcd, @options[:root_path]
+          puts hash.to_yaml
+        rescue Exception => e
+          $stderr.puts "Import failed"
+          $stderr.puts e.message
+          exit! 1
+        end
+      end
+
+    end
+  end
+end

data/lib/etcd-tools/{etcd_erb/options.rb → cli/etcd_erb.rb}

@@ -1,8 +1,12 @@
 require 'optparse'
+require 'etcd-tools/etcd'
+require 'etcd-tools/erb'
 
 module EtcdTools
-  module EtcdERB
-    module Options
+  module Cli
+    class EtcdERB
+      include EtcdTools::Etcd
+
       def optparse
         @options = Hash.new
 
@@ -24,6 +28,27 @@ module EtcdTools
           end
         end.parse!
       end
+
+      def initialize
+        self.optparse
+
+        begin
+          @etcd = etcd_connect @options[:url]
+        rescue Exception => e
+          $stderr.puts "Failed to connect to ETCD!"
+          $stderr.puts e.message
+          exit! 1
+        end
+
+        begin
+          template = EtcdTools::Erb.new @etcd, ARGF.read
+          puts template.result
+        rescue Exception => e
+          $stderr.puts "Failed to parse ERB template!"
+          $stderr.puts e.message
+          exit! 1
+        end
+      end
     end
   end
 end

data/lib/etcd-tools/{yaml2etcd/options.rb → cli/yaml2etcd.rb}

@@ -1,8 +1,11 @@
 require 'optparse'
+require 'etcd-tools/etcd'
 
 module EtcdTools
-  module Yaml2Etcd
-    module Options
+  module Cli
+    class Yaml2Etcd
+      include EtcdTools::Etcd
+
       def optparse
         @options = Hash.new
 
@@ -10,7 +13,6 @@ module EtcdTools
         @options[:url] ||= "http://127.0.0.1:4001"
         @options[:root_path] = "/config"
 
-
         OptionParser.new do |opts|
           opts.banner = "Reads YAML file and imports the data into ETCD\n\nUsage: #{$0} [OPTIONS] < config.yaml"
           opts.separator ""
@@ -32,6 +34,36 @@ module EtcdTools
           end
         end.parse!
       end
+
+      def initialize
+        self.optparse
+
+        begin
+          @hash = YAML.load ARGF.read
+        rescue
+          $stderr.puts "Failed to parse YAML!"
+          $stderr.puts e.message
+          exit! 1
+        end
+
+        begin
+          @etcd = etcd_connect @options[:url]
+        rescue Exception => e
+          $stderr.puts "Failed to connect to ETCD!"
+          $stderr.puts e.message
+          exit! 1
+        end
+
+        begin
+          hash2etcd @hash, @options[:root_path]
+          puts "OK"
+        rescue Exception => e
+          $stderr.puts "Import failed"
+          $stderr.puts e.message
+          exit! 1
+        end
+      end
+
     end
   end
 end

data/lib/etcd-tools/erb.rb

@@ -0,0 +1,37 @@
+require 'erb'
+require 'etcd-tools/etcd'
+
+module EtcdTools
+  class Erb < ::ERB
+    include EtcdTools::Etcd
+
+    attr_reader :etcd
+
+    def initialize (etcd, template)
+      @etcd = etcd
+      super template
+    end
+
+    def result
+      super binding
+    end
+
+    def value path
+      return @etcd.get('/' + path.sub(/^\//, '')).value
+    end
+
+    def keys path
+      path.sub!(/^\//, '')
+      if @etcd.get('/' + path).directory?
+        return @etcd.get('/' + path).children.map { |key| key.key }
+      else
+        return []
+      end
+    end
+
+    def members
+      @etcd.members
+    end
+
+  end
+end

data/lib/etcd-tools/etcd.rb

@@ -0,0 +1,50 @@
+require 'etcd'
+require 'etcd-tools/mixins'
+
+module EtcdTools
+  module Etcd
+    def etcd_connect (url)
+      (host, port) = url.gsub(/^https?:\/\//, '').gsub(/\/$/, '').split(':')
+      etcd = ::Etcd.client(host: host, port: port)
+      begin
+        etcd.version
+        return etcd
+      rescue Exception => e
+        raise e #fixme
+      end
+    end
+
+    def hash2etcd (etcd, hash, path="")
+      begin
+        hash.each do |key, value|
+          etcd_key = path + "/" + key.to_s
+          case value
+          when Hash
+            hash2etcd(value, etcd_key)
+          else
+            etcd.set(etcd_key, value: value)
+          end
+        end
+      rescue Exception => e
+        raise e #fixme
+      end
+    end
+
+    def etcd2hash (etcd, path="")
+      begin
+        hash = Hash.new
+        etcd.get(path).children.each do |child|
+          if etcd.get(child.key).directory?
+            hash[child.key.split('/').last.to_sym] = etcd2hash etcd, child.key
+          else
+            hash[child.key.split('/').last.to_sym] = child.value
+          end
+        end
+      rescue
+        return nil
+      end
+      return hash.sort.to_h
+    end
+
+  end
+end

data/lib/etcd-tools/watchdog/haproxy.rb

@@ -1,7 +1,23 @@
+require 'etcd-tools/watchdog/init'
+# require 'etcd-tools/watchdogthreads/haproxy'
+require 'etcd-tools/erb'
+
 module EtcdTools
   module Watchdog
-    module HAproxy
-      # TODO
+    class HAproxy < EtcdTools::Watchdog::Init
+
+      def run
+        while @etcd.watch(@config[:haproxy_cfg]) do
+
+        end
+      end
+
+      def generate_config
+      end
+
+      def reload_haproxy
+      end
+
     end
   end
 end

data/lib/etcd-tools/watchdog/init.rb

@@ -1,47 +1,42 @@
-require 'ipaddr'
 require 'timeout'
-require 'yaml'
 require 'json'
 require 'time'
-require 'etcd'
 require 'etcd-tools/mixins'
-require 'etcd-tools/watchdog/config'
-require 'etcd-tools/watchdog/logger'
-require 'etcd-tools/watchdog/helpers'
-require 'etcd-tools/watchdog/etcd'
+require 'etcd-tools/watchdog/util/config'
+require 'etcd-tools/watchdog/util/logger'
+require 'etcd-tools/watchdog/util/helpers'
+require 'etcd-tools/watchdog/util/etcd'
 require 'etcd-tools/watchdog/threads/etcd'
 
 module EtcdTools
   module Watchdog
     class Init
 
-      include EtcdTools::Watchdog::Config
-      include EtcdTools::Watchdog::Logger
-      include EtcdTools::Watchdog::Helpers
-      include EtcdTools::Watchdog::Etcd
+      include EtcdTools::Watchdog::Util::Config
+      include EtcdTools::Watchdog::Util::Logger
+      include EtcdTools::Watchdog::Util::Helpers
+      include EtcdTools::Watchdog::Util::Etcd
       include EtcdTools::Watchdog::Threads
 
       def initialize
-        @semaphore = {
-          log: Mutex.new,
-          etcd: Mutex.new
-        }
         @config = { debug: false }
         @config = config
         @exit = false
-        # handle various signals
         @exit_sigs = ['INT', 'TERM']
         @exit_sigs.each { |sig| Signal.trap(sig) { @exit = true } }
         Signal.trap('USR1') { @config[:debug] = false }
         Signal.trap('USR2') { @config[:debug] = true }
-        Signal.trap('HUP') { @config = config }
+        Signal.trap('HUP')  { @config = config }
+      end
+
+      def setup(proc_name, nice = -20)
         if RUBY_VERSION >= '2.1'
-          Process.setproctitle('etcd-vip-watchdog')
+          Process.setproctitle(proc_name)
         else
-          $0 = 'etcd-vip-watchdog'
+          $0 = proc_name
         end
-        # Process.setpriority(Process::PRIO_PROCESS, 0, -20)
-        # Process.daemon
+        Process.setpriority(Process::PRIO_PROCESS, 0, nice)
+        # TODO: Process.daemon ...
       end
     end
   end

data/lib/etcd-tools/watchdog/threads/icmp.rb

@@ -1,3 +1,5 @@
+require 'net/ping'
+
 module EtcdTools
   module Watchdog
     module Threads

data/lib/etcd-tools/watchdog/util/config.rb

@@ -0,0 +1,43 @@
+require 'yaml'
+require 'etcd-tools/mixins'
+
+module EtcdTools
+  module Watchdog
+    module Util
+      module Config
+        private
+        def default_config
+          { debug: false,
+            parameters: { interface: 'eth0',
+                          vip: '192.168.0.168',
+                          mask: '255.255.255.0',
+                          interval: 1,
+                          etcd_endpoint: 'http://127.0.0.1:4001',
+                          etcd_interval: 1,
+                          etcd_timeout: 5,
+                          icmp_count: 2,
+                          icmp_interval: 1,
+                          arping_count: 1,
+                          arping_wait: 1 },
+            commands: { arping: `which arping`.chomp,
+                        iproute: `which ip`.chomp,
+                        arp: `which arp`.chomp } }
+        end
+
+        def config
+          cfg = default_config
+          if File.exist? '/etc/etcd-watchdog.yaml'
+            cfg = cfg.deep_merge YAML.load_file('/etc/etcd-watchdog.yaml')
+            puts 'loaded config from /etc/etcd-watchdog.yaml'
+          elsif File.exist? './etcd-watchdog.yaml'
+            cfg = cfg.deep_merge YAML.load_file('./etcd-watchdog.yaml')
+            puts 'loaded config from ./etcd-watchdog.yaml'
+          else
+            puts 'no config file loaded, using defaults'
+          end
+          cfg
+        end
+      end
+    end
+  end
+end

data/lib/etcd-tools/watchdog/util/etcd.rb

@@ -0,0 +1,34 @@
+require 'etcd'
+
+module EtcdTools
+  module Watchdog
+    module Util
+      module Etcd
+        # connect to ETCD
+        def etcd_connect!
+          (host, port) = @config[:parameters][:etcd_endpoint].gsub(/^https?:\/\//, '').gsub(/\/$/, '').split(':')
+          etcd = ::Etcd.client(host: host, port: port)
+          begin
+            versions = JSON.parse(etcd.version)
+            info "<etcd> conncted to ETCD at #{@config[:parameters][:etcd_endpoint]}"
+            info "<etcd> server version: #{versions['etcdserver']}"
+            info "<etcd> cluster version: #{versions['etcdcluster']}"
+            info "<etcd> healthy: #{etcd.healthy?}"
+            return etcd
+          rescue Exception => e
+            err "<etcd> couldn't connect to etcd at #{host}:#{port}"
+            err "<etcd> #{e.message}"
+            @exit = true
+          end
+        end
+
+        # is my ETCD the leader?
+        # <IMPLEMENTED>
+        def leader?(etcd)
+          etcd.stats(:self)['id'] == etcd.stats(:self)['leaderInfo']['leader']
+        end
+
+      end
+    end
+  end
+end

data/lib/etcd-tools/watchdog/util/helpers.rb

@@ -0,0 +1,25 @@
+require 'socket'
+
+module EtcdTools
+  module Watchdog
+    module Util
+      module Helpers
+        def hostname
+          @hostname ||= Socket.gethostname
+        end
+
+        def arping
+          @config[:commands][:arping]
+        end
+
+        def iproute
+          @config[:commands][:iproute]
+        end
+
+        def arp
+          @config[:commands][:arp]
+        end
+      end
+    end
+  end
+end

data/lib/etcd-tools/watchdog/util/logger.rb

@@ -0,0 +1,44 @@
+require 'logger'
+
+module EtcdTools
+  module Watchdog
+    module Util
+      module Logger
+        def info(message)
+          if @config[:debug]
+            @semaphore[:log].synchronize do
+              $stdout.puts(Time.now.to_s + ' INFO  (TID:' + Thread.current.object_id.to_s + ') ' + message.to_s)
+              $stdout.flush
+            end
+          else
+            @semaphore[:log].synchronize do
+              $stdout.puts(Time.now.to_s + ' INFO  ' + message.to_s)
+              $stdout.flush
+            end
+          end
+        end
+
+        def err(message)
+          if @config[:debug]
+            @semaphore[:log].synchronize do
+              $stdout.puts(Time.now.to_s + ' ERROR (TID:' + Thread.current.object_id.to_s + ') ' + message.to_s)
+              $stdout.flush
+            end
+          else
+            @semaphore[:log].synchronize do
+              $stdout.puts(Time.now.to_s + ' ERROR ' + message.to_s)
+              $stdout.flush
+            end
+          end
+        end
+
+        def debug(message)
+          @semaphore[:log].synchronize do
+            $stdout.puts(Time.now.to_s + ' DEBUG (TID:' + Thread.current.object_id.to_s + ') ' + message.to_s)
+            $stdout.flush
+          end if @config[:debug]
+        end
+      end
+    end
+  end
+end

data/lib/etcd-tools/watchdog/vip.rb

@@ -1,6 +1,85 @@
+require 'ipaddr'
+require 'etcd-tools/watchdog/init'
+require 'etcd-tools/watchdog/threads/icmp'
+
 module EtcdTools
   module Watchdog
-    module Vip
+    class Vip < EtcdTools::Watchdog::Init
+
+      def run
+        if Process.euid != 0
+          $stderr.puts 'Must run under root user!'
+          exit! 1
+        end
+        setup
+        @semaphore = {
+          log: Mutex.new,
+          etcd: Mutex.new,
+          icmp: Mutex.new
+        }
+        @thread = { icmp: thread_icmp, etcd: thread_etcd }
+        @status_etcd = false
+        @status_icmp = false
+        @thread.each_value(&:run)
+        sleep @config[:parameters][:interval]
+        first_cycle = true
+        while !@exit do
+          status_etcd = status_icmp = false # FIXME: introduce CVs...
+          @semaphore[:icmp].synchronize { status_icmp = @status_icmp }
+          @semaphore[:etcd].synchronize { status_etcd = @status_etcd }
+          if status_etcd
+            if got_vip?
+              debug '<main> i am the leader with VIP, that is OK'
+            else
+              info '<main> i am the leader without VIP, checking whether it is free'
+              if status_icmp
+                info '<main> VIP is still up! (ICMP)'
+                # FIXME: notify by sensu client socket
+              else
+                info '<main> VIP is unreachable by ICMP, checking for duplicates on L2'
+                if vip_dup?
+                  info '<main> VIP is still assigned! (ARP)'
+                  # FIXME: notify by sensu client socket
+                else
+                  info '<main> VIP is free, assigning'
+                  vip_handle! status_etcd
+                  info '<main> updating other hosts about change'
+                  vip_update_arp!
+                end
+              end
+            end
+          else
+            if got_vip?
+              info '<main> i got VIP and should not, removing'
+              vip_handle! status_etcd
+              info '<main> updating other hosts about change'
+              vip_update_arp!
+            else
+              debug '<main> i am not a leader and i do not have the VIP, that is OK'
+            end
+          end
+          sleep @config[:parameters][:interval]
+          if first_cycle
+            @semaphore[:icmp].synchronize { status_icmp = @status_icmp }
+            @semaphore[:etcd].synchronize { status_etcd = @status_etcd }
+            info "<main> i #{status_etcd ? 'AM' : 'am NOT'} the leader"
+            info "<main> i #{got_vip? ? 'DO' : 'do NOT'} have the VIP"
+            info "<main> i #{status_icmp ? 'CAN' : 'CANNOT'} see the VIP"
+          end
+          first_cycle = false
+        end
+        info '<main> terminated!'
+        if got_vip?
+          info '<main> removing VIP'
+          vip_handle! false
+          vip_update_arp!
+        end
+        info '<main> stopping threads...'
+        @thread.each_value(&:join)
+        info '<main> exiting...'
+        exit 0
+      end
+
       # add or remove VIP on interface
       # <IMPLEMENTED>
       def vip_handle!(leader)
@@ -16,17 +95,12 @@ module EtcdTools
                 @config[:parameters][:interface] + '-vip',
                 '>/dev/null 2>&1'
               ]
-        case leader
-        when true
-          cmd[2] = 'add'
-        when false
-          cmd[2] = 'delete'
-        end
-        debug "CMD #{cmd.join(' ')}"
+        leader ? cmd[2] = 'add' : cmd[2] = 'delete'
+        debug "<shell> #{cmd.join(' ')}"
         if system(cmd.join(' '))
-          info "IP '#{cmd[2]}' operation done"
+          return true
         else
-          err "IP '#{cmd[2]}' operation failed"
+          return false
         end
       end
 
@@ -37,12 +111,10 @@ module EtcdTools
                 '-c', @config[:parameters][:arping_count],
                 '-I', @config[:parameters][:interface],
                 @config[:parameters][:vip] ]
-        debug "CMD #{cmd.join(' ')}"
+        debug "<shell> #{cmd.join(' ')}"
         if system(cmd.join(' '))
-          info 'gratuitous ARP packet sent'
           return true
         else
-          err 'gratuitous ARP packet failed to send'
           return false
         end
       end
@@ -60,7 +132,7 @@ module EtcdTools
                 '-q',
                 "#{@config[:parameters][:interface]}-vip"
               ]
-        debug "CMD #{cmd.join(' ')}"
+        debug "<shell> #{cmd.join(' ')}"
         if system(cmd.join(' '))
           return true
         else
@@ -84,9 +156,9 @@ module EtcdTools
                         '-w', @config[:parameters][:arping_wait],
                         '-I', @config[:parameters][:interface],
                         @config[:parameters][:vip] ]
-        debug "CMD #{cmd_arp.join(' ')}"
+        debug "<shell> #{cmd_arp.join(' ')}"
         system(cmd_arp.join(' '))
-        debug "CMD #{cmd_arping.join(' ')}"
+        debug "<shell> #{cmd_arping.join(' ')}"
         if system(cmd_arping.join(' '))
           return false
         else

data/lib/etcd_tools.rb

@@ -1,3 +1,8 @@
 module EtcdTools
+  module Cli
+  end
+
+  module Watchdog
+  end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: etcd-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Radek 'blufor' Slavicinsky
@@ -50,10 +50,12 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.7.8
-description: A set of handful CLIE ETCD tools, part of PortAuthority
+description: A set of handful daemons and command-line utils for ETCD (is part of
+  PortAuthority)
 email: radek.slavicinsky@gmail.com
 executables:
 - etcd-watchdog-haproxy
+- etcd2yaml
 - etcd-watchdog-vip
 - etcd-erb
 - yaml2etcd
@@ -63,27 +65,25 @@ files:
 - bin/etcd-erb
 - bin/etcd-watchdog-haproxy
 - bin/etcd-watchdog-vip
+- bin/etcd2yaml
 - bin/yaml2etcd
-- lib/etcd-tools/etcd_erb.rb
-- lib/etcd-tools/etcd_erb/erb.rb
-- lib/etcd-tools/etcd_erb/options.rb
-- lib/etcd-tools/etcd_watchdog_haproxy.rb
-- lib/etcd-tools/etcd_watchdog_vip.rb
+- lib/etcd-tools/cli/etcd2yaml.rb
+- lib/etcd-tools/cli/etcd_erb.rb
+- lib/etcd-tools/cli/yaml2etcd.rb
+- lib/etcd-tools/erb.rb
+- lib/etcd-tools/etcd.rb
 - lib/etcd-tools/mixins.rb
-- lib/etcd-tools/watchdog/config.rb
-- lib/etcd-tools/watchdog/etcd.rb
 - lib/etcd-tools/watchdog/haproxy.rb
-- lib/etcd-tools/watchdog/helpers.rb
 - lib/etcd-tools/watchdog/init.rb
-- lib/etcd-tools/watchdog/logger.rb
 - lib/etcd-tools/watchdog/threads/etcd.rb
 - lib/etcd-tools/watchdog/threads/icmp.rb
+- lib/etcd-tools/watchdog/util/config.rb
+- lib/etcd-tools/watchdog/util/etcd.rb
+- lib/etcd-tools/watchdog/util/helpers.rb
+- lib/etcd-tools/watchdog/util/logger.rb
 - lib/etcd-tools/watchdog/vip.rb
-- lib/etcd-tools/yaml2etcd.rb
-- lib/etcd-tools/yaml2etcd/import.rb
-- lib/etcd-tools/yaml2etcd/options.rb
 - lib/etcd_tools.rb
-homepage: http://rubygems.org/gems/etcd-tools
+homepage: https://github.com/blufor/etcd-tools
 licenses:
 - GPLv2
 metadata: {}
@@ -106,5 +106,5 @@ rubyforge_project:
 rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
-summary: CLI ETCD tools
+summary: ETCD tools
 test_files: []

data/lib/etcd-tools/etcd_erb/erb.rb

@@ -1,26 +0,0 @@
-module EtcdTools
-  module EtcdERB
-    module Erb
-      def result
-        super binding
-      end
-
-      def value path
-        return @etcd.get('/' + path.sub(/^\//, '')).value
-      end
-
-      def keys path
-        path.sub!(/^\//, '')
-        if @etcd.get('/' + path).directory?
-          return @etcd.get('/' + path).children.map { |key| key.key }
-        else
-          return []
-        end
-      end
-
-      def template
-        ARGF.read
-      end
-    end
-  end
-end

data/lib/etcd-tools/etcd_erb.rb

@@ -1,38 +0,0 @@
-require 'yaml'
-require 'erb'
-require 'etcd'
-require 'etcd-tools/etcd_erb/options'
-require 'etcd-tools/etcd_erb/erb'
-
-module EtcdTools
-  class EtcdERB < ERB
-
-    include EtcdTools::EtcdERB::Options
-    include EtcdTools::EtcdERB::Erb
-
-    attr_reader :etcd
-
-    def initialize
-      self.optparse
-      @etcd = self.class.connect(@options[:url])
-      super self.class.template
-      puts self.result
-    end
-
-    class << self
-      def connect (url)
-        (host, port) = url.gsub(/^https?:\/\//, '').gsub(/\/$/, '').split(':')
-        etcd = Etcd.client(host: host, port: port)
-        begin
-          etcd.version
-          return etcd
-        rescue Exception => e
-          $stderr.puts "Couldn't connect to etcd at #{host}:#{port}"
-          $stderr.puts e.message
-          exit! 1
-        end
-      end
-    end
-
-  end
-end

data/lib/etcd-tools/etcd_watchdog_haproxy.rb

@@ -1,20 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'net/ping'
-
-module EtcdTools
-  module Watchdog
-    class HAproxy < EtcdTools::Watchdog::Init
-
-      include EtcdTools::Watchdog::HAproxy
-
-      def run
-        @thread = {
-          etcd: thread_etcd
-        }
-        @status_etcd = false
-      end
-
-    end
-  end
-end

data/lib/etcd-tools/etcd_watchdog_vip.rb

@@ -1,82 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'net/ping'
-require 'etcd-tools/watchdog/init'
-require 'etcd-tools/watchdog/vip'
-require 'etcd-tools/watchdog/threads/icmp'
-
-module EtcdTools
-  class VipWatchdog < EtcdTools::Watchdog::Init
-
-    include EtcdTools::Watchdog::Vip
-
-    def run
-      if Process.euid != 0
-        err 'Must run under root user!'
-        exit! 1
-      end
-      @semaphore.merge!({ icmp: Mutex.new })
-      @thread = { icmp: thread_icmp, etcd: thread_etcd }
-      @status_etcd = false
-      @status_icmp = false
-      @thread.each_value(&:run)
-      sleep @config[:parameters][:interval]
-      first_cycle = true
-      while !@exit do
-        status_etcd = status_icmp = false # FIXME: introduce CVs...
-        @semaphore[:icmp].synchronize { status_icmp = @status_icmp }
-        @semaphore[:etcd].synchronize { status_etcd = @status_etcd }
-        if status_etcd
-          if got_vip?
-            debug '<main> i am the leader with VIP, that is OK'
-          else
-            info '<main> i am the leader without VIP, checking whether it is free'
-            if status_icmp
-              info '<main> VIP is still up! (ICMP)'
-              # FIXME: notify by sensu client socket
-            else
-              info '<main> VIP is unreachable by ICMP, checking for duplicates on L2'
-              if vip_dup?
-                info '<main> VIP is still assigned! (ARP)'
-                # FIXME: notify by sensu client socket
-              else
-                info '<main> VIP is free, assigning'
-                vip_handle! status_etcd
-                info '<main> updating other hosts about change'
-                vip_update_arp!
-              end
-            end
-          end
-        else
-          if got_vip?
-            info '<main> i got VIP and should not, removing'
-            vip_handle! status_etcd
-            info '<main> updating other hosts about change'
-            vip_update_arp!
-          else
-            debug '<main> i am not a leader and i do not have the VIP, that is OK'
-          end
-        end
-        sleep @config[:parameters][:interval]
-        if first_cycle
-          @semaphore[:icmp].synchronize { status_icmp = @status_icmp }
-          @semaphore[:etcd].synchronize { status_etcd = @status_etcd }
-          info "<main> i #{status_etcd ? 'AM' : 'am NOT'} the leader"
-          info "<main> i #{got_vip? ? 'DO' : 'do NOT'} have the VIP"
-          info "<main> i #{status_icmp ? 'CAN' : 'CANNOT'} see the VIP"
-        end
-        first_cycle = false
-      end
-      info '<main> terminated!'
-      if got_vip?
-        info '<main> removing VIP'
-        vip_handle! false
-        vip_update_arp!
-      end
-      info '<main> stopping threads...'
-      @thread.each_value(&:join)
-      info '<main> exiting...'
-      exit 0
-    end
-  end
-end

data/lib/etcd-tools/watchdog/config.rb

@@ -1,38 +0,0 @@
-module EtcdTools
-  module Watchdog
-    module Config
-      private
-      def default_config
-        { debug: false,
-          parameters: { interface: 'eth0',
-                        vip: '192.168.0.168',
-                        mask: '255.255.255.0',
-                        interval: 1,
-                        etcd_endpoint: 'http://127.0.0.1:4001',
-                        etcd_interval: 1,
-                        etcd_timeout: 5,
-                        icmp_count: 2,
-                        icmp_interval: 1,
-                        arping_count: 1,
-                        arping_wait: 1 },
-          commands: { arping: `which arping`.chomp,
-                      iproute: `which ip`.chomp,
-                      arp: `which arp`.chomp } }
-      end
-
-      def config
-        cfg = default_config
-        if File.exist? '/etc/etcd-watchdog.yaml'
-          cfg = cfg.deep_merge YAML.load_file('/etc/etcd-watchdog.yaml')
-          info '<main> loaded config from /etc/etcd-watchdog.yaml'
-        elsif File.exist? './etcd-watchdog.yaml'
-          cfg = cfg.deep_merge YAML.load_file('./etcd-watchdog.yaml')
-          info '<main> loaded config from ./etcd-watchdog.yaml'
-        else
-          info '<main> no config file loaded, using defaults'
-        end
-        cfg
-      end
-    end
-  end
-end

data/lib/etcd-tools/watchdog/etcd.rb

@@ -1,30 +0,0 @@
-module EtcdTools
-  module Watchdog
-    module Etcd
-      # connect to ETCD
-      def etcd_connect!
-        (host, port) = @config[:parameters][:etcd_endpoint].gsub(/^https?:\/\//, '').gsub(/\/$/, '').split(':')
-        etcd = ::Etcd.client(host: host, port: port)
-        begin
-          versions = JSON.parse(etcd.version)
-          info "<etcd> conncted to ETCD at #{@config[:parameters][:etcd_endpoint]}"
-          info "<etcd> server version: #{versions['etcdserver']}"
-          info "<etcd> cluster version: #{versions['etcdcluster']}"
-          info "<etcd> healthy: #{etcd.healthy?}"
-          return etcd
-        rescue Exception => e
-          err "<etcd> couldn't connect to etcd at #{host}:#{port}"
-          err "<etcd> #{e.message}"
-          @exit = true
-        end
-      end
-
-      # is my ETCD the leader?
-      # <IMPLEMENTED>
-      def leader?(etcd)
-        etcd.stats(:self)['id'] == etcd.stats(:self)['leaderInfo']['leader']
-      end
-
-    end
-  end
-end

data/lib/etcd-tools/watchdog/helpers.rb

@@ -1,23 +0,0 @@
-require 'socket'
-
-module EtcdTools
-  module Watchdog
-    module Helpers
-      def hostname
-        @hostname ||= Socket.gethostname
-      end
-
-      def arping
-        @config[:commands][:arping]
-      end
-
-      def iproute
-        @config[:commands][:iproute]
-      end
-
-      def arp
-        @config[:commands][:arp]
-      end
-    end
-  end
-end

data/lib/etcd-tools/watchdog/logger.rb

@@ -1,42 +0,0 @@
-require 'logger'
-
-module EtcdTools
-  module Watchdog
-    module Logger
-      def info(message)
-        if @config[:debug]
-          @semaphore[:log].synchronize do
-            $stdout.puts(Time.now.to_s + ' INFO  (TID:' + Thread.current.object_id.to_s + ') ' + message.to_s)
-            $stdout.flush
-          end
-        else
-          @semaphore[:log].synchronize do
-            $stdout.puts(Time.now.to_s + ' INFO  ' + message.to_s)
-            $stdout.flush
-          end
-        end
-      end
-
-      def err(message)
-        if @config[:debug]
-          @semaphore[:log].synchronize do
-            $stdout.puts(Time.now.to_s + ' ERROR (TID:' + Thread.current.object_id.to_s + ') ' + message.to_s)
-            $stdout.flush
-          end
-        else
-          @semaphore[:log].synchronize do
-            $stdout.puts(Time.now.to_s + ' ERROR ' + message.to_s)
-            $stdout.flush
-          end
-        end
-      end
-
-      def debug(message)
-        @semaphore[:log].synchronize do
-          $stdout.puts(Time.now.to_s + ' DEBUG (TID:' + Thread.current.object_id.to_s + ') ' + message.to_s)
-          $stdout.flush
-        end if @config[:debug]
-      end
-    end
-  end
-end

data/lib/etcd-tools/yaml2etcd/import.rb

@@ -1,23 +0,0 @@
-module EtcdTools
-  module Yaml2Etcd
-    module Methods
-      def import_structure (hash, path="")
-        begin
-          hash.each do |k, v|
-            etcd_key = path + "/" + k.to_s
-            case v
-            when Hash
-              import_structure(v, etcd_key)
-            else
-              @etcd.set(etcd_key, value: v)
-              puts("SET: " + etcd_key + ": " + v.to_json) if @options[:verbose]
-            end
-          end
-        rescue Exception => e
-          $stderr.puts "Configuration import failed"
-          $stderr.puts e.message
-          exit! 1
-        end
-      end
-    end
-  end

data/lib/etcd-tools/yaml2etcd.rb

@@ -1,44 +0,0 @@
-require 'yaml'
-require 'etcd'
-require_relative 'etcd_tools/yaml2etcd/options'
-require_relative 'etcd_tools/yaml2etcd/import'
-
-module EtcdTools
-  class Yaml2Etcd
-
-    include EtcdTools::Yaml2Etcd::Options
-    include EtcdTools::Yaml2Etcd::Import
-
-    def initialize
-      self.optparse
-      @etcd = self.class.connect(@options[:url], @options[:verbose])
-      @hash = self.class.read_yaml
-      import_structure @hash, @options[:root_path]
-    end
-
-    class << self
-      def read_yaml
-        begin
-          return YAML.load(ARGF.read)
-        rescue
-          $stderr.puts "Couldn't parse YAML"
-          exit! 1
-        end
-      end
-
-      def connect (url, verbose=false)
-        (host, port) = url.gsub(/^https?:\/\//, '').gsub(/\/$/, '').split(':')
-        etcd = Etcd.client(host: host, port: port)
-        begin
-          etcd.version
-          puts "Connected to ETCD on #{host}:#{port}" if verbose
-          return etcd
-        rescue Exception => e
-          $stderr.puts "Couldn't connect to etcd at #{host}:#{port}"
-          $stderr.puts e.message
-          exit! 1
-        end
-      end
-    end
-
-end