elbping 0.0.13 → 0.0.14

data/README.md

@@ -31,7 +31,6 @@ something like the following will work:
 ```
   $ elbping
   Usage: ./bin/elbping [options] <elb uri>
-      -N, --nameserver NAMESERVER      Use NAMESERVER to perform DNS queries (default: ns-941.amazon.com)
       -L, --verb-length LENGTH         Use verb LENGTH characters long (default: 128)
       -W, --timeout SECONDS            Use timeout of SECONDS for HTTP requests (default: 10)
       -w, --wait SECONDS               Wait SECONDS between pings (default: 0)
@@ -52,7 +51,7 @@ something like the following will work:
   4 requests, 4 responses, 0% loss
   min/avg/max = 188/189/192 ms
   --- total statistics ---
-  8 requests, 8 responses, 0% loss
+  8 requests, 8 responses, 0% loss, 2 nodes
   min/avg/max = 188/189/192 ms
 ```
 
@@ -64,7 +63,6 @@ enviromment variables are checked and, if no command line argument
 overrides it, its value is used in place of the default:
 
 * ``PING_ELB_VERBLEN`` - Size of the HTTP verb to use when pinging an ELB
-* ``PING_ELB_NS`` - DNS server to query the list of ELB nodes from
 * ``PING_ELB_PINGCOUNT`` - The number of pings to send before exiting.  Zero means never quit.
 * ``PING_ELB_TIMEOUT`` - The connect and read timeouts to use when sending the request to the ELB node (in seconds)
 * ``PING_ELB_WAIT`` - The amount of time (in seconds) to wait between volleys of pings

data/elbping.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'elbping'
-  s.version       = '0.0.13'
+  s.version       = '0.0.14'
   s.date          = '2013-08-13'
   s.summary       = "Small tool to 'ping' the nodes that make up an Amazon Elastic Load Balancer"
   s.description   = "elbping is a tool to ping all of the nodes behind an Amazon Elastic Load Balancer. It only works for ELBs in HTTP mode and works by triggering an HTTP 405 (METHOD NOT ALLOWED) error caused when the ELB receives a HTTP verb that is too long."

data/lib/elbping/cli.rb

@@ -16,7 +16,6 @@ module ElbPing
     # Set up default options
     OPTIONS = {}
     OPTIONS[:verb_len]      = ENV['PING_ELB_VERBLEN']       || 128
-    OPTIONS[:nameserver]    = ENV['PING_ELB_NS']            || 'ns-941.amazon.com'
     OPTIONS[:count]         = ENV['PING_ELB_PINGCOUNT']     || 0
     OPTIONS[:timeout]       = ENV['PING_ELB_TIMEOUT']       || 10
     OPTIONS[:wait]          = ENV['PING_ELB_WAIT']          || 0
@@ -25,10 +24,6 @@ module ElbPing
     PARSER = OptionParser.new do |opts|
       opts.banner = "Usage: #{$0} [options] <elb uri>"
 
-      opts.on("-N NAMESERVER", "--nameserver NAMESERVER",
-        "Use NAMESERVER to perform DNS queries (default: #{OPTIONS[:nameserver]})") do |ns|
-        OPTIONS[:nameserver] = ns
-      end
       opts.on("-L LENGTH", "--verb-length LENGTH", Integer,
         "Use verb LENGTH characters long (default: #{OPTIONS[:verb_len]})") do |n|
         OPTIONS[:verb_len] = n
@@ -88,11 +83,10 @@ module ElbPing
       # Discover ELB nodes
       #
       # TODO: Perhaps some retry logic
-      nameserver = OPTIONS[:nameserver]
       begin
-        nodes = ElbPing::Resolver.find_elb_nodes elb_uri.host, nameserver
+        nodes = ElbPing::Resolver.find_elb_nodes elb_uri.host
       rescue StandardError => e
-        ElbPing::Display.error "Unable to query DNS for #{elb_uri.host} using #{nameserver}"
+        ElbPing::Display.error "Unable to query DNS for #{elb_uri.host}"
         ElbPing::Display.debug e
         exit(false)
       end

data/lib/elbping/display.rb

@@ -28,6 +28,7 @@ module ElbPing
 
     def self.debug(exception)
       if ENV["DEBUG"]
+        self.out "DEBUG: #{exception.message}"
         self.out "DEBUG: #{exception.backtrace}"
       end
     end
@@ -67,7 +68,7 @@ module ElbPing
 
       loss_pct = (stats.total_loss * 100).to_i
       self.out '--- total statistics ---'
