mtr_monitor 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 216fbb219b4e25dc96db100a8e3301567a7f35ca
-  data.tar.gz: 0c868a8045186925f324d54ab9e734641d518193
+  metadata.gz: d7d1959c271eaaf0c608b691382a9312e0390c40
+  data.tar.gz: f42a91701e3bc65d6968cebf76fea2e0c648815d
 SHA512:
-  metadata.gz: 8c36f4e0fcb3dc1542992bc661561ea13c2b8bc1172bf5feabe525382f62cbbd3f411197a08e54338be6bf64f0fad6ce121790619af0fe7abeea5bd2d5e46523
-  data.tar.gz: 58114a469cd54fb63a7b8568367fc4355aaf2c5a39bfe5fea2c2ba6d650533ba09a24772a74c3e9d3b9b99abde00c1ee80a8748be1df18a41f6300b95e0bf49c
+  metadata.gz: dbb9814cd4ce652c631444690cd30f633c0e7585449267cb3ea5abddcc6f69d26ffb81f334b56ab61c58ea117a8bf7822c39d65f6527a4dd22746482051759a8
+  data.tar.gz: 01bef7c769e2dfa144b2eb1682b5fef0301aecbf969006c2038bfc8cad80ed91d4a8683edb043f738fd4ee4898584a50614482a087219e9e221d1a65cb467e01

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mtr_monitor (1.0.0)
+    mtr_monitor (1.0.1)
       logdna
       rt-watchman (~> 0.10.0)
 

data/Makefile

@@ -22,7 +22,7 @@ http-endpoint-push: http-endpoint-build
 	docker push renderedtext/mtr-nginx
 
 deploy-us-east-1:
-	DIG_IP_ADDRESS=yes                                  \
+	DIG_IP_ADDRESS=no                                   \
 	SLEEP_TIME=5                                        \
 	NAME="us-east-1-to-hetzner"                         \
 	SERVER="ec2.mtr-monitor.us-east-1.semaphoreci.com"  \
@@ -32,7 +32,7 @@ deploy-us-east-1:
 	bundle exec rake deploy
 
 deploy-us-west-1:
-	DIG_IP_ADDRESS=yes                                  \
+	DIG_IP_ADDRESS=no                                   \
 	SLEEP_TIME=5                                        \
 	NAME="us-west-1-to-hetzner"                         \
 	SERVER="ec2.mtr-monitor.us-west-1.semaphoreci.com"  \
@@ -42,7 +42,7 @@ deploy-us-west-1:
 	bundle exec rake deploy
 
 deploy-us-west-2:
-	DIG_IP_ADDRESS=yes                                  \
+	DIG_IP_ADDRESS=no                                   \
 	SLEEP_TIME=5                                        \
 	NAME="us-west-2-to-hetzner"                         \
 	SERVER="ec2.mtr-monitor.us-west-2.semaphoreci.com"  \

data/docker-compose.yml

@@ -8,7 +8,7 @@ services:
       - /var/log/mtr:/var/log/mtr
     environment:
       - LOGDNA_INGESTION_KEY
-      - DOMAIN
+      - MTR_TARGET_DOMAIN
       - WATCHMAN_HOST
       - SLEEP_TIME
       - AWS_SECRET_ACCESS_KEY

data/lib/mtr_monitor/tier1_logger.rb

