ring-sqa 0.0.16 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b60d7ea751aee3be9cc2e8652f2390f5810fea4
-  data.tar.gz: f7188e826e663e93334f04e2f50fd54a72b1f952
+  metadata.gz: daa3666fef098532d9a3d8758e1f106ce9d0e63e
+  data.tar.gz: 60959c28ce98980b6045b9708a2e9e348c4504f8
 SHA512:
-  metadata.gz: 26215e5192073568b95ac81ea5561f5a3036d4070c671d22ae7956c898ae4601c6f52e8e4803164d055b1848fca58f08b096eef6e1cae8c251e1824e26bc208d
-  data.tar.gz: 58bbe6c022f8c82a8723ce98220607f217108cc277706f08631432714361bde0c9599d0324bab93ff398a470e7e69b684429c6f6b61b294052a6a006b87d1d65
+  metadata.gz: 8d81bd070959777b765c7654e8912f624cc2293f9ebde5edee4305a6b03545e49d59e3366dd7d2153dcefac13886415bd29fd5a0e9486fca04c1436e3816bb2d
+  data.tar.gz: 9d9b16dbfe7f85ed3420e0f9af3a095590fc1191bd178ccb6d785e35ee6ef03fdcd46c969689e99c32599f02b56198e9319566d14ec1d78e369d5c5df7217b59

data/Rakefile

@@ -3,7 +3,7 @@ begin
   require 'bundler'
   # Bundler.setup
 rescue LoadError
-  warn 'bunler missing'
+  warn 'bundler missing'
 end
 
 gemspec = eval(File.read(Dir['*.gemspec'].first))

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

@@ -4,7 +4,8 @@ class Alarm
 
   class UDP2IRC
     def send message, channel=CFG.irc.channel
-      msg = [@password, channel, message[:short]].join ' '
+      url = Paste.add message[:long]
+      msg = [@password, channel, message[:short], url].join ' '
       msg += "\0" while msg.size % 16 > 0
       UDPSocket.new.send msg, 0, @host, @port.to_i
     end

data/lib/ring/sqa/alarm.rb

@@ -2,6 +2,7 @@ require_relative 'alarm/email'
 require_relative 'alarm/udp2irc'
 require_relative 'alarm/cfg'
 require_relative 'mtr'
+require_relative 'paste'
 require_relative 'nodes_json'
 
 module Ring
@@ -44,7 +45,7 @@ class SQA
       nodes = NodesJSON.new
 
       nodes_list = ''
-      exceeding_nodes.each do |node|
+      exceeding_nodes.sort!.each do |node|
         json = nodes.get node
         nodes_list << "- %-30s %14s AS%5s %2s\n" % [json['hostname'], node, json['asn'], json['countrycode']]
       end
@@ -60,24 +61,37 @@ class SQA
       buffer_list = ''
       time = alarm_buffer.array.size-1
       alarm_buffer.array.each do |ary|
-        buffer_list << "%2s min ago %3s measurements failed\n" % [time, ary.size/2]
+        buffer_list << "%2s min ago %3s measurements failed" % [time, ary.size/2]
+        type = time.to_i < 3 ? " (raised alarm)\n" : " (baseline)\n"
+        buffer_list << type
         time -= 1
       end
 
       msg[:long] = <<EOF
-This is an automated alert from the distributed partial outage monitoring system "RING SQA".
+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.
+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 previously were reachable, but became unreachable over the course of the last 3 minutes:
+The following 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:
+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:
+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}
 

data/lib/ring/sqa/cfg.rb

@@ -17,6 +17,7 @@ module Ring
     Config.default.mtr.args           = '-i0.5 -c5 -r -w -n'
     Config.default.mtr.timeout        = 15
     Config.default.ram_database       = false
+    Config.default.paste.url          = 'https://ring.nlnog.net/paste/'
 
     begin
       Config.load

data/lib/ring/sqa/mtr.rb

@@ -31,7 +31,7 @@ class SQA
       Open3.popen3(BIN, *args) do |stdin, stdout, stderr, wait_thr|
         out << stdout.read until stdout.eof?
       end
-      out.each_line.to_a[1..-1].join rescue ''
+      'mtr ' + args.join(' ') + "\n" + out.each_line.to_a[1..-1].join rescue ''
     end
   end
 

data/lib/ring/sqa/paste.rb

@@ -0,0 +1,30 @@
+require 'net/http'
+
+module Ring
+class SQA
+
+  class Paste
+    def self.add string
+      Paste.new.add string
+    rescue
+      'paste failed'
+    end
+
+    def add string, url=CFG.paste.url
+      paste string, url
+    end
+
+    private
+
+    def paste string, url
+      uri  = URI.parse url
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = true if uri.scheme == 'https'
+      rslt = http.post uri.path, URI.encode_www_form([['content',string], ['ttl','604800']])
+      uri.path = rslt.fetch('location')
+      uri.to_s
+    end
+  end
+
+end
+end

data/ring-sqa.gemspec

@@ -1,9 +1,9 @@
 Gem::Specification.new do |s|
   s.name              = 'ring-sqa'
-  s.version           = '0.0.16'
+  s.version           = '0.0.18'
   s.licenses          = %w( Apache-2.0 )
   s.platform          = Gem::Platform::RUBY
-  s.authors           = [ 'Saku Ytti' ]
+  s.authors           = [ 'Saku Ytti', 'Job Snijders' ]
   s.email             = %w( saku@ytti.fi )
   s.homepage          = 'http://github.com/ytti/ring-sqa'
   s.summary           = 'NLNOG Ring SQA'

metadata

@@ -1,10 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: ring-sqa
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.18
 platform: ruby
 authors:
 - Saku Ytti
+- Job Snijders
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -14,76 +15,76 @@ dependencies:
   name: slop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.5'
 - !ruby/object:Gem::Dependency
   name: rb-inotify
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.12'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: asetus
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.1'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.1'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.1.2
 description: gets list of nodes and pings from each to each storing results
@@ -113,6 +114,7 @@ files:
 - 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
 - lib/ring/sqa/poller/responder.rb
@@ -128,17 +130,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: ring-sqa
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: NLNOG Ring SQA