mtr_monitor 0.5.4 → 0.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92fd8474c303a47832df58c0e42882ea691e3ed8
-  data.tar.gz: b25e2265fb85fb8ba2e2c94cf87d89b9efc1e4fa
+  metadata.gz: 91b53ce8ac5bb956e5ea9e42f90cd9a446d22be7
+  data.tar.gz: 53166733f7d76fe2be5ce76fca2b480c64dc7697
 SHA512:
-  metadata.gz: 16966ca4a380502bbba35277e6000f4dee30e286222f89bbc76610d42eee20baf0b6beccc5187f038e682ee77bb8f3733fa909556a23968333263682d922ce41
-  data.tar.gz: e33d5400124b160f54c64c1e2ca5e47c7515ce1deb6fbff648774e9aafeb6a3152ef1bb1c889d67dce870ddac4f25155af10efabee06576bfa3084db0523876d
+  metadata.gz: bf94120283fa6d17e06996c8004497e671b42f49ba389b4735cde5aa1da1e1f5d738c84e4e7b0447ede38065b0e463fa9eb4cf2f4ee135412818fb9cd5cbcfd8
+  data.tar.gz: cd653d78dc67a762e6cf955874a7c7bc41f3091347d03ec1f7846cf9d62f1edfba70caea9b1474fbd20460ca1479e86b480f72e0f9c51ebc58a1ded2c1408c7d

data/Dockerfile

@@ -1,9 +1,8 @@
 FROM ubuntu:14.04
 
-RUN apt-get update && apt-get install -y mtr ruby python-pip
+RUN apt-get update && apt-get install -y curl mtr ruby python-pip
 
-RUN pip install awscli --upgrade --user
-RUN echo "export PATH=~/.local/bin:\$PATH" >> ~/.bashrc
+RUN pip install awscli
 
 RUN gem install mtr_monitor
 

data/Gemfile.lock

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

data/Rakefile

@@ -4,3 +4,31 @@ require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
+
+desc "Deploys mtr-monitor to servers"
+task :deploy do
+  server = ENV.fetch("SERVER")
+
+  output =
+    `ssh -o StrictHostKeychecking=no ubuntu@#{server} <<'ENDSSH'
+       docker stop mtr-monitor || true
+       docker rm mtr-monitor || true
+       docker pull renderedtext/mtr-monitor
+       docker run -d \
+         --name mtr-monitor \
+         --hostname "#{server}" \
+         -v /var/log/mtr:/var/log/mtr \
+         -e WATCHMAN_HOST="#{ENV['WATCHMAN_HOST']}" \
+         -e NAME="#{ENV['NAME']}" \
+         -e DOMAIN="#{ENV['DOMAIN']}" \
+         -e MTR_OPTIONS="#{ENV['MTR_OPTIONS']}" \
+         -e S3_BUCKET="#{ENV['S3_BUCKET']}" \
+         -e AWS_ACCESS_KEY_ID="#{ENV['AWS_ACCESS_KEY_ID']}" \
+         -e AWS_SECRET_ACCESS_KEY="#{ENV['AWS_SECRET_ACCESS_KEY']}" \
+         -e SLEEP_TIME="#{ENV['SLEEP_TIME']}" \
+         renderedtext/mtr-monitor
+ENDSSH`
+
+  puts output
+  exit 1 if $?.exitstatus != 0
+end

data/exe/mtr_report

@@ -13,6 +13,10 @@ 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
 
+Watchman.host = ENV.fetch("WATCHMAN_HOST")
+Watchman.port = ENV.fetch("WATCHMAN_PORT", 8125).to_i
+Watchman.prefix = "mtr-monitor.prod"
+
 loop do
   report = MtrMonitor::Report.new(name,
       domain,

data/lib/mtr_monitor/version.rb

@@ -1,3 +1,3 @@
 module MtrMonitor
-  VERSION = "0.5.4"
+  VERSION = "0.9.9"
 end

data/lib/mtr_monitor.rb

@@ -7,16 +7,19 @@ module MtrMonitor
   # to /var/log/mtr/<domain>_timestamp.log , uploads to s3 and reports metrics to statsd.
   #
   class Report
+    attr_reader :log_path
 
     def initialize(name, domain, s3_bucket, mtr_options, aws_access_key_id, aws_secret_access_key)
-      @name = name
-      @domain = domain
-      @s3_bucket = s3_bucket
-      @aws_access_key_id = aws_access_key_id
+      @name                  = name
+      @domain                = domain
+      @s3_bucket             = s3_bucket
+      @aws_access_key_id     = aws_access_key_id
       @aws_secret_access_key = aws_secret_access_key
-      @mtr_options = mtr_options
+      @mtr_options           = mtr_options
+      @host_ip_address       = `curl http://ifconfig.co`.strip.gsub(".", "-")
+      @hostname              = `hostname`.strip.gsub(".", "-")
 
-      @log_name  = "#{@name}/#{Time.now.strftime("%Y-%m-%d")}/#{host_ip_address}/#{Time.now.strftime("%H-%M")}.log"
+      @log_name  = "#{@name}/#{Time.now.strftime("%Y-%m-%d")}/#{@host_ip_address}/#{Time.now.strftime("%H-%M")}.log"
       @log_path  = "/var/log/mtr/#{@log_name.gsub("/", "-")}"
       @s3_path   = "s3://#{@s3_bucket}/#{@log_name}"
     end
@@ -31,9 +34,11 @@ module MtrMonitor
     end
 
     def submit_metrics
+      Watchman.submit("network.mtr.pulse", 1, :gauge, :tags => [@hostname, @name])
+
       hops.each do |hop|
         hop_name = hop.name.gsub(".", "-").gsub("?", "q")
-        tags = [`hostname`.strip, @name, hop_name]
+        tags = [@hostname, @name, hop_name]
 
         Watchman.submit("network.mtr.loss", hop.loss, :gauge, :tags => tags)
         Watchman.submit("network.mtr.snt", hop.snt, :gauge, :tags => tags)
@@ -49,14 +54,6 @@ module MtrMonitor
       `sudo cat #{@log_path}`.split("\n").map { |line| Hop.parse(line) }.compact
     end
 
-    def host_ip_address
-      `/sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1`.strip.gsub(".", "-")
-    end
-
-    def log_path
-      @log_path
-    end
-
     def run(cmd)
       `#{cmd}`
     end

metadata

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