ring-sqa 0.3.1 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57b1933a179c8194ef549fcfe674b233bf2e3f83
-  data.tar.gz: 6bc6c19ca66549c89dbd638cb27521134690c8e1
+  metadata.gz: 39d4bb0c179ebb868730fb900f75518d5475cde5
+  data.tar.gz: 13b35934016270da0ba4c922080dae1d55261d59
 SHA512:
-  metadata.gz: c26570ab7f40dbf8499efbbce3d857f725b28fe7bd8baaddf1732a2c22186615587984859c804334a1ec5c3cdc5a7fd7026738237ca2aadb480218d764c0d68b
-  data.tar.gz: 301fa5c8c8e9b794c6c318a05bab9130afab3e6df50da83cbf8653476e4a940e88ac4cbd7fe57e0904d99140e82634483338028ddc6116d1e4c73c4c06e62e01
+  metadata.gz: 10269a86e695073359afc15d363290ac7ceba9ea6e14d9d109f8bb76ad15049f34ca474a3d166d8bd177a529842da3a6dc5d1ed1ab6fb432908abf87bc60e9e3
+  data.tar.gz: cbcaf39e26af0800637519579576f9c7c0d70a7601470dac8bc7789783fd1b5801a321332cf4d670e2184a33319737d9fd5982d691d36ec5315c53fd7846a09d

data/CHANGELOG.md

@@ -4,3 +4,9 @@
 
 # 0.1.0
   - wooo
+
+# 0.4.0
+  - Graphite support added with country code (rinsekloek)
+
+# 0.4.1
+  - Version bump

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

@@ -9,6 +9,7 @@ class Alarm
     URL     = 'http://sqa-collector.infra.ring.nlnog.net/'
     TIMEOUT = 10
     def send opts
+      @url = CFG.collector.url? ? CFG.collector.url : URL
       json = JSON.pretty_generate( {
         :alarm_buffer => opts[:alarm_buffer].exceeding_nodes,
         :nodes        => opts[:nodes].all,
@@ -28,7 +29,7 @@ class Alarm
       Thread.new do
         begin
           Timeout::timeout(TIMEOUT) do
-            uri = URI.parse URL
+            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

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

@@ -5,13 +5,15 @@ class SQA
 class Alarm
 
   class Email
-    SERVER = 'localhost'
+    SERVER  = 'localhost'
+    LIST_ID = 'ring-sqa <sqa.ring.nlnog.net>'
 
     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 : ''
+      @list_id  = CFG.email.list_id? ? CFG.email.list_id : LIST_ID
       @subject  = prefix + short
       @reply_to = CFG.email.reply_to? ? CFG.email.reply_to : @from
       @body     = long
@@ -28,7 +30,7 @@ class Alarm
       mail << 'To: '       + @to.join(', ')
       mail << 'Reply-To: ' + @reply_to
       mail << 'Subject: '  + @subject
-      mail << 'List-Id: '  + 'ring-sqa <sqa.ring.nlnog.net>'
+      mail << 'List-Id: '  + @list_id
       mail << 'X-Mailer: ' + 'ring-sqa'
       mail << ''
       mail = mail.join("\n")

data/lib/ring/sqa/analyzer.rb

@@ -45,7 +45,7 @@ class SQA
 
     def graphite
       require_relative 'graphite'
-      Graphite.new
+      Graphite.new @nodes
     end
 
   end

data/lib/ring/sqa/database/model.rb

@@ -1,18 +1,7 @@
 module Ring
 class SQA
 class Database
-
-  class Ping < Sequel::Model
-    set_schema do
-      primary_key :id
-      Fixnum      :time
-      String      :peer
-      Fixnum      :latency
-      String      :result
-    end
-    create_table unless table_exists?
-  end
-
+  class Ping < Sequel::Model; end
 end
 end
 end

data/lib/ring/sqa/database.rb

@@ -43,7 +43,6 @@ class SQA
     private
 
     def initialize
-      Sequel::Model.plugin :schema
       sequel_opts = { max_connections: 1, pool_timout: 60 }
       if CFG.ram_database?
         @db = Sequel.sqlite sequel_opts
@@ -53,8 +52,19 @@ class SQA
         File.unlink file rescue nil # delete old database
         @db = Sequel.sqlite file, sequel_opts
       end
+      create_db
       require_relative 'database/model.rb'
     end
+
+    def create_db
+      @db.create_table?(:pings) do
+        primary_key :id
+        Fixnum      :time
+        String      :peer
+        Fixnum      :latency
+        String      :result
+      end
+    end
   end
 
 end

data/lib/ring/sqa/graphite.rb

@@ -7,21 +7,27 @@ class SQA
     ROOT = "nlnog.ring_sqa.#{CFG.afi}"
 
     def add records
+      host = @hostname.split(".").first
+      node =  @nodes.all
       records.each do |record|
+        nodename = noderec = node[record.peer][:name].split(".").first
+        nodecc = noderec = node[record.peer][:cc].downcase
         hash = {
-         "#{ROOT}.#{record.peer}.state" => record.result
+         "#{ROOT}.#{host}.#{nodecc}.#{nodename}.state" => record.result
         }
-        if record.result == 'success'
-          hash["#{ROOT}.#{record.peer}.latency"] = record.latency
+        if record.result != 'no response'
+          hash["#{ROOT}.#{host}.#{nodecc}.#{nodename}.latency"] = record.latency
         end
         @client.metrics hash, record.time
       end
     end
 
     private
-
-    def initialize server=CFG.graphite
+    
+    def initialize nodes, server=CFG.graphite
       @client = GraphiteAPI.new graphite: server
+      @hostname = Ring::SQA::CFG.host.name
+      @nodes = nodes
     end
   end
 

data/ring-sqa.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = 'ring-sqa'
-  s.version           = '0.3.1'
+  s.version           = '0.4.1'
   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.3.1
+  version: 0.4.1
 platform: ruby
 authors:
 - Saku Ytti
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-01 00:00:00.000000000 Z
+date: 2019-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop
@@ -165,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ring-sqa
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: NLNOG Ring SQA