ring-sqa 0.0.19 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3118fdb4ee6c8ef1701ba4290bdee0c82bcb07db
-  data.tar.gz: 5dc539f039179912322562d3354ceec8b55b99b5
+  metadata.gz: caa9122c18e3a803a62729778308c5af962fdfab
+  data.tar.gz: 877437aef04803f4baf0f9603e938f46b886445d
 SHA512:
-  metadata.gz: bcdfe20771cb15f22135512d9861a7c56b3eafbd185e42f3cdfefa3ed7950f104e3bcda33d3026713a90d5250efba22e3449d02fb1f47cd6023f6e177bcb070e
-  data.tar.gz: eee37b25fb65db3036e90ebc5327c093bbce7f2c67a453e16a8ebc42f5e59e0d1d661b108091812e5e80bb35c3f2d93248747235d0f4bd4f22ebd4f737dedaec
+  metadata.gz: b0fde0350ff73add7549347cb05b493a01bdb98f8cac9669616c10c4c53045ac32ed8e4e52c63654d1470810bf50d1260556503b0bc95376a1648b67fc2f290a
+  data.tar.gz: bded7fb091e59c8706412efabe163ccb7e72516fe6feaf0ef6b9eeb1a469561d7afe05f1da09a32fed4b34e5d82752fabf777e6706f4ccfd1b75a9fa04811756

data/Rakefile

@@ -43,4 +43,5 @@ end
 desc 'Push to rubygems'
 task :push do
   system "gem push gems/#{file}"
+  system "git tag #{gemspec.version}"
 end

data/lib/ring/sqa/alarm.rb

@@ -1,9 +1,9 @@
 require_relative 'alarm/email'
 require_relative 'alarm/udp2irc'
 require_relative 'alarm/cfg'
+require_relative 'alarm/message'
 require_relative 'mtr'
 require_relative 'paste'
-require_relative 'nodes_json'
 
 module Ring
 class SQA
@@ -30,19 +30,19 @@ class SQA
 
     private
 
-    def initialize
+    def initialize nodes
+      @nodes    = nodes
       @methods  = []
       @methods  << Email.new   if CFG.email.to?
       @methods  << UDP2IRC.new if CFG.irc.password?
+      @hostname = Ring::SQA::CFG.host.name
       @alarm    = false
-      @hostname = (Socket.gethostname rescue 'anonymous')
     end
 
     def compose_message alarm_buffer
       exceeding_nodes = alarm_buffer.exceeding_nodes
       msg = {short: "#{@hostname}: raising alarm - #{exceeding_nodes.size} new nodes down"}
-      nodes_json = NodesJSON.new
-      exceeding_nodes = exceeding_nodes.map { |node| nodes_json.get node }
+      exceeding_nodes = exceeding_nodes.map { |node| @nodes.get node }
 
       nodes_list = ''
       exceeding_nodes.sort_by{ |node| node[:cc] }.each do |node|
@@ -64,40 +64,7 @@ class SQA
         time -= 1
       end
 
-      msg[:long] = <<EOF
-Regarding: #{hostname}
-
-This is an automated alert from the distributed partial outage
-monitoring system "RING SQA".
-
-At #{Time.now.utc} the following measurements were analysed
-as indicating that there is a high probability your NLNOG RING node
-cannot reach the entire internet. Possible causes could be an outage
-in your upstream's or peer's network.
-
-The following #{exceeding_nodes.size} nodes previously were reachable, but became unreachable
-over the course of the last 3 minutes:
-
-#{nodes_list}
-
-As a debug starting point 3 traceroutes were launched right after
-detecting the event, they might assist in pinpointing what broke:
-
-#{mtr_list}
-
-An alarm is raised under the following conditions: every 30 seconds
-your node pings all other nodes. The amount of nodes that cannot be
-reached is stored in a circular buffer, with each element representing
-a minute of measurements. In the event that the last three minutes are
-#{Ring::SQA::CFG.analyzer.tolerance} above the median of the previous 27 measurement slots, a partial
-outage is assumed. The ring buffer's output is as following:
-
-#{buffer_list}
-
-Kind regards,
-
-NLNOG RING
-EOF
+      msg[:long] = message nodes_list, mtr_list, buffer_list
       msg
     end
 

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