@@ -0,0 +1,42 @@
+module MtrMonitor
+  class Tier1Logger
+
+    def self.submit(*args)
+      new(*args).submit
+    end
+
+    def initialize(route_name, logdna_ingestion_key, host_ip_address, local_log_path, s3_url, logger)
+      config = {
+        :ip => host_ip_address,
+        :app => "MTR monitor",
+        :meta => { :route => route_name, :s3 => s3_url },
+        :level => "DEBUG"
+      }
+
+      @logdna  = Logdna::Ruby.new(logdna_ingestion_key, config)
+      @mtr_log = File.read(local_log_path)
+    end
+
+    def submit
+      logdna.log(tier1_provider)
+      logger.info("Network provider: #{tier1_provider} -- Emitted to LogDNA")
+    end
+
+    private
+
+    def tier1_provider
+      @tier1_provider ||= if @mtr_log.include?("telia.net")
+                            "Telia"
+                          elsif @mtr_log.include?("gtt.net")
+                            "GTT"
+                          elsif @mtr_log.include?("ntt.net")
+                            "NTT"
+                          elsif @mtr_log.include?("core-backbone.com")
+                            "Core Backbone"
+                          else
+                            "Unknown network provider"
+                          end
+    end
+
+  end
+end

data/lib/mtr_monitor/version.rb

@@ -1,3 +1,3 @@
 module MtrMonitor
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/lib/mtr_monitor.rb

@@ -5,6 +5,7 @@ require "logdna"
 require "mtr_monitor/version"
 require "mtr_monitor/hop"
 require "mtr_monitor/metrics"
+require "mtr_monitor/tier1_logger"
 require "mtr_monitor/cleaner"
 
 module MtrMonitor
@@ -43,14 +44,6 @@ module MtrMonitor
       @dig_ip_address        = dig_ip_address
       @logger                = logger || Logger.new(STDOUT)
       @created_at            = Time.now.utc
-      @logdna                = Logdna::Ruby.new(logdna_ingestion_key,
-                                               :ip    => @host_ip_address,
-                                               :app   => "MTR monitor",
-                                               :meta  => {
-                                                 :route => @name,
-                                                 :s3    => s3_url
-                                               },
-                                               :level => "DEBUG")
     end
 
     def s3_url
@@ -75,52 +68,11 @@ module MtrMonitor
 
       generate_local_report
       upload_to_s3
-      emit_provider_to_logdna
 
+      MtrMonitor::Tier1Logger.submit(@name, @logdna_ingestion_key, local_log_path, @host_ip_address, s3_uri, @logger)
       MtrMonitor::Metrics.submit(local_log_path, @hostname, @name, @logger)
     end
 
-    def emit_provider_to_logdna
-      mtr_log = File.read(local_log_path)
-
-      if mtr_log.include?("telia.net")
-        telia
-      elsif mtr_log.include?("gtt.net")
-        gtt
-      elsif mtr_log.include?("ntt.net")
-        ntt
-      elsif mtr_log.include?("core-backbone.com")
-        core_backbone
-      else
-        unknown
-      end
-    end
-
-    def telia
-      @logdna.log("Telia")
-      @logger.info("Network provider: Telia -- Emitted to LogDNA")
-    end
-
-    def gtt
-      @logdna.log("GTT")
-      @logger.info("Network provider: GTT -- Emitted to LogDNA")
-    end
-
-    def ntt
-      @logdna.log("NTT")
-      @logger.info("Network provider: NTT -- Emitted to LogDNA")
-    end
-
-    def core_backbone
-      @logdna.log("Core Backbone")
-      @logger.info("Network provider: Core Backbone -- Emitted to LogDNA")
-    end
-
-    def unknown
-      @logdna.log("Unknown network provider ")
-      @logger.info("Network provider: Unknown -- Emitted to LogDNA")
-    end
-
     def generate_local_report
       run %Q(sudo mkdir -p /var/log/mtr)
       run %Q(sudo sh -c 'echo "Version:   #{MtrMonitor::VERSION}"       >> #{local_log_path}')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mtr_monitor
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - RenderedText DevOps Team
@@ -111,6 +111,7 @@ files:
 - lib/mtr_monitor/cleaner.rb
 - lib/mtr_monitor/hop.rb
 - lib/mtr_monitor/metrics.rb
+- lib/mtr_monitor/tier1_logger.rb
 - lib/mtr_monitor/version.rb
 - mtr_monitor.gemspec
 homepage: https://github.com/renderedtext/mtr-monitor