ring-sqa 0.0.23 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a9e53e58f2786d8d813c824630b6c3885a92d89
-  data.tar.gz: 795d8eec0b54a1c9cb634adf99006931bcf0173c
+  metadata.gz: ca449f8a8c7a0ab2161b8b29b660e676b03a35b6
+  data.tar.gz: 75eda160f04f86f654f6a1238e27c9b8baf2632b
 SHA512:
-  metadata.gz: a0850b9387086975c40633444e0de890b1899fe25a9af70766f0d78f2e33c6694c3e08ab26aeb835629b1bdcf3400742f3cb34ecdc9272653596454a584e67f3
-  data.tar.gz: b77f8540839d0af92ed47b923f299d240ad194f344815541e0f384b737bbe921a456f14ea812b44c1bf54a44be6e3108c15166f47ef1af8eb709c6112512ac4a
+  metadata.gz: 4171a64a662db193d702b783adb1e8d39c26110d4e53c852948033cffa9d69d1b5e6347d38f127007e1a50631a17116c31969ee9b7b458bb36f3d7e56899b558
+  data.tar.gz: f931c2971269e66bfe2fa5506cf1ae93da4e0e7e6bd96d81765ec79acea0363b9516dd6563d76415faca49806ba92ccc36ca1551511d1bedc4499eab8cc9535e

data/CHANGELOG.md

@@ -0,0 +1,5 @@
+# 0.1.x
+  - FIX: ....
+
+# 0.1.0
+  - wooo

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

@@ -3,13 +3,15 @@ class SQA
 
   class Alarm
     Config = Asetus.new name: 'sqa', load: false, usrdir: Directory, cfgfile: 'alarm.conf'
-    Config.default.email.to     = false
-    Config.default.email.from   = 'foo@example.com'
-    Config.default.email.prefix = false
-    Config.default.irc.host     = '213.136.8.179'
-    Config.default.irc.port     = 5502
-    Config.default.irc.password = 'shough2oChoo'
-    Config.default.irc.target   = '#ring'
+    Config.default.email.to       = false
+    Config.default.email.from     = 'foo@example.com'
+    Config.default.email.prefix   = false
+    Config.default.irc.host       = '213.136.8.179'
+    Config.default.irc.port       = 5502
+    Config.default.irc.password   = 'shough2oChoo'
+    Config.default.irc.target     = '#ring'
+    Config.default.exec.command   = false
+    Config.default.exec.arguments = false
 
     begin
       Config.load

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

@@ -7,12 +7,13 @@ class Alarm
   class Email
     SERVER = 'localhost'
 
-    def send msg
+    def send opts
+      short, long = opts[:short], opts[:long]
       @from    = CFG.email.from
       @to      = [CFG.email.to].flatten
       prefix   = CFG.email.prefix? ? CFG.email.prefix : ''
-      @subject = prefix + msg[:short]
-      @body    = msg[:long]
+      @subject = prefix + short
+      @body    = long
       send_email compose_email
     rescue => error
       Log.error "Email raised '#{error.class}' with message '#{error.message}'"

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

@@ -0,0 +1,34 @@
+module Ring
+class SQA
+class Alarm
+
+  class Exec
+    def send opts
+      stdout = JSON.pretty_generate( {
+        :alarm_buffer => opts[:alarm_buffer].exceeding_nodes,
+        :nodes        => opts[:nodes].all,
+        :short        => opts[:short],
+        :long         => opts[:long],
+        :status       => opts[:status],
+      })
+      exec stdout, CFG.exec.command, CFG.exec.arguments?
+    rescue => error
+      Log.error "Exec raised '#{error.class}' with message '#{error.message}'"
+    end
+
+    private
+
+    def exec write, cmd, args
+      args = '' unless args
+      args = args.split ' '
+      Open3.popen3(cmd, *args) do |stdin, stdout, stderr, wait_thr|
+        stdin.write write
+        stdin.close
+        wait_thr.join
+      end
+    end
+  end
+
+end
+end
+end

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

@@ -28,7 +28,7 @@ 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
+#{Ring::SQA::CFG.analyzer.tolerance} above the median of the previous #{Ring::SQA::CFG.analyzer.median_of} measurement slots, a partial
 outage is assumed. The ring buffer's output is as following:
 
 #{buffer_list}

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

@@ -3,12 +3,16 @@ class SQA
 class Alarm
 
   class UDP2IRC
-    def send message, targets=CFG.irc.target
-      url = Paste.add message[:long]
-      [targets].flatten.each do |target|
-        msg = [@password, target, message[:short], url].join ' '
-        msg += "\0" while msg.size % 16 > 0
-        UDPSocket.new.send msg, 0, @host, @port.to_i
+    def send opts
+      short, long = opts[:short], opts[:long]
+      irc = CFG.irc
+      url = Paste.add long
+      if irc.class == Array
+        irc.each do |target|
+          udp2irc target['password'], target['target'], short, url, target['host'], target['port']
+        end
+      else
+        udp2irc irc.password, irc.target, short, url, irc.host, irc.port
       end
     rescue => error
       Log.error "UDP2IRC raised '#{error.class}' with message '#{error.message}'"
@@ -16,10 +20,10 @@ class Alarm
 
     private
 
-    def initialize host=CFG.irc.host, port=CFG.irc.port, password=CFG.irc.password
-      @host     = host
-      @port     = port
-      @password = password
+    def udp2irc password, target, message, url, host, port
+      msg = [password, target, message, url].join ' '
+      msg += "\0" while msg.size % 16 > 0
+      UDPSocket.new.send msg, 0, host, port
     end
   end
 

