mtr_monitor 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7c84d43ef8922804d7c968ef44e7e07ef2932d8
-  data.tar.gz: 42686ab91ceacd16256c2a2e4df95e28bfb8508a
+  metadata.gz: 5f4fc19a4c802efd3bc96fca5ca2f737c0147eb0
+  data.tar.gz: df11b7d5705fdc2a086702889bec29cf3bcc4c77
 SHA512:
-  metadata.gz: 635b63e1f77e8827b94a2036de0b52ad88474c9be644979af57f693f4ef0be2ad4ac36767212f048552910a08da48fa134ae16ffaf8b0549789296e4498aadcd
-  data.tar.gz: 5c086be79a78aba1059b01221242a39c43f4afff795ca03f75ab8aedb77604092068dfe5b8f125bd9caa54d13375430eb49a882c1026f98bf80465e674c4b5d0
+  metadata.gz: ddb342e7429f1018777e1e98e1e198f31df57e084709f5229686da3937c94a28fb81a93766907c6a9485a7a2f25be2196a24cec23f7dc3462508b9248c64518f
+  data.tar.gz: 980bb3e934e45d20f729f47710f770e0f5ee8dacf4b14f7a5775ffb047257cf24f6f2874cec3874fc6a27b32371812ffe2b9250bef0639a3dee39477f86c2fc4

data/Dockerfile

@@ -0,0 +1,10 @@
+FROM ubuntu:14.04
+
+RUN apt-get update && apt-get install -y mtr ruby python-pip
+
+RUN pip install awscli --upgrade --user
+RUN echo "export PATH=~/.local/bin:\$PATH" >> ~/.bashrc
+
+RUN gem install mtr_monitor
+
+CMD ["bash", "-c", "mtr_report"]

data/Gemfile.lock

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

data/README.md

@@ -1,34 +1,26 @@
 # MtrMonitor
 
-Generates a MTR report, uploads the report to S3, and finally parses the report
-and collects statsd metrics.
+[![Build Status](https://semaphoreci.com/api/v1/renderedtext/mtr-monitor/branches/master/badge.svg)](https://semaphoreci.com/renderedtext/mtr-monitor)
 
-## Installation
 
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'mtr_monitor'
-```
+Generates a MTR report, uploads the report to S3, and finally parses the report
+and collects statsd metrics.
 
-Or install it on your system:
+### Run mtr_monitor as a docker container
 
 ``` bash
-gem install mtr_monitor
+docker run -d -v /var/log/mtr:/var/log/mtr -e NAME=<> -e DOMAIN=<> -e MTR_OPTIONS=<> -e S3_BUCKET=<> -e AWS_ACCESS_KEY_ID=<> -e AWS_SECRET_ACCESS_KEY=<> -e SLEEP_TIME=<> renderedtext/mtr_monitor
 ```
 
-## Usage
-
-### Generate an MTR report from the CLI
+### Generate an MTR report from Ruby
 
-``` bash
-export AWS_ACCESS_KEY_ID=<XXX>
-export AWS_SECRET_ACCESS_KEY=<YYY>
+Install mtr_monitor as a gem:
 
-mtr_report --name "test" --domain "google.com" --bucket "bucket-aaa"
+```ruby
+gem 'mtr_monitor'
 ```
 
-### Generate an MTR report from Ruby
+Invoke mtr generation:
 
 ``` ruby
 name   = "google"

data/docker-compose.yml

@@ -0,0 +1,5 @@
+version: "2.0"
+
+services:
+  app:
+    build: .

data/exe/mtr_report

@@ -1,41 +1,29 @@
 #!/usr/bin/env ruby
 
 require "mtr_monitor"
-require "optparse"
 
-options = {}
-
-OptionParser.new do |opts|
-
-  opts.on("--domain [DOMAIN]", "Domain to Test") do |domain|
-    options[:domain] = domain
-  end
-
-  opts.on("--name [NAME]", "Name of the Report") do |name|
-    options[:name] = name
-  end
-
-  opts.on("--bucket [BUCKET]", "Name of the S3 Bucket") do |bucket|
-    options[:bucket] = bucket
-  end
-
-end.parse!
-
-name      = options.fetch(:name)
-domain    = options.fetch(:domain)
-s3_bucket = options.fetch(:bucket)
-
-aws_access_key_id     = ENV["AWS_ACCESS_KEY_ID"]
-aws_secret_access_key = ENV["AWS_SECRET_ACCESS_KEY"]
-
-report = MtrMonitor::Report.new(name,
-    domain,
-    s3_bucket,
-    aws_access_key_id,
-    aws_secret_access_key)
-
-puts "Generating report"
-report.generate
-
-puts "Submiting metrics"
-report.submit_metrics
+name                  = ENV.fetch("NAME")
+domain                = ENV.fetch("DOMAIN")
+s3_bucket             = ENV.fetch("S3_BUCKET")
+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
+
+loop do
+  report = MtrMonitor::Report.new(name,
+      domain,
+      s3_bucket,
+      mtr_options,
+      aws_access_key_id,
+      aws_secret_access_key)
+
+  puts "Generating report"
+  report.generate
+
+  puts "Submiting metrics"
+  report.submit_metrics
+
+  puts "Sleeping for #{sleep_time} minutes"
+  sleep(sleep_time * 60)
+end

data/lib/mtr_monitor.rb

@@ -8,12 +8,13 @@ module MtrMonitor
   #
   class Report
 
-    def initialize(name, domain, s3_bucket, aws_access_key_id, aws_secret_access_key)
+    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
       @aws_secret_access_key = aws_secret_access_key
+      @mtr_options = mtr_options
 
       @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("/", "-")}"
@@ -24,9 +25,9 @@ module MtrMonitor
       puts "Local Path : #{@log_path}"
       puts "S3 Path    : #{@s3_path}"
 
-      `sudo mkdir -p /var/log/mtr`
-      `sudo sh -c 'mtr --report #{@domain} > #{@log_path}'`
-      `AWS_ACCESS_KEY_ID='#{@aws_access_key_id}' AWS_SECRET_ACCESS_KEY='#{@aws_secret_access_key}' aws s3 cp #{@log_path} #{@s3_path}`
+      run "sudo mkdir -p /var/log/mtr"
+      run "sudo sh -c '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}"
     end
 
     def submit_metrics
@@ -51,6 +52,14 @@ module MtrMonitor
     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
   end
 
   class Hop

data/lib/mtr_monitor/version.rb

@@ -1,3 +1,3 @@
 module MtrMonitor
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mtr_monitor
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - RenderedText DevOps Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-20 00:00:00.000000000 Z
+date: 2017-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rt-watchman
@@ -77,6 +77,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - CODE_OF_CONDUCT.md
+- Dockerfile
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -84,6 +85,7 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- docker-compose.yml
 - exe/mtr_report
 - lib/mtr_monitor.rb
 - lib/mtr_monitor/version.rb
@@ -108,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Generate, parse, and collect MTR reports