mtr_monitor 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f243ceb197f20b9d5de15bf051212a8c5a77e435
-  data.tar.gz: 14228fd786c832de71a24e11ef3a21cf5b040665
+  metadata.gz: c561c98cc044312a97c61aa2b9db5f7cf15a26a1
+  data.tar.gz: ed9268b1a5cf09a5b76ce641f600ce12e2bd3ede
 SHA512:
-  metadata.gz: 12a84d0a0a2366827312408036b06588f336416041b9431c71faaaa81b7170ebad449873654caacc1024678460fddd775c2f8df5c9eb9e79ce0bbda1fffd821c
-  data.tar.gz: 8307dc83389ae67865afb23ecbe6af31ee66e77d95098258e47e24cd70bff854be44e5df29ba0e6c06a08c99c020ea5935fb8893f1b3477f0a0e298df8e90177
+  metadata.gz: a3675b8322277a60641263280029a66013aff8e7e31cfdd5f81debcb575deb9305c3bc9293716aa11ba28efa8f55a29a08a66da68db165d67499e5a428c7995b
+  data.tar.gz: 772989cc12984c01892d095a859fc8b8529eca45853f7a3bb3686bb27a7f69abe25ea28c138989b772e005d0ae92db5867ad30d2255f7c0e6a2ce67b23155bc1

data/Gemfile.lock

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

data/lib/mtr_monitor.rb

@@ -16,7 +16,9 @@ module MtrMonitor
 
   class Report
     attr_reader :log_path
+    attr_reader :s3_path
     attr_reader :logger
+    attr_reader :host_ip_address
 
     def initialize(name, domain, s3_bucket, mtr_options, aws_access_key_id, aws_secret_access_key, logger = nil)
       @name                  = name
@@ -38,13 +40,26 @@ module MtrMonitor
       logger.info "Local Path: #{@log_path}"
       logger.info "S3 Path: #{@s3_path}"
 
-      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}"
+      generate_local_report
+      upload_to_s3
 
       MtrMonitor::Metrics.submit(@log_path, @hostname, @name, @logger)
     end
 
+    def generate_local_report
+      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: #{@target_ip}" >> #{@log_path}')
+      run %Q(sudo sh -c 'echo "---------------------------------------" >> #{@log_path}')
+      run %Q(sudo sh -c 'mtr --report #{@mtr_options} #{@domain} >> #{@log_path}')
+    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})
+    end
+
     def run(cmd)
       logger.info "Running: #{cmd}"
 

data/lib/mtr_monitor/version.rb

@@ -1,3 +1,3 @@
 module MtrMonitor
-  VERSION = "0.11.0"
+  VERSION = "0.12.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mtr_monitor
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - RenderedText DevOps Team