data/lib/ring/sqa/alarm.rb

@@ -1,5 +1,6 @@
 require_relative 'alarm/email'
 require_relative 'alarm/udp2irc'
+require_relative 'alarm/exec'
 require_relative 'alarm/cfg'
 require_relative 'alarm/message'
 require_relative 'mtr'
@@ -14,17 +15,17 @@ class SQA
         @alarm = true
         msg = compose_message alarm_buffer
         Log.info msg[:short]
-        @methods.each { |alarm_method| alarm_method.send msg }
+        @methods.each { |alarm_method| alarm_send alarm_method, 'raise', msg, alarm_buffer }
       end
     end
 
     def clear
       if @alarm == true
         @alarm = false
-        msg = { short: "#{@hostname}: clearing alarm" }
+        msg = { short: "#{@hostname}: clearing #{@afi} alarm" }
         msg[:long] = msg[:short]
         Log.info msg[:short]
-        @methods.each { |alarm_method| alarm_method.send msg }
+        @methods.each { |alarm_method| alarm_send alarm_method, 'clear', msg, nil }
       end
     end
 
@@ -34,7 +35,8 @@ class SQA
       @nodes    = nodes
       @methods  = []
       @methods  << Email.new   if CFG.email.to?
-      @methods  << UDP2IRC.new if CFG.irc.password?
+      @methods  << UDP2IRC.new if Array === CFG.irc or CFG.irc.password?
+      @methods  << Exec.new    if CFG.exec.command?
       @hostname = Ring::SQA::CFG.host.name
       @afi      = Ring::SQA::CFG.afi
       @alarm    = false
@@ -70,6 +72,14 @@ class SQA
       msg
     end
 
+    def alarm_send alarm_method, status, msg, alarm_buffer=nil
+      alarm_method.send(short:        msg[:short],
+                        long:         msg[:long],
+                        status:       status,
+                        alarm_buffer: alarm_buffer,
+                        nodes:        @nodes)
+    end
+
   end
 
 end

data/lib/ring/sqa/analyzer.rb

@@ -38,7 +38,7 @@ class SQA
 
   class AnalyzeBuffer
     attr_reader :array
-    def initialize nodes_count, max_size=30, median_of=27
+    def initialize nodes_count, max_size=CFG.analyzer.size, median_of=CFG.analyzer.median_of
       @max_size   = max_size
       @median_of  = median_of
       nodes_count = CFG.fake? ? 0 : nodes_count

data/lib/ring/sqa/cfg.rb

@@ -7,30 +7,38 @@ module Ring
     class NoConfig < StandardError; end
 
     Config = Asetus.new name: 'sqa', load: false, usrdir: Directory, cfgfile: 'main.conf'
+    hosts  = Asetus.new name: 'sqa', load: false, usrdir: Directory, cfgfile: 'hosts.conf'
+
     Config.default.directory          = Directory
     Config.default.debug              = false
-    Config.default.hosts.load         = %w( ring.nlnog.net )
-    Config.default.hosts.ignore       = %w( infra.ring.nlnog.net )
     Config.default.port               = 'ring'.to_i(36)/100
     Config.default.analyzer.tolerance = 1.2
+    Config.default.analyzer.size      = 30
+    Config.default.analyzer.median_of = 27
     Config.default.nodes_json         = '/etc/ring/nodes.json'
     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/'
 
+    hosts.default.load                = %w( ring.nlnog.net )
+    hosts.default.ignore              = %w( infra.ring.nlnog.net )
+
     begin
       Config.load
+      hosts.load
     rescue => error
       raise InvalidConfig, "Error loading configuration: #{error.message}"
     end
 
     CFG = Config.cfg
+    CFG.hosts = hosts.cfg
 
     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]
 
+    hosts.create
     raise NoConfig, 'edit /etc/ring-sqa/main.conf' if Config.create
   end
 end

data/lib/ring/sqa/nodes.rb

@@ -39,13 +39,14 @@ class SQA
       nodes_hash list
     rescue => error
       Log.warn "#{error.class} raised with message '#{error.message}' while generating nodes list"
-      @all
+      (@all or {})
     end
 
     def nodes_hash ips, file=CFG.nodes_json
       nodes = {}
       json = JSON.load File.read(file)
       json['results']['nodes'].each do |node|
+        next if node['service']['sqa'] == false rescue nil
         addr = node[CFG.afi]
         next unless ips.include? addr
         nodes[addr] = node

data/ring-sqa.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = 'ring-sqa'
-  s.version           = '0.0.23'
+  s.version           = '0.1.0'
   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.23
+  version: 0.1.0
 platform: ruby
 authors:
 - Saku Ytti
@@ -9,82 +9,82 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-28 00:00:00.000000000 Z
+date: 2014-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   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
@@ -95,6 +95,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
 - Gemfile
 - README.md
 - Rakefile
@@ -103,6 +104,7 @@ files:
 - lib/ring/sqa/alarm.rb
 - lib/ring/sqa/alarm/cfg.rb
 - lib/ring/sqa/alarm/email.rb
+- lib/ring/sqa/alarm/exec.rb
 - lib/ring/sqa/alarm/message.rb
 - lib/ring/sqa/alarm/udp2irc.rb
 - lib/ring/sqa/analyzer.rb
@@ -130,17 +132,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.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: NLNOG Ring SQA