mtr_monitor 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff6b4c4b726106fd0654fbc8ef65b25a9ba9a93e
-  data.tar.gz: 1bd6f6c3f5719f6f47b954330e4ee09ead71890b
+  metadata.gz: 102a79b550de80dc926bc8b6b31da0819b9de0ae
+  data.tar.gz: 914f873fb0b95d3304438d2261668a5818e3453d
 SHA512:
-  metadata.gz: d86b880cf3dc19fa7a9b50f1c2cceddb7cc876c61337d2ff4e435bcf73fe8ec8ba37398bffa9e720658f0a9698007c6cb23492c51323d20e4099e4f3b5f7ff81
-  data.tar.gz: 5b97dad3d6c818c79027c901b7f67ef0a11a44dc72cf1ad03b4f222482640a1e7f839ab7148b322759a423bf777716b9fc3f24931fae6971857f5614e5fa5602
+  metadata.gz: b4756d01e114839c3c5692e3a00975232d6bd957dadc9c3daea3e09d3518b1021166de4933adcdba77c4320798d27256bc091bbd1a0fbc36eb190116bd28ff06
+  data.tar.gz: ce53b6446295565b49a3210419baa7975b1a680adcaaa41825ee91cdd2f2a6dd3a46d863ffc0b26d6aff5ddc666d687be878071d32b4b4b3ed1d56cce581683c

data/Gemfile.lock

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

data/Makefile

@@ -28,7 +28,7 @@ deploy-us-east-1:
 	SERVER="ec2.mtr-monitor.us-east-1.semaphoreci.com"  \
 	HOSTNAME="mtr-monitor.us-east-1.semaphoreci.com"    \
 	MTR_OPTIONS="-w -c 50 -f 12"                        \
-	MTR_TARGETS="136.243.108.222,138.201.31.31,138.201.32.17" \
+	MTR_TARGETS="136.243.131.198,138.201.31.31,144.76.223.42,148.251.87.12,176.9.62.126,78.46.21.203,88.99.58.112,94.130.34.185" \
 	bundle exec rake deploy
 
 deploy-us-west-1:
@@ -38,7 +38,7 @@ deploy-us-west-1:
 	SERVER="ec2.mtr-monitor.us-west-1.semaphoreci.com"  \
 	HOSTNAME="mtr-monitor.us-west-1.semaphoreci.com"    \
 	MTR_OPTIONS="-w -c 50 -f 12"                        \
-	MTR_TARGETS="136.243.108.222,138.201.31.31,138.201.32.17" \
+	MTR_TARGETS="136.243.131.198,138.201.31.31,144.76.223.42,148.251.87.12,176.9.62.126,78.46.21.203,88.99.58.112,94.130.34.185" \
 	bundle exec rake deploy
 
 deploy-us-west-2:
@@ -48,5 +48,5 @@ deploy-us-west-2:
 	SERVER="ec2.mtr-monitor.us-west-2.semaphoreci.com"  \
 	HOSTNAME="mtr-monitor.us-west-2.semaphoreci.com"    \
 	MTR_OPTIONS="-w -c 50 -f 12"                        \
-	MTR_TARGETS="136.243.108.222,138.201.31.31,138.201.32.17" \
+	MTR_TARGETS="136.243.131.198,138.201.31.31,144.76.223.42,148.251.87.12,176.9.62.126,78.46.21.203,88.99.58.112,94.130.34.185" \
 	bundle exec rake deploy

data/Rakefile

@@ -25,7 +25,9 @@ task :deploy do
 
   run "scp -o StrictHostKeyChecking=no .env ubuntu@#{server}:/home/ubuntu/"
   run "scp -o StrictHostKeyChecking=no docker-compose.yml ubuntu@#{server}:/home/ubuntu/"
-  run "ssh -o StrictHostKeychecking=no ubuntu@#{server} 'docker-compose down --rmi all && docker-compose up -d'"
+  run "ssh -o StrictHostKeychecking=no ubuntu@#{server} 'docker-compose down'"
+  run "ssh -o StrictHostKeychecking=no ubuntu@#{server} 'docker system prune --all --force'"
+  run "ssh -o StrictHostKeychecking=no ubuntu@#{server} 'docker-compose up -d'"
   run "rm .env"
 end
 

