mtr_monitor 1.0.5 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0f7879d41a23408760b4dd3d8652a7769ae6f45
-  data.tar.gz: 96c7805b9cc50aac385f5efef88203a4e9d28baf
+  metadata.gz: b51473f33cd5da42ade150a1ea3ba04222c88a14
+  data.tar.gz: 17f7d4ca9a0b2f36efac83283f045697e2c21cb8
 SHA512:
-  metadata.gz: 1b069de5aab3f2fb7810e87ab8c06022026d4ce45a1bae4ecaedc924d93c4aecaa7e7945a2b0d1749f5d77bf2acf0b8dd6a519d0a62292ef7ea4e70b421b1f4e
-  data.tar.gz: 0c49db5286df9ceb503cf358de8a396a43f2aab305650ab3fdb113a70502b240a7d2ddf661aae5cdbd8f1f312ead8670ca30a6d06a506f9eb6b7d473719c664a
+  metadata.gz: 8aec9b3fb211aaa0026767efa6cc83f5a170d444eb14a7355740301af7cb0cc670da99327aa802dcb65689f9d6fabca85186560a8cee076400b14609f0970b0d
+  data.tar.gz: 11d49f05aafb190b81c5c2e8532ccc9982c8a7c922186d8978b0bc13e851276302bcca5cb3fc01688db1da484c2ac56465709df5924cc6788b89b48d44dc450c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mtr_monitor (1.0.5)
+    mtr_monitor (1.1.0)
       logdna
       rt-watchman (~> 0.10.0)
 

data/Makefile

@@ -27,8 +27,8 @@ deploy-us-east-1:
 	NAME="us-east-1-to-hetzner"                         \
 	SERVER="ec2.mtr-monitor.us-east-1.semaphoreci.com"  \
 	HOSTNAME="mtr-monitor.us-east-1.semaphoreci.com"    \
-	MTR_OPTIONS="-w -z -c 50 -f 12"                     \
-	MTR_TARGET_DOMAIN=136.243.108.222                   \
+	MTR_OPTIONS="-w -c 50 -f 12"                        \
+	MTR_TARGETS="136.243.108.222,138.201.31.31,138.201.32.17" \
 	bundle exec rake deploy
 
 deploy-us-west-1:
@@ -37,8 +37,8 @@ deploy-us-west-1:
 	NAME="us-west-1-to-hetzner"                         \
 	SERVER="ec2.mtr-monitor.us-west-1.semaphoreci.com"  \
 	HOSTNAME="mtr-monitor.us-west-1.semaphoreci.com"    \
-	MTR_OPTIONS="-w -z -c 50 -f 12"                     \
-	MTR_TARGET_DOMAIN=136.243.108.222                   \
+	MTR_OPTIONS="-w -c 50 -f 12"                        \
+	MTR_TARGETS="136.243.108.222,138.201.31.31,138.201.32.17" \
 	bundle exec rake deploy
 
 deploy-us-west-2:
@@ -47,6 +47,6 @@ deploy-us-west-2:
 	NAME="us-west-2-to-hetzner"                         \
 	SERVER="ec2.mtr-monitor.us-west-2.semaphoreci.com"  \
 	HOSTNAME="mtr-monitor.us-west-2.semaphoreci.com"    \
-	MTR_OPTIONS="-w -z -c 50 -f 12"                     \
-	MTR_TARGET_DOMAIN=136.243.108.222                   \
+	MTR_OPTIONS="-w -c 50 -f 12"                        \
+	MTR_TARGETS="136.243.108.222,138.201.31.31,138.201.32.17" \
 	bundle exec rake deploy

data/Rakefile

@@ -11,7 +11,7 @@ task :deploy do
 
   File.open(".env", "w") do |f|
     f.write("LOGDNA_INGESTION_KEY=#{ENV.fetch("LOGDNA_INGESTION_KEY")}\n")
-    f.write("MTR_TARGET_DOMAIN=#{ENV.fetch("MTR_TARGET_DOMAIN")}\n")
+    f.write("MTR_TARGETS=#{ENV.fetch("MTR_TARGET_DOMAIN")}\n")
     f.write("WATCHMAN_HOST=#{ENV.fetch("WATCHMAN_HOST")}\n")
     f.write("SLEEP_TIME=#{ENV.fetch("SLEEP_TIME")}\n")
     f.write("AWS_SECRET_ACCESS_KEY=#{ENV.fetch("AWS_SECRET_ACCESS_KEY")}\n")

data/exe/mtr_report

@@ -6,10 +6,12 @@ $stdout.sync = true
 require "mtr_monitor"
 require "logger"
 
-logger = Logger.new(STDOUT)
+Watchman.host = ENV.fetch("WATCHMAN_HOST")
+Watchman.port = ENV.fetch("WATCHMAN_PORT", 8125).to_i
+Watchman.prefix = "mtr-monitor.prod"
 
 name                  = ENV.fetch("NAME")
-mtr_target_domain     = ENV.fetch("MTR_TARGET_DOMAIN")
+mtr_targets           = ENV.fetch("MTR_TARGETS")
 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")
@@ -17,24 +19,30 @@ mtr_options           = ENV.fetch("MTR_OPTIONS", "")
 sleep_time            = ENV.fetch("SLEEP_TIME", "5").to_i
 dig_ip_address        = ENV.fetch("DIG_IP_ADDRESS").downcase == "yes" ? true : false
 logdna_ingestion_key  = ENV.fetch("LOGDNA_INGESTION_KEY")
-
-Watchman.host = ENV.fetch("WATCHMAN_HOST")
-Watchman.port = ENV.fetch("WATCHMAN_PORT", 8125).to_i
-Watchman.prefix = "mtr-monitor.prod"
+logger                = Logger.new(STDOUT)
+
+def generate_report(mtr_target)
+  options = {
+    :name => name,
+    :mtr_target => mtr_target,
+    :s3_bucket => s3_bucket,
+    :mtr_options => mtr_options,
+    :aws_access_key_id => aws_access_key_id,
+    :aws_secret_access_key => aws_secret_access_key,
+    :dig_ip_address => dig_ip_address,
+    :logdna_ingestion_key => logdna_ingestion_key,
+    :logger => logger
+  }
+
+  MtrMonitor::Report.new(options).generate
+end
 
 loop do
-  report = MtrMonitor::Report.new(name,
-                                  mtr_target_domain,
-                                  s3_bucket,
-                                  mtr_options,
-                                  aws_access_key_id,
-                                  aws_secret_access_key,
-                                  dig_ip_address,
-                                  logdna_ingestion_key,
-                                  logger)
-
-  logger.info "Generating report"
-  report.generate
+  mtr_targets.split(",").each do |mtr_target|
+    logger.info "Generating report for #{mtr_target}"
+
+    generate_report(mtr_target)
+  end
 
   logger.info "Running Cleaner"
   MtrMonitor::Cleaner.execute(logger)

data/lib/mtr_monitor/version.rb

@@ -1,3 +1,3 @@
 module MtrMonitor
-  VERSION = "1.0.5"
+  VERSION = "1.1.0"
 end

data/lib/mtr_monitor.rb

@@ -32,17 +32,18 @@ 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, dig_ip_address, logdna_ingestion_key, logger = nil)
-      @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
+    def initialize(options)
+      @name                  = options.fetch(:name)
+      @domain                = options.fetch(:mtr_target)
+      @s3_bucket             = options.fetch(:s3_bucket)
+      @aws_access_key_id     = options.fetch(:aws_access_key_id)
+      @aws_secret_access_key = options.fetch(:aws_secret_access_key)
+      @mtr_options           = options.fetch(:mtr_options)
+      @dig_ip_address        = options.fetch(:dig_ip_address)
+      @logger                = options.fetch(:logger, Logger.new(STDOUT))
+
       @host_ip_address       = `dig +short myip.opendns.com @resolver1.opendns.com`.strip
       @hostname              = `hostname`.strip
-      @dig_ip_address        = dig_ip_address
-      @logger                = logger || Logger.new(STDOUT)
       @created_at            = Time.now.utc
     end
 

metadata

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