mtr_monitor 0.16.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e0a4d3f371a9d89ecdda17a93bc368d0999a0de
-  data.tar.gz: 04b02c94334b6a0ff36aea4f92c0c441a53f2a77
+  metadata.gz: 7a5b73e216e4f4642e16dc0b769917d06066b64d
+  data.tar.gz: 98e96a4cadc9e78772508f523bd697a743f39adb
 SHA512:
-  metadata.gz: 5acc3eb578fc4d02ec5373e0a3c1714a2ec1378d08d18a851faba5640a6c45f9bc1caf5f78e71a5c2780071123c767b9e3f21723dea8361b34d533635e72aa37
-  data.tar.gz: 889d4fb307dea20645ebf8b8fa6c5d013e055b3c63cf8dd26a956dbe9f40afc9bee21edde9e7897572b17a8de16cce61f6bd93368ecd0dc358421fb59614c042
+  metadata.gz: 0e559a6faf9421c5b179475f3624bc18bbd9fab54035ff29dbd8b773085e5334ba1bf3126eab0c0cb0562b78f30eb5ce3233c5d68892a83c8ea6bbcc74532680
+  data.tar.gz: 525113b7d28fae27e0036f7d68ca13c6cabd702c0232453c8362ed5ea25d8d099797e866c55da05015d7dc109fd99f1949acfed4d6550bf542b315f29d317b35

data/Gemfile.lock

@@ -1,14 +1,22 @@
 PATH
   remote: .
   specs:
-    mtr_monitor (0.16.0)
+    mtr_monitor (0.17.0)
+      logdna
       rt-watchman (~> 0.10.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    concurrent-ruby (1.0.5)
     diff-lcs (1.2.5)
+    json (2.1.0)
+    logdna (1.1.1)
+      concurrent-ruby (~> 1.0)
+      json (~> 2.0)
+      require_all (~> 1.4)
     rake (10.3.2)
+    require_all (1.5.0)
     rspec (3.4.0)
       rspec-core (~> 3.4.0)
       rspec-expectations (~> 3.4.0)

data/exe/mtr_report

@@ -16,6 +16,7 @@ aws_secret_access_key = ENV.fetch("AWS_SECRET_ACCESS_KEY")
 mtr_options           = ENV.fetch("MTR_OPTIONS", "")
 sleep_time            = ENV.fetch("SLEEP_TIME", "5").to_i
 dig_ip_address        = ENV.fetch("DIG_IP_ADDRESS").downcase == "yes" ? true : false
+logdna_ingestion_key  = ENV.fetch("LOGDNA_INGESTION_KEY")
 
 Watchman.host = ENV.fetch("WATCHMAN_HOST")
 Watchman.port = ENV.fetch("WATCHMAN_PORT", 8125).to_i
@@ -23,13 +24,14 @@ Watchman.prefix = "mtr-monitor.prod"
 
 loop do
   report = MtrMonitor::Report.new(name,
-      domain,
-      s3_bucket,
-      mtr_options,
-      aws_access_key_id,
-      aws_secret_access_key,
-      dig_ip_address,
-      logger)
+                                  domain,
+                                  s3_bucket,
+                                  mtr_options,
+                                  aws_access_key_id,
+                                  aws_secret_access_key,
+                                  dig_ip_address,
+                                  logdna_ingestion_key,
+                                  logger)
 
   logger.info "Generating report"
   report.generate

data/lib/mtr_monitor.rb

@@ -1,5 +1,6 @@
 require "watchman"
 require "logger"
+require "logdna"
 
 require "mtr_monitor/version"
 require "mtr_monitor/hop"
@@ -30,7 +31,7 @@ module MtrMonitor
     attr_reader :logger
     attr_reader :host_ip_address
 
-    def initialize(name, domain, s3_bucket, mtr_options, aws_access_key_id, aws_secret_access_key, dig_ip_address, logger = nil)
+    def initialize(name, domain, s3_bucket, mtr_options, aws_access_key_id, aws_secret_access_key, dig_ip_address, logdna_ingestion_key, logger = nil)
       @name                  = name
       @domain                = domain
       @s3_bucket             = s3_bucket
@@ -41,6 +42,11 @@ module MtrMonitor
       @hostname              = `hostname`.strip
       @dig_ip_address        = dig_ip_address
       @logger                = logger || Logger.new(STDOUT)
+      @logdna                = Logdna::Ruby.new(logdna_ingestion_key,
+                                               :ip  => @host_ip_address,
+                                               :app => "MTR monitor",
+                                               :meta => { :route => @name },
+                                               :level => "DEBUG")
 
       path = "#{@name}/#{Time.now.strftime("%Y-%m-%d")}/#{@host_ip_address.gsub(".", "-")}/#{Time.now.utc.strftime("%H-%M")}.log"
 
@@ -54,10 +60,16 @@ module MtrMonitor
 
       generate_local_report
       upload_to_s3
+      emit_provider_to_logdna
 
       MtrMonitor::Metrics.submit(@log_path, @hostname, @name, @logger)
     end
 
+    def emit_provider_to_logdna
+      @logdna.log("Network provider: Telia") if File.read(@log_path).include?("telia.net")
+      @logdna.log("Network provider: GTT")   if File.read(@log_path).include?("gtt.net")
+    end
+
     def generate_local_report
       destination = @dig_ip_address ? dig : @domain
 

data/lib/mtr_monitor/version.rb

@@ -1,3 +1,3 @@
 module MtrMonitor
-  VERSION = "0.16.0"
+  VERSION = "0.17.0"
 end

data/mtr_monitor.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "logdna"
   spec.add_dependency "rt-watchman", "~> 0.10.0"
 
   spec.add_development_dependency "bundler", "~> 1.16"

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: mtr_monitor
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.17.0
 platform: ruby
 authors:
 - RenderedText DevOps Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-09 00:00:00.000000000 Z
+date: 2018-01-10 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: logdna
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rt-watchman
   requirement: !ruby/object:Gem::Requirement