data/docker-compose.yml

@@ -17,8 +17,14 @@ services:
       - MTR_OPTIONS
       - NAME
       - DIG_IP_ADDRESS
+    logging:
+      options:
+        max-size: 200m
 
   nginx:
     image: renderedtext/mtr-nginx
     ports:
       - 80:80
+    logging:
+      options:
+        max-size: 200m

data/lib/mtr_monitor/metrics.rb

@@ -3,14 +3,14 @@ module MtrMonitor
 
     def self.submit(log_path, hostname, name, logger)
       hostname = hostname.gsub(".", "-")
+      tags = [hostname, name]
 
-      logger.info "Submitting pulse: network.mtr.pulse, tags: #{[hostname, name]}, prefix: #{Watchman.prefix} port: #{Watchman.port}"
+      logger.info "Submitting pulse: network.mtr.pulse, tags: #{tags}, prefix: #{Watchman.prefix} port: #{Watchman.port}"
 
-      Watchman.submit("network.mtr.pulse", 1, :gauge, :tags => [hostname, name])
+      Watchman.submit("network.mtr.pulse", 1, :gauge, :tags => tags)
 
       hops(log_path).each do |hop|
         hop_name = hop.name.gsub(".", "-").gsub("?", "q")
-        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)

data/lib/mtr_monitor/tier1_logger.rb

@@ -8,9 +8,8 @@ module MtrMonitor
     def initialize(route_name, logdna_ingestion_key, local_log_path, host_ip_address, s3_url, logger)
       config = {
         :ip => host_ip_address,
-        :app => "MTR monitor",
-        :meta => { :route => route_name, :s3 => s3_url },
-        :level => "DEBUG"
+        :app => "mtr-monitor",
+        :level => "INFO"
       }
 
       @mtr_log = File.read(local_log_path)
@@ -19,7 +18,7 @@ module MtrMonitor
     end
 
     def submit
-      @logdna.log(tier1_provider)
+      @logdna.log("Route: #{route_name}, Tier1: #{tier1_provider}, s3: #{s3_url}")
       @logger.info("Network provider: #{tier1_provider} -- Emitted to LogDNA")
     end
 

data/lib/mtr_monitor/version.rb

@@ -1,3 +1,3 @@
 module MtrMonitor
-  VERSION = "1.3.0"
+  VERSION = "1.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mtr_monitor
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - RenderedText DevOps Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-29 00:00:00.000000000 Z
+date: 2018-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logdna
@@ -84,7 +84,6 @@ description:
 email:
 - devops@renderedtext.com
 executables:
-- mtr-incident-trace
 - mtr_report
 extensions: []
 extra_rdoc_files: []
@@ -103,7 +102,6 @@ files:
 - bin/setup
 - docker-compose.yml
 - docs/provision-new-ec2-machine.md
-- exe/mtr-incident-trace
 - exe/mtr_report
 - http_endpoint/Dockerfile
 - http_endpoint/nginx.conf

data/exe/mtr-incident-trace

