mtr_monitor 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c561c98cc044312a97c61aa2b9db5f7cf15a26a1
-  data.tar.gz: ed9268b1a5cf09a5b76ce641f600ce12e2bd3ede
+  metadata.gz: 313e99208d4a3e22b39fed0cceae8fac9bec34e6
+  data.tar.gz: 0c214d66e760aa1833917ae0940b0366cea67a3f
 SHA512:
-  metadata.gz: a3675b8322277a60641263280029a66013aff8e7e31cfdd5f81debcb575deb9305c3bc9293716aa11ba28efa8f55a29a08a66da68db165d67499e5a428c7995b
-  data.tar.gz: 772989cc12984c01892d095a859fc8b8529eca45853f7a3bb3686bb27a7f69abe25ea28c138989b772e005d0ae92db5867ad30d2255f7c0e6a2ce67b23155bc1
+  metadata.gz: d426393820a1028e0c6be7a7a3642a14776fe059c8f1f9a49b51b8dc9eaf14493567bf404aeaf5f14c0aa8b6b76715b417069cfe01956cb4372c1792d65ae1af
+  data.tar.gz: a601410b5568d9d84b997c5ead41ec99d73cd03765920fcf921e41e430af2108a1a0e99f6a6008b99cfcd70c98409a14ac01c2ff54783af97f911a2fe09447bd

data/Gemfile.lock

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

data/Rakefile

@@ -18,6 +18,7 @@ task :deploy do
          --name mtr-monitor \
          --hostname "#{server}" \
          -v /var/log/mtr:/var/log/mtr \
+         -e DIG_IP_ADDRESS="#{ENV['DIG_IP_ADDRESS']}" \
          -e WATCHMAN_HOST="#{ENV['WATCHMAN_HOST']}" \
          -e NAME="#{ENV['NAME']}" \
          -e DOMAIN="#{ENV['DOMAIN']}" \

data/exe/mtr_report

@@ -15,6 +15,7 @@ aws_access_key_id     = ENV.fetch("AWS_ACCESS_KEY_ID")
 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", nil)
 
 Watchman.host = ENV.fetch("WATCHMAN_HOST")
 Watchman.port = ENV.fetch("WATCHMAN_PORT", 8125).to_i
@@ -27,6 +28,7 @@ loop do
       mtr_options,
       aws_access_key_id,
       aws_secret_access_key,
+      dig_ip_address,
       logger)
 
   logger.info "Generating report"

data/lib/mtr_monitor/version.rb

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

data/lib/mtr_monitor.rb

@@ -20,7 +20,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, logger = nil)
+    def initialize(name, domain, s3_bucket, mtr_options, aws_access_key_id, aws_secret_access_key, dig_ip_address, logger = nil)
       @name                  = name
       @domain                = domain
       @s3_bucket             = s3_bucket
@@ -29,6 +29,7 @@ module MtrMonitor
       @mtr_options           = mtr_options
       @host_ip_address       = `curl http://ifconfig.co`.strip.gsub(".", "-")
       @hostname              = `hostname`.strip.gsub(".", "-")
+      @dig_ip_address        = dig_ip_address
       @logger                = logger || Logger.new(STDOUT)
 
       @log_name  = "#{@name}/#{Time.now.strftime("%Y-%m-%d")}/#{@host_ip_address}/#{Time.now.strftime("%H-%M")}.log"
@@ -47,24 +48,30 @@ 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: #{@target_ip}" >> #{@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 #{@mtr_options} #{@domain} >> #{@log_path}')
+      run %Q(sudo sh -c 'mtr --report #{@mtr_options} #{destination} >> #{@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 dig
+      logger.info "Dig #{@domain} IP address"
+      run("dig +short #{@domain}").split("\n").first
+    end
+
     def run(cmd)
       logger.info "Running: #{cmd}"
 
       `#{cmd}`
     end
   end
-
 end

metadata

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