mtr_monitor 0.10.1 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a4d934158913f0e7593bf0ac8fe9b1f573f19c2
-  data.tar.gz: a8b86ea455e48bd1277e6c657aa0a0deffd8cc8d
+  metadata.gz: 606e6226743b91f553297bb2ce378204fb59b702
+  data.tar.gz: fb50ea80132d8e069c3a75b2ee46cd3a9e98b2d1
 SHA512:
-  metadata.gz: 9b7b25e1fdcdc86c6f60c8191c03eae8ec973048832ddfd1f05ff617ae3fa113bba9d969a97391d76658bb5815fe9104e67a3da5e5236662609ece2f28b8805e
-  data.tar.gz: fb242c660cc04b72c3542fa817dbee4c027636b7410f7fed9e2814025301e7b718362408fd16d20a76a9280648ff90ba0e95a370d25daf3f11c4f333ad3e4993
+  metadata.gz: b9437bb036a217c3fccf18098aa0da668528e30e701f9f2d1e086ad9ad9a93c621292e932f211ba985c5c3c04e92eff914bec7821f9cf48b27188330529956b7
+  data.tar.gz: fdc09e9ba5718bc9d5119439ea6f8aa3560c886fd872569127e9c04a0d58bfdc8a752b25fa2f887b19067e32a675870eda139ad0b0db2eaedbc6599a0a53166e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mtr_monitor (0.10.1)
+    mtr_monitor (0.10.2)
       rt-watchman (~> 0.10.0)
 
 GEM

data/lib/mtr_monitor.rb

@@ -1,7 +1,10 @@
-require "mtr_monitor/version"
 require "watchman"
 require "logger"
 
+require "mtr_monitor/version"
+require "mtr_monitor/hop"
+require "mtr_monitor/metrics"
+
 module MtrMonitor
   #
   # Runs a mtr trace toward a domain and saves the report
@@ -34,28 +37,8 @@ module MtrMonitor
       run "sudo mkdir -p /var/log/mtr"
       run "sudo mtr --report #{@mtr_options} #{@domain} > #{@log_path}"
       run "AWS_ACCESS_KEY_ID='#{@aws_access_key_id}' AWS_SECRET_ACCESS_KEY='#{@aws_secret_access_key}' aws s3 cp #{@log_path} #{@s3_path}"
-    end
-
-    def submit_metrics
-      logger.info "Submitting pulse: network.mtr.pulse, tags: #{[@hostname, @name]}, prefix: #{Watchman.prefix} port: #{Watchman.port}"
-      Watchman.submit("network.mtr.pulse", 1, :gauge, :tags => [@hostname, @name])
-
-      hops.each do |hop|
-        hop_name = hop.name.gsub(".", "-").gsub("?", "q")
-        tags = [@hostname, @name, hop_name]
-
-        Watchman.submit("network.mtr.loss", hop.loss, :gauge, :tags => tags)
-        Watchman.submit("network.mtr.snt", hop.snt, :gauge, :tags => tags)
-        Watchman.submit("network.mtr.last", hop.last, :gauge, :tags => tags)
-        Watchman.submit("network.mtr.avg", hop.avg, :gauge, :tags => tags)
-        Watchman.submit("network.mtr.best", hop.best, :gauge, :tags => tags)
-        Watchman.submit("network.mtr.worst", hop.worst, :gauge, :tags => tags)
-        Watchman.submit("network.mtr.std_dev", hop.std_dev, :gauge, :tags => tags)
-      end
-    end
 
-    def hops
-      `sudo cat #{@log_path}`.split("\n").map { |line| Hop.parse(line) }.compact
+      MtrMonitor::Metrics.submit(@log_path, @hostname, @name, @logger)
     end
 
     def run(cmd)
@@ -65,25 +48,4 @@ module MtrMonitor
     end
   end
 
-  class Hop
-    def self.parse(line)
-      return unless line =~ /\|--/
-
-      new(*line.split(" ")[1..-1])
-    end
-
-    attr_reader :name, :loss, :snt, :last, :avg, :best, :worst, :std_dev
-
-    def initialize(name, loss, snt, last, avg, best, worst, std_dev)
-      @name    = name
-      @loss    = loss.to_f
-      @snt     = snt.to_i
-      @last    = last.to_f
-      @avg     = avg.to_f
-      @best    = best.to_f
-      @worst   = worst.to_f
-      @std_dev = std_dev.to_f
-    end
-  end
-
 end

data/lib/mtr_monitor/hop.rb

@@ -0,0 +1,29 @@
+module MtrMonitor
+
+  # represents one hop in the MTR report
+  #
+  # example hop for `mtr --report github.com`:
+  # 12.|-- github-ic-318125-ash-b1.c  0.0%    10  136.2 136.2 135.0 140.7   1.5
+
+  class Hop
+    def self.parse(line)
+      return unless line =~ /\|--/
+
+      new(*line.split(" ")[1..-1])
+    end
+
+    attr_reader :name, :loss, :snt, :last, :avg, :best, :worst, :std_dev
+
+    def initialize(name, loss, snt, last, avg, best, worst, std_dev)
+      @name    = name
+      @loss    = loss.to_f
+      @snt     = snt.to_i
+      @last    = last.to_f
+      @avg     = avg.to_f
+      @best    = best.to_f
+      @worst   = worst.to_f
+      @std_dev = std_dev.to_f
+    end
+  end
+
+end

data/lib/mtr_monitor/metrics.rb

@@ -0,0 +1,28 @@
+module MtrMonitor
+  module Metrics
+
+    def self.submit(log_path, hostname, name, logger)
+      logger.info "Submitting pulse: network.mtr.pulse, tags: #{[hostname, name]}, prefix: #{Watchman.prefix} port: #{Watchman.port}"
+
+      Watchman.submit("network.mtr.pulse", 1, :gauge, :tags => [hostname, name])
+
+      hops(log_path).each do |hop|
+        hop_name = hop.name.gsub(".", "-").gsub("?", "q")
+        tags = [hostname, name, hop_name]
+
+        Watchman.submit("network.mtr.loss", hop.loss, :gauge, :tags => tags)
+        Watchman.submit("network.mtr.snt", hop.snt, :gauge, :tags => tags)
+        Watchman.submit("network.mtr.last", hop.last, :gauge, :tags => tags)
+        Watchman.submit("network.mtr.avg", hop.avg, :gauge, :tags => tags)
+        Watchman.submit("network.mtr.best", hop.best, :gauge, :tags => tags)
+        Watchman.submit("network.mtr.worst", hop.worst, :gauge, :tags => tags)
+        Watchman.submit("network.mtr.std_dev", hop.std_dev, :gauge, :tags => tags)
+      end
+    end
+
+    def self.hops(log_path)
+      `sudo cat #{log_path}`.split("\n").map { |line| Hop.parse(line) }.compact
+    end
+
+  end
+end

data/lib/mtr_monitor/version.rb

@@ -1,3 +1,3 @@
 module MtrMonitor
-  VERSION = "0.10.1"
+  VERSION = "0.10.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mtr_monitor
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.10.2
 platform: ruby
 authors:
 - RenderedText DevOps Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-28 00:00:00.000000000 Z
+date: 2018-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rt-watchman
@@ -88,6 +88,8 @@ files:
 - docker-compose.yml
 - exe/mtr_report
 - lib/mtr_monitor.rb
+- lib/mtr_monitor/hop.rb
+- lib/mtr_monitor/metrics.rb
 - lib/mtr_monitor/version.rb
 - mtr_monitor.gemspec
 homepage: https://github.com/renderedtext/mtr-monitor