@@ -1,168 +0,0 @@
-#!/usr/bin/env ruby
-
-require "json"
-
-def request_aws_credentials
-  puts "Enter AWS_ACCESS_KEY_ID: "
-  $aws_access_key_id = gets.chomp
-
-  puts "Enter AWS_SECRET_ACCESS_KEY: "
-  $aws_secret_access_key = gets.chomp
-end
-
-def aws
-  if $aws_access_key_id && $aws_secret_access_key
-    "AWS_ACCESS_KEY_ID=#{$aws_access_key_id} AWS_SECRET_ACCESS_KEY=#{$aws_secret_access_key} aws"
-  else
-    "aws"
-  end
-end
-
-if File.exists?(File.expand_path "~/.aws/credentials")
-  puts "✅  Using AWS auth credentials in '~/.aws/credentials'"
-else
-  request_aws_credentials
-end
-
-identity = `#{aws} sts get-caller-identity`
-if $?.exitstatus == 0
-  puts "✅  Authenticated to AWS with Identity:"
-  puts identity
-else
-  STDERR.puts "Error: AWS authentication failed"
-  abort
-end
-
-if system("#{aws} s3api head-bucket --bucket hetzner-continuous-mtr")
-  puts "✅  Verified hetzner-continuous-mtr bucket"
-else
-  STDERR.puts "Error: Can't find hetzner-continuous-mtr bucket"
-  abort
-end
-
-today = Time.now.strftime("%Y-%m-%d")
-
-# Germany to US
-
-# hetzner-to-dockerhub
-puts "Fetching latest hetzner-to-dockerhub logs for #{today}..."
-result = `#{aws} s3api list-objects --bucket hetzner-continuous-mtr --prefix hetzner-to-dockerhub/#{today}/136-243-108-222 --query 'Contents[].{Key: Key, LastModified: LastModified}'`
-hetzner_to_dockerhub = JSON.parse(result).last(10).map { |log| "https://s3.eu-central-1.amazonaws.com/hetzner-continuous-mtr/#{log["Key"]}" }
-puts "✅  Done"
-
-# hetzner-to-github
-puts "Fetching latest hetzner-to-github logs for #{today}..."
-result = `#{aws} s3api list-objects --bucket hetzner-continuous-mtr --prefix hetzner-to-github/#{today}/136-243-108-222 --query 'Contents[].{Key: Key, LastModified: LastModified}'`
-hetzner_to_github = JSON.parse(result).last(10).map { |log| "https://s3.eu-central-1.amazonaws.com/hetzner-continuous-mtr/#{log["Key"]}" }
-puts "✅  Done"
-
-# hetzner-to-stripe
-puts "Fetching latest hetzner-to-stripe logs for #{today}..."
-result = `#{aws} s3api list-objects --bucket hetzner-continuous-mtr --prefix hetzner-to-stripe/#{today}/136-243-108-222 --query 'Contents[].{Key: Key, LastModified: LastModified}'`
-hetzner_to_stripe= JSON.parse(result).last(10).map { |log| "https://s3.eu-central-1.amazonaws.com/hetzner-continuous-mtr/#{log["Key"]}" }
-puts "✅  Done"
-
-# hetzner-to-semaphoreci
-puts "Fetching latest hetzner-to-semaphoreci logs for #{today}..."
-result = `#{aws} s3api list-objects --bucket hetzner-continuous-mtr --prefix hetzner-to-semaphoreci/#{today}/136-243-108-222 --query 'Contents[].{Key: Key, LastModified: LastModified}'`
-hetzner_to_semaphoreci= JSON.parse(result).last(10).map { |log| "https://s3.eu-central-1.amazonaws.com/hetzner-continuous-mtr/#{log["Key"]}" }
-puts "✅  Done"
-
-# hetzner-to-us-east-1
-puts "Fetching latest hetzner-to-us-east-1 logs for #{today}..."
-result = `#{aws} s3api list-objects --bucket hetzner-continuous-mtr --prefix hetzner-to-us-east-1/#{today}/136-243-108-222 --query 'Contents[].{Key: Key, LastModified: LastModified}'`
-hetzner_to_us_east_1 = JSON.parse(result).last(10).map { |log| "https://s3.eu-central-1.amazonaws.com/hetzner-continuous-mtr/#{log["Key"]}" }
-puts "✅  Done"
-
-# hetzner-to-us-west-1
-puts "Fetching latest hetzner-to-us-west-1 logs for #{today}..."
-result = `#{aws} s3api list-objects --bucket hetzner-continuous-mtr --prefix hetzner-to-us-west-1/#{today}/136-243-108-222 --query 'Contents[].{Key: Key, LastModified: LastModified}'`
-hetzner_to_us_west_1= JSON.parse(result).last(10).map { |log| "https://s3.eu-central-1.amazonaws.com/hetzner-continuous-mtr/#{log["Key"]}" }
-puts "✅  Done"
-
-# hetzner-to-us-west-2
-puts "Fetching latest hetzner-to-us-west-2 logs for #{today}..."
-result = `#{aws} s3api list-objects --bucket hetzner-continuous-mtr --prefix hetzner-to-us-west-2/#{today}/136-243-108-222 --query 'Contents[].{Key: Key, LastModified: LastModified}'`
-hetzner_to_us_west_2 = JSON.parse(result).last(10).map { |log| "https://s3.eu-central-1.amazonaws.com/hetzner-continuous-mtr/#{log["Key"]}" }
-puts "✅  Done"
-
-# US to Germany
-
-# us-east-1-to-hetzner
-puts "Fetching latest us-east-1-to-hetzner logs for #{today}..."
-result = `#{aws} s3api list-objects --bucket hetzner-continuous-mtr --prefix us-east-1-to-hetzner/#{today}/54-164-114-223 --query 'Contents[].{Key: Key, LastModified: LastModified}'`
-us_east_1_to_hetzner = JSON.parse(result).last(10).map { |log| "https://s3.eu-central-1.amazonaws.com/hetzner-continuous-mtr/#{log["Key"]}" }
-puts "✅  Done"
-
-# us-west-1-to-hetzner
-puts "Fetching latest us-west-1-to-hetzner logs for #{today}..."
-result = `#{aws} s3api list-objects --bucket hetzner-continuous-mtr --prefix us-west-1-to-hetzner/#{today}/13-57-249-134 --query 'Contents[].{Key: Key, LastModified: LastModified}'`
-us_west_1_to_hetzner = JSON.parse(result).last(10).map { |log| "https://s3.eu-central-1.amazonaws.com/hetzner-continuous-mtr/#{log["Key"]}" }
-puts "✅  Done"
-
-# us-west-2-to-hetzner
-puts "Fetching latest us-west-2-to-hetzner logs for #{today}..."
-result = `#{aws} s3api list-objects --bucket hetzner-continuous-mtr --prefix us-west-2-to-hetzner/#{today}/54-201-153-190 --query 'Contents[].{Key: Key, LastModified: LastModified}'`
-us_west_2_to_hetzner = JSON.parse(result).last(10).map { |log| "https://s3.eu-central-1.amazonaws.com/hetzner-continuous-mtr/#{log["Key"]}" }
-puts "✅  Done"
-
-# Create report
-
-puts "Creating incident_mtr_report.txt..."
-File.open("incident_mtr_report.txt", "w") do |f|
-  f.write("1. AWS US East 1 (Virginia)\n")
-  f.write("---------------------\n")
-  f.write("1.1. us-east-1 to Hetzner\n")
-  f.write(us_east_1_to_hetzner.join("\n"))
-  f.write("\n")
-  f.write("\n")
-  f.write("1.2. Hetzner to us-east-1\n")
-  f.write(hetzner_to_us_east_1.join("\n"))
-  f.write("\n")
-  f.write("\n")
-  f.write("2. AWS US West 1 (California)\n")
-  f.write("---------------------\n")
-  f.write("2.1. us-west-1 to Hetzner\n")
-  f.write(us_west_1_to_hetzner.join("\n"))
-  f.write("\n")
-  f.write("\n")
-  f.write("2.2. Hetzner to us-west-1\n")
-  f.write(hetzner_to_us_west_1.join("\n"))
-  f.write("\n")
-  f.write("\n")
-  f.write("3. AWS US West 2 (Oregon)\n")
-  f.write("---------------------\n")
-  f.write("3.1. us-west-2 to Hetzner\n")
-  f.write(us_west_2_to_hetzner.join("\n"))
-  f.write("\n")
-  f.write("\n")
-  f.write("3.2. Hetzner to us-west-2\n")
-  f.write(hetzner_to_us_west_2.join("\n"))
-  f.write("\n")
-  f.write("\n")
-  f.write("4. Github\n")
-  f.write("---------------------\n")
-  f.write("4.1. Hetzner to Github\n")
-  f.write(hetzner_to_github.join("\n"))
-  f.write("\n")
-  f.write("\n")
-  f.write("5. Semaphoreci\n")
-  f.write("---------------------\n")
-  f.write("5.1. Hetzner to Semaphoreci\n")
-  f.write(hetzner_to_semaphoreci.join("\n"))
-  f.write("\n")
-  f.write("\n")
-  f.write("6. Dockerhub\n")
-  f.write("---------------------\n")
-  f.write("6.1. Hetzner to Dockerhub\n")
-  f.write(hetzner_to_dockerhub.join("\n"))
-  f.write("\n")
-  f.write("\n")
-  f.write("7. Stripe\n")
-  f.write("---------------------\n")
-  f.write("7.1. Hetzner to Stripe\n")
-  f.write(hetzner_to_stripe.join("\n"))
-  f.write("\n")
-  f.write("\n")
-end
-puts "✅  Done"