ring-sqa 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ee3dfdbdc7f5a62e8914c040f4b8faf4a1399aea
-  data.tar.gz: '08532368f08e2f50829e72d82797f2b970f127c9'
+SHA256:
+  metadata.gz: b8e0281751b7bbeb995272e08dbbba6ec20f7a98a6fc8fce6bb86778793f7b1c
+  data.tar.gz: 14550791b8b22b8b7a5f919c842d25bfab891ca790bd20affceec37291e6d09d
 SHA512:
-  metadata.gz: eafdd5b92b00b977289ceff26e10ea033ab28b10c0482a75ef0f751ff877f1996ba00ce8a5dbbdf6e59eb6b7301c6ee6130be6b50b6020728b4ab992b8fd5a75
-  data.tar.gz: e3e32c3604b216b1e3b7f5b6c5a8e43f366dcd5c3bf3cf8317029d1412fc374a8f14b92b0bdcb621785e05df734a6c3d8f28e522027ec66e289f74ba8859f937
+  metadata.gz: d0f0e475e4d86437e4d3ffc27cf3df26ec91ec6ad338160284bc69d4d9db77597b92ba63f5b1fb4b149d9ad6dd51cfabdef425dc58af7720c1d3bea0545c5a1f
+  data.tar.gz: 7f38decb372c600c7e77ad25a99dadb13768dc93f8bb28b18a3703b561d957a883a5f76c1c1f869344c6a0356d2cfc80ed7de8dc17a5012e00c578165a503ca0

data/CHANGELOG.md

@@ -16,3 +16,6 @@
 
 # 0.4.3
   - Update to new Sequel API (fixes #21)
+
+# 0.4.4
+  - InfluxDB support added

data/lib/ring/sqa/analyzer.rb

@@ -16,6 +16,7 @@ class SQA
         sleep INFLIGHT_WAIT
         records = records.all
         @graphite.add @db.id_range(first_id, @db_id_seen).all if @graphite
+        @influxdb.add @db.id_range(first_id, @db_id_seen).all if @influxdb
         @buffer.push records.map { |record| record.peer }
         @buffer.exceed_median? ? @alarm.set(@buffer) : @alarm.clear(@buffer)
         delay = INTERVAL-(Time.now-start)
@@ -41,6 +42,7 @@ class SQA
       @buffer     = AnalyzeBuffer.new @nodes.all.size
       @db_id_seen = 0
       @graphite   = graphite if CFG.graphite?
+      @influxdb   = influxdb if CFG.influxdb?
     end
 
     def graphite
@@ -48,6 +50,12 @@ class SQA
       Graphite.new @nodes
     end
 
+    def influxdb
+      require_relative 'influxdb'
+      InfluxDBWriter.new @nodes
+    end
+
+
   end
 
   class AnalyzeBuffer

data/lib/ring/sqa/graphite.rb

@@ -18,7 +18,11 @@ class SQA
         if record.result != 'no response'
           hash["#{ROOT}.#{host}.#{nodecc}.#{nodename}.latency"] = record.latency
         end
-        @client.metrics hash, record.time
+        begin
+          @client.metrics hash, record.time
+        rescue
+          Log.error "Failed to write metrics to Graphite."
+        end
       end
     end
 

data/lib/ring/sqa/influxdb.rb

@@ -0,0 +1,44 @@
+require 'influxdb-client'
+
+module Ring
+class SQA
+  class InfluxDBWriter
+    ROOT = "nlnog.ring_sqa.#{CFG.afi}"
+
+    def add(records)
+      host   = @hostname.split(".").first
+      node   = @nodes.all
+      data   = []
+
+      records.each do |record|
+        nodename = nodecc = node[record.peer][:name].split(".").first
+        nodecc = node[record.peer][:cc].downcase
+
+        point = InfluxDB2::Point.new(name: 'ring-sqa_measurements')
+                                .add_tag('afi', CFG.afi)
+                                .add_tag('dst_node', nodename)
+                                .add_tag('dst_cc', nodecc)
+                                .add_tag('src_node', host)
+                                .add_tag('dst_lat', node[record.peer][:geo].split(",")[0])
+                                .add_tag('dst_lon', node[record.peer][:geo].split(",")[1])
+                                .add_field('latency', record.latency)
+                                .add_field('state', record.result == 'no response' ? 0 : 1)
+
+        @write_api.write(data: point)
+      rescue => e
+        Log.error "Failed to write metrics to InfluxDB: #{e.message}"
+      end
+    end
+
+    private
+
+    def initialize(nodes)
+      @client = InfluxDB2::Client.new(CFG.influxdb.url, CFG.influxdb.token, bucket: CFG.influxdb.bucket, org: CFG.influxdb.org, use_ssl: false, precision: InfluxDB2::WritePrecision::NANOSECOND)
+      @write_api = @client.create_write_api  # ✅ Fix write_api issue
+      @hostname = Ring::SQA::CFG.host.name
+      @nodes = nodes
+    end
+  end
+end
+end
+

data/lib/ring/sqa/nodes.rb

@@ -63,6 +63,7 @@ class SQA
           ip:   ip,
           as:   json['asn'],
           cc:   json['countrycode'],
+          geo:   json['geo'],
         }
         next if CFG.host.name == node[:name]
         nodes[ip] = node

data/ring-sqa.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = 'ring-sqa'
-  s.version           = '0.4.3'
+  s.version           = '0.4.4'
   s.licenses          = %w( Apache-2.0 )
   s.platform          = Gem::Platform::RUBY
   s.authors           = [ 'Saku Ytti', 'Job Snijders' ]
@@ -13,11 +13,12 @@ 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.add_runtime_dependency 'graphite-api', '~> 0.1', '>= 0.1.6'
+  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.3'
+  s.add_runtime_dependency 'graphite-api',    '~> 0.1.0'
+  s.add_runtime_dependency 'influxdb-client', '>= 0.1', '<= 3.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ring-sqa
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Saku Ytti
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-09 00:00:00.000000000 Z
+date: 2025-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop
@@ -73,40 +73,48 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: '0.3'
   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
+        version: '0.3'
 - !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
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+- !ruby/object:Gem::Dependency
+  name: influxdb-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.1'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.6
+        version: '0.1'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 3.2.0
 description: gets list of nodes and pings from each to each storing results
 email:
 - saku@ytti.fi
@@ -136,6 +144,7 @@ files:
 - lib/ring/sqa/database.rb
 - lib/ring/sqa/database/model.rb
 - lib/ring/sqa/graphite.rb
+- lib/ring/sqa/influxdb.rb
 - lib/ring/sqa/log.rb
 - lib/ring/sqa/mtr.rb
 - lib/ring/sqa/nodes.rb
@@ -164,8 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: ring-sqa
-rubygems_version: 2.5.2
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: NLNOG Ring SQA