ring-sqa 0.0.20 → 0.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: caa9122c18e3a803a62729778308c5af962fdfab
-  data.tar.gz: 877437aef04803f4baf0f9603e938f46b886445d
+  metadata.gz: 6768fa2c6c13c430f0f704ded317746fccce1aa9
+  data.tar.gz: f136b1e93986fc855081a347fd5ef8647b75ff6c
 SHA512:
-  metadata.gz: b0fde0350ff73add7549347cb05b493a01bdb98f8cac9669616c10c4c53045ac32ed8e4e52c63654d1470810bf50d1260556503b0bc95376a1648b67fc2f290a
-  data.tar.gz: bded7fb091e59c8706412efabe163ccb7e72516fe6feaf0ef6b9eeb1a469561d7afe05f1da09a32fed4b34e5d82752fabf777e6706f4ccfd1b75a9fa04811756
+  metadata.gz: 41b8e6ad533c6be0771fb467ddae3cc23c431e5a91c3fd03a2cd3cb0ecd7205a1e09b3f0488103468593623dffc05c0aee2ada8f5047bd162b584b68f8f31987
+  data.tar.gz: aacca386783c1df76ca9226a243e701ef6bc7af86d5f6730d6dd925296ac98ee41f1806bc0e3200f3fa9865a13c41d14e031ca78b30e1e30a6e33173393e0ef8

data/lib/ring/sqa/alarm/message.rb

@@ -4,7 +4,7 @@ class SQA
   class Alarm
     def message nodes_list, mtr_list, buffer_list
 "
-Regarding: #{Ring::SQA::CFG.host.name}
+Regarding: #{Ring::SQA::CFG.host.name} #{Ring::SQA::CFG.afi}
 
 This is an automated alert from the distributed partial outage
 monitoring system 'RING SQA'.

data/lib/ring/sqa/alarm.rb

@@ -36,12 +36,13 @@ class SQA
       @methods  << Email.new   if CFG.email.to?
       @methods  << UDP2IRC.new if CFG.irc.password?
       @hostname = Ring::SQA::CFG.host.name
+      @afi      = Ring::SQA::CFG.afi
       @alarm    = false
     end
 
     def compose_message alarm_buffer
       exceeding_nodes = alarm_buffer.exceeding_nodes
-      msg = {short: "#{@hostname}: raising alarm - #{exceeding_nodes.size} new nodes down"}
+      msg = {short: "#{@hostname}: raising #{@afi} alarm - #{exceeding_nodes.size} new nodes down"}
       exceeding_nodes = exceeding_nodes.map { |node| @nodes.get node }
 
       nodes_list = ''

data/lib/ring/sqa/analyzer.rb

@@ -39,10 +39,11 @@ class SQA
   class AnalyzeBuffer
     attr_reader :array
     def initialize nodes_count, max_size=30, median_of=27
-      @max_size  = max_size
-      @median_of = median_of
-      init_nodes = Array.new nodes_count * 2, ''
-      @array     = Array.new max_size, init_nodes
+      @max_size   = max_size
+      @median_of  = median_of
+      nodes_count = CFG.fake? ? 0 : nodes_count
+      init_nodes  = Array.new nodes_count * 2, ''
+      @array      = Array.new max_size, init_nodes
     end
     def push e
       @array.shift

data/lib/ring/sqa/cli.rb

@@ -22,7 +22,8 @@ class SQA
     def initialize
       _args, @opts = opts_parse
       CFG.debug = @opts.debug?
-      CFG.ipv6  = @opts.ipv6?
+      CFG.afi = @opts.ipv6? ? "ipv6" : "ipv4"
+      CFG.fake  = @opts.fake?
       require_relative 'log'
       Log.level = Logger::DEBUG if @opts.debug?
       run
@@ -33,6 +34,7 @@ class SQA
         banner 'Usage: ring-sqad [options]'
         on 'd', '--debug', 'turn on debugging'
         on '6', '--ipv6',  'use ipv6 instead of ipv4'
+        on '--fake',       'initialize analyzebuffer with 0 nodes'
         on '--daemonize',  'run in background'
       end
       [slop.parse!, slop]

data/lib/ring/sqa/database.rb

@@ -43,7 +43,7 @@ class SQA
       if CFG.ram_database?
         @db = Sequel.sqlite sequel_opts
       else
-        file = CFG.ipv6? ? 'ipv6.db' : 'ipv4.db'
+        file = '%s.db' % CFG.afi
         file = File.join CFG.directory, file
         File.unlink file rescue nil # delete old database
         @db = Sequel.sqlite file, sequel_opts

data/lib/ring/sqa/nodes.rb

@@ -46,7 +46,7 @@ class SQA
       nodes = {}
       json = JSON.load File.read(file)
       json['results']['nodes'].each do |node|
-        addr = CFG.ipv6? ? node['ipv6'] : node['ipv4']
+        addr = node[CFG.afi]
         next unless ips.include? addr
         nodes[addr] = node
       end
@@ -70,13 +70,14 @@ class SQA
 
 
     def entry_skip? entry
+      # skip ipv4 entries if we are running in ipv6 mode, and vice versa
       return true unless entry.size > 2
       return true if entry.first.match(/^\s*#/)
       return true if CFG.hosts.ignore.any?   { |re| entry[2].match Regexp.new(re) }
       return true unless CFG.hosts.load.any? { |re| entry[2].match Regexp.new(re) }
 
       address = IPAddr.new(entry.first) rescue (return true)
-      if CFG.ipv6?
+      if CFG.afi == "ipv6"
         return true if address.ipv4?
         return true if address == IPAddr.new(CFG.host.ipv6)
       else

data/lib/ring/sqa/poller.rb

@@ -5,16 +5,15 @@ class SQA
     MAX_READ     = 500
 
     def address
-      #CFG.ipv6? ? CFG.host.ipv6 : CFG.host.ipv4
-      CFG.ipv6? ? '::' : '0.0.0.0' # NAT 1:1 does not have expected address where we can bind
+      CFG.afi == "ipv6" ? '::' : '0.0.0.0' # NAT 1:1 does not have expected address where we can bind
     end
 
     def port
-      CFG.port.to_i
+      CFG.port.to_i + ( CFG.afi == 'ipv6' ? 6 : 0 )
     end
 
     def udp_socket
-      CFG.ipv6? ? UDPSocket.new(Socket::AF_INET6) : UDPSocket.new
+      CFG.afi == "ipv6" ? UDPSocket.new(Socket::AF_INET6) : UDPSocket.new
     end
   end
 

data/ring-sqa.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = 'ring-sqa'
-  s.version           = '0.0.20'
+  s.version           = '0.0.21'
   s.licenses          = %w( Apache-2.0 )
   s.platform          = Gem::Platform::RUBY
   s.authors           = [ 'Saku Ytti', 'Job Snijders' ]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ring-sqa
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.21
 platform: ruby
 authors:
 - Saku Ytti
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-25 00:00:00.000000000 Z
+date: 2014-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop