ring-sqa 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e376e7f077f64a6a0c9e05a96addeb5c63ab9f07
-  data.tar.gz: 549eb2cf8eddce2fe69633c938e53a32acceb20e
+  metadata.gz: b658584ec46448a59b1265e61aee7e532787ee01
+  data.tar.gz: df10849ca2f250111c8ded791c26aaa19b854e2b
 SHA512:
-  metadata.gz: 6f4afff11e69c8f2d0e75b3c1c217ac204801e70f492a615a1d55cf8e42a95f57ac2bc3a5317cca6f27aac425d74c5a9447dec317c36d98d259c77e7ab533615
-  data.tar.gz: af5d27f41b486a80705f4d6b2c9c46183423ec584343d44121015013e0c262f68162ed7ea9e93c5c36aa156dade91e4621c7ed7c4bf15f2d3730d3eaee391b57
+  metadata.gz: 5b6d0440cc6af5f5b0d3516c1aaa0a03b9ec1dc13310920d476b4a3c894c3e25afda5ea4bface44d9cdc84c6c93453a8c911dedcd2f04617c2295baaf943e1d5
+  data.tar.gz: 4e54001be590174ef5c58aa297aec837f0e233ea81eab64c942e7ac40df593f2e06b1ad31c3f1106865cdba13ff657c54f80a4f0ef703774052cb26297102d9f

data/lib/ring/sqa/alarm.rb

@@ -3,6 +3,7 @@ require_relative 'alarm/udp2irc'
 require_relative 'alarm/exec'
 require_relative 'alarm/cfg'
 require_relative 'alarm/message'
+require_relative 'alarm/collector'
 require_relative 'mtr'
 require_relative 'paste'
 
@@ -37,6 +38,7 @@ class SQA
       @methods  << Email.new   if CFG.email.to?
       @methods  << UDP2IRC.new if Array === CFG.irc or CFG.irc.password?
       @methods  << Exec.new    if CFG.exec.command?
+      @methods  << Collector.new
       @hostname = Ring::SQA::CFG.host.name
       @afi      = Ring::SQA::CFG.afi
       @alarm    = false

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

@@ -0,0 +1,45 @@
+require 'net/http'
+require 'timeout'
+
+module Ring
+class SQA
+class Alarm
+
+  class Collector
+    URL     = 'http://sqa-collector.infra.ring.nlnog.net/'
+    TIMEOUT = 10
+    def send opts
+      json = JSON.pretty_generate( {
+        :alarm_buffer => opts[:alarm_buffer].exceeding_nodes,
+        :nodes        => opts[:nodes].all,
+        :short        => opts[:short],
+        :long         => opts[:long],
+        :status       => opts[:status],
+        :afi          => opts[:afi],
+      })
+      post json
+    rescue => error
+      Log.error "Post raised '#{error.class}' with message '#{error.message}'"
+    end
+
+    private
+
+    def post json
+      Thread.new do
+        begin
+          Timeout::timeout(TIMEOUT) do
+            uri = URI.parse URL
+            http = Net::HTTP.new uri.host, uri.port
+            http.use_ssl = true if uri.scheme == 'https'
+            http.post uri.path, json
+          end
+        rescue Timeout::Error
+          Log.error "Post timed out"
+        end
+      end
+    end
+  end
+
+end
+end
+end

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

@@ -9,11 +9,12 @@ class Alarm
 
     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 + short
-      @body    = long
+      @from     = CFG.email.from
+      @to       = [CFG.email.to].flatten
+      prefix    = CFG.email.prefix? ? CFG.email.prefix : ''
+      @subject  = prefix + short
+      @reply_to = CFG.email.reply_to? ? CFG.email.reply_to : @from
+      @body     = long
       send_email compose_email
     rescue => error
       Log.error "Email raised '#{error.class}' with message '#{error.message}'"
@@ -25,6 +26,7 @@ class Alarm
       mail = []
       mail << 'From: '     + @from
       mail << 'To: '       + @to.join(', ')
+      mail << 'Reply-To: ' + @reply_to
       mail << 'Subject: '  + @subject
       mail << 'List-Id: '  + 'ring-sqa <sqa.ring.nlnog.net>'
       mail << 'X-Mailer: ' + 'ring-sqa'

data/ring-sqa.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = 'ring-sqa'
-  s.version           = '0.1.11'
+  s.version           = '0.1.12'
   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.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - Saku Ytti
@@ -9,82 +9,82 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-22 00:00:00.000000000 Z
+date: 2015-05-20 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
@@ -103,6 +103,7 @@ files:
 - lib/ring/sqa.rb
 - lib/ring/sqa/alarm.rb
 - lib/ring/sqa/alarm/cfg.rb
+- lib/ring/sqa/alarm/collector.rb
 - lib/ring/sqa/alarm/email.rb
 - lib/ring/sqa/alarm/exec.rb
 - lib/ring/sqa/alarm/message.rb
@@ -132,17 +133,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