-      self.out "#{stats.total[:requests]} requests, #{stats.total[:responses]} responses, #{loss_pct}% loss"
+      self.out "#{stats.total[:requests]} requests, #{stats.total[:responses]} responses, #{loss_pct}% loss, #{stats.nodes.size} nodes"
       self.out "min/avg/max = #{stats.total[:latencies].min}/#{stats.total[:latencies].mean}/#{stats.total[:latencies].max} ms"
     end
   end

data/lib/elbping/resolver.rb

@@ -2,24 +2,68 @@
 require 'resolv'
 require 'elbping/tcp_dns.rb'
 
+# TODO: Raise own exceptions
+
 module ElbPing
   # Handles all DNS resolution and, more specifically, ELB node discovery
   module Resolver
 
+    # Find addresses authoritative DNS server
+    #
+    # Arguments:
+    #   target: (string) ELB hostname
+    #   timeout: (fixnum) in seconds
+    #
+    # Could raise:
+    # * Timeout::Error
+    # * ArgumentError
+
+    def self.find_elb_ns(target, timeout=5)
+      resp = nil
+
+      unless target.end_with? ".elb.amazonaws.com"
+        raise ArgumentError, "Not an Amazon ELB hostname"
+      end
+
+      Timeout::timeout(timeout) do
+        Resolv::DNS.open do |sysdns|
+          resp = sysdns.getresources target, Resolv::DNS::Resource::IN::NS
+          unless resp
+            raise ArgumentError, "Could not find Amazon nameserver for ELB"
+          end
+        end
+        nameservers = resp.map { |ns| ns.name.to_s }
+      end
+    end
+
     # Resolve an ELB address to a list of node IPs. Should always return a list
     # as long as the server responded, even if it's empty.
     #
     # Arguments:
     #   target: (string)
-    #   nameservers: (array) of strings
     #   timeout: (fixnum)
     #
     # Could raise:
     # * Timeout::Error
-    # * ?
+    # * ArgumentError
+
+    def self.find_elb_nodes(target, timeout=5)
+      raise ArgumentError, "Could not query DNS" if target.nil?
 
-    def self.find_elb_nodes(target, nameservers, timeout=5)
       resp = nil
+
+      unless target.end_with? ".elb.amazonaws.com"
+        Timeout::timeout(timeout) do 
+          Resolv::DNS.open do |sysdns|
+            resp = sysdns.getresources target, Resolv::DNS::Resource::IN::CNAME
+            cname = resp[0].name.to_s if resp and resp.size > 0
+            return find_elb_nodes(cname, timeout)
+          end
+        end
+      end
+
+      nameservers = find_elb_ns target, timeout
+
       Timeout::timeout(timeout) do 
         TcpDNS.open :nameserver => nameservers, :search => '', :ndots => 1 do |dns|
           # TODO: Exceptions

data/test/test_resolver.rb

@@ -2,18 +2,14 @@
 require 'test/unit'
 require 'elbping/resolver.rb'
 
-DEFAULT_NS = ENV['TEST_NS'] || 'ns-941.amazon.com'
 DEFAULT_GOOD_ELB = ENV['TEST_GOOD_ELB'] || 'test-elb-868888812.us-east-1.elb.amazonaws.com' # feels dirty
 
 class TestResolver< Test::Unit::TestCase
   def test_bad_queries
     ["fake.amazonaws.com", "google.com", "nxdomain.asdf"].each { |tgt|
-      assert_equal [], ElbPing::Resolver.find_elb_nodes(tgt, DEFAULT_NS)
-
-      # I think something internal to Resolv is returning nil in tcp mode
-      #assert_raise Timeout::Error do
-      #  ElbPing::Resolver.find_elb_nodes(tgt, DEFAULT_NS)
-      #end
+      assert_raise ArgumentError do
+        ElbPing::Resolver.find_elb_nodes(tgt)
+      end
     }
   end
 
@@ -21,7 +17,7 @@ class TestResolver< Test::Unit::TestCase
   def test_good_query
     resp = nil
     assert_nothing_raised do
-      resp = ElbPing::Resolver.find_elb_nodes(DEFAULT_GOOD_ELB, DEFAULT_NS)
+      resp = ElbPing::Resolver.find_elb_nodes(DEFAULT_GOOD_ELB)
     end
     # I don't actually care what the results are, only that they are a list
     assert_equal resp.class, Array

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elbping
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
   prerelease: 
 platform: ruby
 authors: