mtr_monitor 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da110fa521f48a26244e927226377ee5694e0682
-  data.tar.gz: 53a4f624724aee1c393966e4ee5da27f5f4e2deb
+  metadata.gz: b7c84d43ef8922804d7c968ef44e7e07ef2932d8
+  data.tar.gz: 42686ab91ceacd16256c2a2e4df95e28bfb8508a
 SHA512:
-  metadata.gz: 5bb114fdcf143e637c1467b68fa70adc2be00cbba64f1018647dd627971b0e678a2fe032af0fe3316bb44e691514d97a966a53c338e7a5ef68244e6f7b0152c9
-  data.tar.gz: 6658288209c3fd5d73c9cc11d2d2a3af46cde4ce3681f40dad523720c7fa30ce039d720b7fa1bce712a6e61840ba4d8ccc7415118a0484f07f10bc68f7c32dc7
+  metadata.gz: 635b63e1f77e8827b94a2036de0b52ad88474c9be644979af57f693f4ef0be2ad4ac36767212f048552910a08da48fa134ae16ffaf8b0549789296e4498aadcd
+  data.tar.gz: 5c086be79a78aba1059b01221242a39c43f4afff795ca03f75ab8aedb77604092068dfe5b8f125bd9caa54d13375430eb49a882c1026f98bf80465e674c4b5d0

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    mtr_monitor (0.3.0)
+    mtr_monitor (0.4.0)
+      rt-watchman (~> 0.10.0)
 
 GEM
   remote: https://rubygems.org/
@@ -21,6 +22,9 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
+    rt-watchman (0.10.0)
+      statsd-ruby (~> 1.3.0)
+    statsd-ruby (1.3.0)
 
 PLATFORMS
   ruby

data/README.md

@@ -17,17 +17,18 @@ Or install it on your system:
 gem install mtr_monitor
 ```
 
-## Generate an MTR report from the CLI
+## Usage
+
+### Generate an MTR report from the CLI
 
 ``` bash
-export S3_BUCKET=<>
-export AWS_ACCESS_KEY_ID=<>
-export AWS_SECRET_ACCESS_KEY=<>
+export AWS_ACCESS_KEY_ID=<XXX>
+export AWS_SECRET_ACCESS_KEY=<YYY>
 
-mtr_report "google" "google.com"
+mtr_report --name "test" --domain "google.com" --bucket "bucket-aaa"
 ```
 
-## Generate an MTR report from Ruby
+### Generate an MTR report from Ruby
 
 ``` ruby
 name   = "google"

data/exe/mtr_report

@@ -1,11 +1,30 @@
 #!/usr/bin/env ruby
 
 require "mtr_monitor"
+require "optparse"
 
-name   = ARGV[0]
-domain = ARGC[1]
+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)
 
-s3_bucket             = ENV["S3_BUCKET"]
 aws_access_key_id     = ENV["AWS_ACCESS_KEY_ID"]
 aws_secret_access_key = ENV["AWS_SECRET_ACCESS_KEY"]
 

data/lib/mtr_monitor.rb

@@ -1,4 +1,5 @@
 require "mtr_monitor/version"
+require "watchman"
 
 module MtrMonitor
   #
@@ -14,7 +15,7 @@ module MtrMonitor
       @aws_access_key_id = aws_access_key_id
       @aws_secret_access_key = aws_secret_access_key
 
-      @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
@@ -29,9 +30,7 @@ module MtrMonitor
     end
 
     def submit_metrics
-      report = `sudo cat #{@log_path}`
-
-      Mtr.parse(report).each do |hop|
+      hops.each do |hop|
         hop_name = hop.name.gsub(".", "-").gsub("?", "q")
         tags = [`hostname`.strip, @name, hop_name]
 
@@ -45,8 +44,8 @@ module MtrMonitor
       end
     end
 
-    def self.parse(report)
-      report.split("\n").map { |line| Hop.parse(line) }.compact
+    def hops
+      `sudo cat #{@log_path}`.split("\n").map { |line| Hop.parse(line) }.compact
     end
 
     def host_ip_address

data/lib/mtr_monitor/version.rb

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

data/mtr_monitor.gemspec

@@ -1,4 +1,3 @@
-
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "mtr_monitor/version"
@@ -20,6 +19,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "rt-watchman", "~> 0.10.0"
+
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mtr_monitor
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - RenderedText DevOps Team
@@ -10,6 +10,20 @@ bindir: exe
 cert_chain: []
 date: 2017-12-20 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rt-watchman
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement