ring-sqa 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25c8208dc0edbfafa044993cfb78dd16780b07f5
-  data.tar.gz: b9aca6535337fb3b1f13d91b96d26e3b7ecda319
+  metadata.gz: 575a1fe95c4b6aeef9d1469fbbd3ad738bb3df11
+  data.tar.gz: 983918acc69c27d86ec309245aaaa6bab7ae2892
 SHA512:
-  metadata.gz: a7cdc36b8eb6a647626e0eed44babfeaf43eb5bbaedbc55a1b35e4ed0cc11ac4dc9d936fbc5f4db653ecebf1c405b06e0dd48af618ec962fb31d82b214bba502
-  data.tar.gz: d2016d09b13fbdf445996f867075e81d91f804704029cc77242dd7cba1b328b43eaa17b179b468f24d8ba8f68dceb6834dd8f54c90bf9e41ad4b610e143886f0
+  metadata.gz: 33866954ec631f08093ac610f2f0069208a27fae7f643156eb5dce998d966e7eb8f7ecce4332508ffc43a09c268f93a484edf19401a49a6da5e8ac173864eacd
+  data.tar.gz: d10307beb8fcf195df725eaa6a280e16b49a4d0adb92cabc64d28b039cdb2ea44704fe254dc824a400d2be06cd6ff4812a18912cbb7de5d35c89b566812dc2c3

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

@@ -0,0 +1,55 @@
+require 'net/http'
+require 'timeout'
+
+module Ring
+class SQA
+class Alarm
+
+  class Slack
+    TIMEOUT = 10
+    def send opts
+      short, long = opts[:short], opts[:long]
+      cfg  = CFG.slack
+      json = JSON.pretty_generate(
+        {
+          "attachments" => [
+            {
+              "fallback"    => short,
+              "pretext"     => short,
+              "author_name" => "NLNog Ring SQA",
+              "author_link" => "https://ring.nlnog.net/news/2014/07/new-monitoring-tool-ring-sqa/",
+              "text"        => long,
+            },
+          ],
+        },
+      )
+      post json, cfg.url
+    rescue => error
+      Log.error "Slack send raised '#{error.class}' with message '#{error.message}'"
+    end
+
+    private
+
+    def post json, url
+      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'
+            req = Net::HTTP::Post.new(uri.request_uri, { 'Content-Type' => 'application/json' })
+            req.body = json
+            _response = http.request req
+          end
+        rescue Timeout::Error
+          Log.error "Slack post timed out"
+        rescue => error
+          Log.error "Slack post raised '#{error.class}' with message '#{error.message}'"
+        end
+      end
+    end
+  end
+
+end
+end
+end

data/lib/ring/sqa/alarm.rb

@@ -1,6 +1,7 @@
 require_relative 'alarm/email'
 require_relative 'alarm/udp2irc'
 require_relative 'alarm/exec'
+require_relative 'alarm/slack'
 require_relative 'alarm/cfg'
 require_relative 'alarm/message'
 require_relative 'alarm/collector'
@@ -38,6 +39,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  << Slack.new   if CFG.slack.url?
       @methods  << Collector.new
       @hostname = Ring::SQA::CFG.host.name
       @afi      = Ring::SQA::CFG.afi

data/lib/ring/sqa/analyzer.rb

@@ -11,9 +11,11 @@ class SQA
       loop do
         start = Time.now
         @db.purge
-        @db_id_seen, records = @db.nodes_down(@db_id_seen+1)
+        first_id = @db_id_seen+1
+        @db_id_seen, records = @db.nodes_down(first_id)
         sleep INFLIGHT_WAIT
         records = records.all
+        @graphite.add @db.id_range(first_id, @db_id_seen).all if @graphite
         @buffer.push records.map { |record| record.peer }
         @buffer.exceed_median? ? @alarm.set(@buffer) : @alarm.clear(@buffer)
         delay = INTERVAL-(Time.now-start)
@@ -38,7 +40,14 @@ class SQA
       @alarm      = Alarm.new @nodes
       @buffer     = AnalyzeBuffer.new @nodes.all.size
       @db_id_seen = 0
+      @graphite   = graphite if CFG.graphite?
     end
+
+    def graphite
+      require_relative 'graphite'
+      Graphite.new
+    end
+
   end
 
   class AnalyzeBuffer

data/lib/ring/sqa/cfg.rb