@@ -0,0 +1,44 @@
+module Ring
+class SQA
+
+  class Alarm
+    def message nodes_list, mtr_list, buffer_list
+"
+Regarding: #{Ring::SQA::CFG.host.name}
+
+This is an automated alert from the distributed partial outage
+monitoring system 'RING SQA'.
+
+At #{Time.now.utc} the following measurements were analysed
+as indicating that there is a high probability your NLNOG RING node
+cannot reach the entire internet. Possible causes could be an outage
+in your upstream's or peer's network.
+
+The following #{nodes_list.size} nodes previously were reachable, but became unreachable
+over the course of the last 3 minutes:
+
+#{nodes_list}
+
+As a debug starting point 3 traceroutes were launched right after
+detecting the event, they might assist in pinpointing what broke:
+
+#{mtr_list}
+
+An alarm is raised under the following conditions: every 30 seconds
+your node pings all other nodes. The amount of nodes that cannot be
+reached is stored in a circular buffer, with each element representing
+a minute of measurements. In the event that the last three minutes are
+#{Ring::SQA::CFG.analyzer.tolerance} above the median of the previous 27 measurement slots, a partial
+outage is assumed. The ring buffer's output is as following:
+
+#{buffer_list}
+
+Kind regards,
+
+NLNOG RING
+"
+    end
+  end
+
+end
+end

data/lib/ring/sqa/analyzer.rb

@@ -30,8 +30,8 @@ class SQA
     def initialize database, nodes
       @db         = database
       @nodes      = nodes
-      @alarm      = Alarm.new
-      @buffer     = AnalyzeBuffer.new @nodes.list.size
+      @alarm      = Alarm.new @nodes
+      @buffer     = AnalyzeBuffer.new @nodes.all.size
       @db_id_seen = 0
     end
   end

data/lib/ring/sqa/cfg.rb

@@ -27,8 +27,9 @@ module Ring
 
     CFG = Config.cfg
 
-    CFG.bind.ipv4 = Socket::getaddrinfo(Socket.gethostname,"echo",Socket::AF_INET)[0][3]
-    CFG.bind.ipv6 = Socket::getaddrinfo(Socket.gethostname,"echo",Socket::AF_INET6)[0][3]
+    CFG.host.name = Socket.gethostname
+    CFG.host.ipv4 = Socket::getaddrinfo(CFG.host.name,"echo",Socket::AF_INET)[0][3]
+    CFG.host.ipv6 = Socket::getaddrinfo(CFG.host.name,"echo",Socket::AF_INET6)[0][3]
 
     raise NoConfig, 'edit /etc/ring-sqa/main.conf' if Config.create
   end

data/lib/ring/sqa/nodes.rb

@@ -1,29 +1,34 @@
 require 'rb-inotify'
 require 'ipaddr'
+require 'json'
 
 module Ring
 class SQA
 
   class Nodes
-    FILE   = '/etc/hosts'
-    attr_reader :list
+    FILE = '/etc/hosts'
+    attr_reader :all
 
     def run
       Thread.new { @inotify.run }
     end
 
+    def get node
+      (@all[node] or {})
+    end
+
     private
 
     def initialize
-      @list = get_list
+      @all = read_nodes
       @inotify = INotify::Notifier.new
       @inotify.watch(File.dirname(FILE), :modify, :create) do |event|
-        @list = get_list if event.name == FILE.split('/').last
+        @all = read_nodes if event.name == FILE.split('/').last
       end
       run
     end
 
-    def get_list
+    def read_nodes
       Log.info "loading #{FILE}"
       list = []
       File.read(FILE).lines.each do |line|
@@ -31,26 +36,55 @@ class SQA
         next if entry_skip? entry
         list << entry.first
       end
