mtr_monitor 0.17.4 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66793c37ff370c8719a1df787d8951b8295dcac2
-  data.tar.gz: 0e657330ea76728cea3ba824c8f854af826cbc6b
+  metadata.gz: a26972975a867e9e8a9510dfd32b4e24991e6c85
+  data.tar.gz: dea7489cce159ab1ed20271d726902b362d9f53f
 SHA512:
-  metadata.gz: 151e88fbafb466e30a209ccd3a071136c12ddfba2efcbef21aa1593e0ec7a4635515d57ea9508bd5a33679773ea82763bf833e8d4b2f071ab3c4228cce204ab4
-  data.tar.gz: 4b54e7ccfe1d01a63a4863bf72573f09736a68aeaa9346f5254bf7ab8371d93bb47153408b36084094ffc7e46b5f4397cedfca12a142ad3c1532767187118ca5
+  metadata.gz: 8c6d4c4f74ef30563a2892a0ce89b5376bf4bf13e550ea72d85081585ecf54613b1c42cc3484afd66397bf469e077e550ce655c3403f872fc251c8410c54c474
+  data.tar.gz: d758aca42f697617530f62c0433b556109aea48ba06b5744da05945aecb8e7018dec98c9ca8b82bc5d8dfa4752e69397810b3d230e3cb2346d38603e4b4dca2a

data/Gemfile.lock

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

data/lib/mtr_monitor.rb

@@ -23,7 +23,7 @@ module MtrMonitor
   # MTR Options: Options to pass to the mtr command line tool.
   #
 
-  REPORTS_PATH = "/var/log/mtr"
+  LOCAL_REPORTS_DIR = "/var/log/mtr"
 
   class Report
     attr_reader :log_path
@@ -43,30 +43,44 @@ module MtrMonitor
       @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 },
+                                               :ip    => @host_ip_address,
+                                               :app   => "MTR monitor",
+                                               :meta  => {
+                                                 :route => @name,
+                                                 :s3    => s3_url
+                                               },
                                                :level => "DEBUG")
+    end
 
-      path = "#{@name}/#{Time.now.strftime("%Y-%m-%d")}/#{@host_ip_address.gsub(".", "-")}/#{Time.now.utc.strftime("%H-%M")}.log"
+    def s3_url
+      "https://s3.eu-central-1.amazonaws.com/#{@bucket}/#{path}"
+    end
 
-      @log_path  = "#{MtrMonitor::REPORTS_PATH}/#{path.gsub("/", "-")}"
-      @s3_path   = "s3://#{@s3_bucket}/#{path}"
+    def s3_uri
+      "s3://#{@s3_bucket}/#{path}"
+    end
+
+    def local_log_path
+      "#{MtrMonitor::LOCAL_REPORTS_DIR}/#{path.gsub("/", "-")}"
+    end
+
+    def path
+      "#{@name}/#{Time.now.strftime("%Y-%m-%d")}/#{@host_ip_address.gsub(".", "-")}/#{Time.now.utc.strftime("%H-%M")}.log"
     end
 
     def generate
-      logger.info "Local Path: #{@log_path}"
-      logger.info "S3 Path: #{@s3_path}"
+      logger.info "Local Path: #{local_log_path}"
+      logger.info "S3 URI: #{s3_uri}"
 
       generate_local_report
       upload_to_s3
       emit_provider_to_logdna
 
-      MtrMonitor::Metrics.submit(@log_path, @hostname, @name, @logger)
+      MtrMonitor::Metrics.submit(local_log_path, @hostname, @name, @logger)
     end
 
     def emit_provider_to_logdna
-      mtr_log = File.read(@log_path)
+      mtr_log = File.read(local_log_path)
 
       if mtr_log.include?("telia.net")
         telia
@@ -80,17 +94,17 @@ module MtrMonitor
     end
 
     def telia
-      @logdna.log("Telia network provider")
+      @logdna.log("Telia")
       @logger.info("Network provider: Telia -- Emitted to LogDNA")
     end
 
     def gtt
-      @logdna.log("GTT network provider")
+      @logdna.log("GTT")
       @logger.info("Network provider: GTT -- Emitted to LogDNA")
     end
 
     def ntt
-      @logdna.log("NTT network provider")
+      @logdna.log("NTT")
       @logger.info("Network provider: NTT -- Emitted to LogDNA")
     end
 
@@ -100,19 +114,22 @@ module MtrMonitor
     end
 
     def generate_local_report
-      destination = @dig_ip_address ? dig : @domain
-
       run %Q(sudo mkdir -p /var/log/mtr)
-      run %Q(sudo sh -c 'echo "Name: #{@name}" >> #{@log_path}')
-      run %Q(sudo sh -c 'echo "Domain: #{@domain}" >> #{@log_path}')
-      run %Q(sudo sh -c 'echo "Source IP: #{@host_ip_address}" >> #{@log_path}')
-      run %Q(sudo sh -c 'echo "Target IP: #{destination}" >> #{@log_path}')
-      run %Q(sudo sh -c 'echo "---------------------------------------" >> #{@log_path}')
-      run %Q(sudo sh -c 'mtr --report --report-wide #{@mtr_options} #{destination} >> #{@log_path}')
+      run %Q(sudo sh -c 'echo "Version:   #{MtrMonitor::VERSION}"       >> #{local_log_path}')
+      run %Q(sudo sh -c 'echo "Name:      #{@name}"                     >> #{local_log_path}')
+      run %Q(sudo sh -c 'echo "Domain:    #{@domain}"                   >> #{local_log_path}')
+      run %Q(sudo sh -c 'echo "Source IP: #{@host_ip_address}"          >> #{local_log_path}')
+      run %Q(sudo sh -c 'echo "Target IP: #{destination}"               >> #{local_log_path}')
+      run %Q(sudo sh -c 'echo "---------------------------------------" >> #{local_log_path}')
+      run %Q(sudo sh -c 'mtr --report --report-wide #{@mtr_options} #{destination} >> #{local_log_path}')
+    end
+
+    def destination
+      @dig_ip_address ? dig : @domain
     end
 
     def upload_to_s3
-      run %Q(AWS_ACCESS_KEY_ID='#{@aws_access_key_id}' AWS_SECRET_ACCESS_KEY='#{@aws_secret_access_key}' aws s3 cp #{@log_path} #{@s3_path})
+      run %Q(AWS_ACCESS_KEY_ID='#{@aws_access_key_id}' AWS_SECRET_ACCESS_KEY='#{@aws_secret_access_key}' aws s3 cp #{local_log_path} #{s3_uri})
     end
 
     def dig

data/lib/mtr_monitor/cleaner.rb

@@ -21,7 +21,7 @@ module MtrMonitor
     end
 
     def self.all_reports
-      Dir.glob("#{MtrMonitor::REPORTS_PATH}/*")
+      Dir.glob("#{MtrMonitor::LOCAL_REPORTS_DIR}/*")
     end
 
   end

data/lib/mtr_monitor/version.rb

@@ -1,3 +1,3 @@
 module MtrMonitor
-  VERSION = "0.17.4"
+  VERSION = "0.18.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mtr_monitor
 version: !ruby/object:Gem::Version
-  version: 0.17.4
+  version: 0.18.0
 platform: ruby
 authors:
 - RenderedText DevOps Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-10 00:00:00.000000000 Z
+date: 2018-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logdna