@@ -16,7 +16,7 @@ module Ring
     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.args           = '-i0.5 -c5 -r -w -n --aslookup'
     Config.default.mtr.timeout        = 15
     Config.default.ram_database       = false
     Config.default.paste.url          = 'https://ring.nlnog.net/paste/'

data/lib/ring/sqa/database.rb

@@ -24,7 +24,7 @@ class SQA
 
     def nodes_down first_id
       max_id = (Ping.max(:id) or first_id)
-      [max_id, Ping.distinct.where(:id=>first_id..max_id).exclude(:result => 'ok')]
+      [max_id, id_range(first_id, max_id).exclude(:result => 'ok')]
     end
 
     def up_since? id, peer
@@ -35,6 +35,10 @@ class SQA
       Ping.where{time < (Time.now.utc-older_than).to_i}.delete
     end
 
+    def id_range first, last
+      Ping.distinct.where(:id=>first..last)
+    end
+
     private
 
     def initialize

data/lib/ring/sqa/graphite.rb

@@ -0,0 +1,29 @@
+require 'graphite-api'
+
+module Ring
+class SQA
+
+  class Graphite
+    ROOT = "nlnog.ring_sqa.#{CFG.afi}"
+
+    def add records
+      records.each do |record|
+        hash = {
+         "#{ROOT}.#{record.peer}.state" => record.result
+        }
+        if record.result == 'success'
+          hash["#{ROOT}.#{record.peer}.latency"] = record.latency
+        end
+        @client.metrics hash, record.time
+      end
+    end
+
+    private
+
+    def initialize server=CFG.graphite
+      @client = GraphiteAPI.new graphite: server
+    end
+  end
+
+end
+end

data/ring-sqa.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = 'ring-sqa'
-  s.version           = '0.2.1'
+  s.version           = '0.2.2'
   s.licenses          = %w( Apache-2.0 )
   s.platform          = Gem::Platform::RUBY
   s.authors           = [ 'Saku Ytti', 'Job Snijders' ]
@@ -13,10 +13,11 @@ Gem::Specification.new do |s|
   s.executables       = %w( ring-sqad )
   s.require_path      = 'lib'
 
-  s.required_ruby_version = '>= 1.9.3'
-  s.add_runtime_dependency 'slop',       '~> 3.5'
-  s.add_runtime_dependency 'rb-inotify', '~> 0.9'
-  s.add_runtime_dependency 'sequel',     '~> 4.12'
-  s.add_runtime_dependency 'sqlite3',    '~> 1.3'
-  s.add_runtime_dependency 'asetus',     '~> 0.1', '>= 0.1.2'
+  s.required_ruby_version =                '>= 1.9.3'
+  s.add_runtime_dependency 'slop',         '~> 3.5'
+  s.add_runtime_dependency 'rb-inotify',   '~> 0.9'
+  s.add_runtime_dependency 'sequel',       '~> 4.12'
+  s.add_runtime_dependency 'sqlite3',      '~> 1.3'
+  s.add_runtime_dependency 'asetus',       '~> 0.1', '>= 0.1.2'
+  s.add_runtime_dependency 'graphite-api', '~> 0.1', '>= 0.1.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ring-sqa
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Saku Ytti
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-28 00:00:00.000000000 Z
+date: 2016-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop
@@ -87,6 +87,26 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 0.1.2
+- !ruby/object:Gem::Dependency
+  name: graphite-api
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.6
+  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.6
 description: gets list of nodes and pings from each to each storing results
 email:
 - saku@ytti.fi
@@ -107,6 +127,7 @@ files:
 - lib/ring/sqa/alarm/email.rb
 - lib/ring/sqa/alarm/exec.rb
 - lib/ring/sqa/alarm/message.rb
+- lib/ring/sqa/alarm/slack.rb
 - lib/ring/sqa/alarm/udp2irc.rb
 - lib/ring/sqa/analyzer.rb
 - lib/ring/sqa/cfg.rb
@@ -114,6 +135,7 @@ files:
 - lib/ring/sqa/core.rb
 - lib/ring/sqa/database.rb
 - lib/ring/sqa/database/model.rb
+- lib/ring/sqa/graphite.rb
 - lib/ring/sqa/log.rb
 - lib/ring/sqa/mtr.rb
 - lib/ring/sqa/nodes.rb
@@ -143,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ring-sqa
-rubygems_version: 2.0.14
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: NLNOG Ring SQA