-      list.sort
+      nodes_hash list
+    rescue => error
+      Log.warn "#{error.class} raised with message '#{error.message}' while generating nodes list"
+      @all
+    end
+
+    def nodes_hash ips, file=CFG.nodes_json
+      nodes = {}
+      json = JSON.load File.read(file)
+      json['results']['nodes'].each do |node|
+        addr = CFG.ipv6? ? node['ipv6'] : node['ipv4']
+        next unless ips.include? addr
+        nodes[addr] = node
+      end
+      json_to_nodes_hash nodes
     end
 
+    def json_to_nodes_hash from_json
+      nodes= {}
+      from_json.each do |ip, json|
+        node = {
+          name: json['hostname'],
+          ip:   ip,
+          as:   json['asn'],
+          cc:   json['countrycode'],
+        }
+        next if CFG.host.name == node[:name]
+        nodes[ip] = node
+      end
+      nodes
+    end
+
+
     def entry_skip? entry
       return true unless entry.size > 2
-      return true if entry.first.match /^\s*#/
+      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?
         return true if address.ipv4?
-        return true if address == IPAddr.new(CFG.bind.ipv6)
+        return true if address == IPAddr.new(CFG.host.ipv6)
       else
         return true if address.ipv6?
-        return true if address == IPAddr.new(CFG.bind.ipv4)
+        return true if address == IPAddr.new(CFG.host.ipv4)
       end
       false
     end
-
   end
 
 end

data/lib/ring/sqa/paste.rb

@@ -6,8 +6,8 @@ class SQA
   class Paste
     def self.add string
       Paste.new.add string
-    rescue
-      'paste failed'
+    rescue => error
+      "paste raised '#{error.class}' with message '#{error.message}'"
     end
 
     def add string, url=CFG.paste.url

data/lib/ring/sqa/poller.rb

@@ -5,7 +5,8 @@ class SQA
     MAX_READ     = 500
 
     def address
-      CFG.ipv6? ? CFG.bind.ipv6 : CFG.bind.ipv4
+      #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
     end
 
     def port

data/lib/ring/sqa/poller/sender.rb

@@ -9,7 +9,7 @@ class SQA
       udp = udp_socket
       loop do
         loop_start = Time.now
-        @nodes.list.each do |node|
+        @nodes.all.each do |node, _|
           query node, udp
           sleep INTER_NODE_GAP
         end

data/ring-sqa.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = 'ring-sqa'
-  s.version           = '0.0.19'
+  s.version           = '0.0.20'
   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.19
+  version: 0.0.20
 platform: ruby
 authors:
 - Saku Ytti
@@ -103,6 +103,7 @@ files:
 - lib/ring/sqa/alarm.rb
 - lib/ring/sqa/alarm/cfg.rb
 - lib/ring/sqa/alarm/email.rb
+- lib/ring/sqa/alarm/message.rb
 - lib/ring/sqa/alarm/udp2irc.rb
 - lib/ring/sqa/analyzer.rb
 - lib/ring/sqa/cfg.rb
@@ -113,7 +114,6 @@ files:
 - lib/ring/sqa/log.rb
 - lib/ring/sqa/mtr.rb
 - lib/ring/sqa/nodes.rb
-- lib/ring/sqa/nodes_json.rb
 - lib/ring/sqa/paste.rb
 - lib/ring/sqa/poller.rb
 - lib/ring/sqa/poller/receiver.rb

data/lib/ring/sqa/nodes_json.rb

@@ -1,38 +0,0 @@
-require 'json'
-
-module Ring
-class SQA
-
-  class NodesJSON
-    def get node
-      json = (@nodes[node] or {})
-      {
-        name: json['hostname'],
-        ip:   node,
-        as:   json['asn'],
-        cc:   json['countrycode'],
-      }
-    rescue
-      {}
-    end
-
-    private
-
-    def initialize
-      @file = CFG.nodes_json
-      @nodes = (load_json rescue {})
-    end
-
-    def load_json
-      nodes = {}
-      json = JSON.load File.read(@file)
-      json['results']['nodes'].each do |node|
-        addr = CFG.ipv6? ? node['ipv6'] : node['ipv4']
-        nodes[addr] = node
-      end
-      nodes
-    end
-  end
-
-end
-end