mtr_monitor 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8555d4d1ae506bf14ca52ab2d2b92a150f4f0ddb
-  data.tar.gz: 5ded34a1836573fc3e00168241d55a6c20352dd1
+  metadata.gz: 31dda3a31e9496ae66218124ba04e932236adf04
+  data.tar.gz: 0fb97646d625a4286010b192ef6979bc0b0cfe75
 SHA512:
-  metadata.gz: 8c308f8c4135547bc712bda2cbc1f6466849493ef8d557794052b3c3e58a61624d33d72881584c9e43cfb8a11fc87819a12a76ea1f900ef2725f480af8bce4e8
-  data.tar.gz: 2cf7a1b0d52db3c25fb5a1f7a4ba0af7e158643b5e2444ed1ecc2e6cbe3d3ec5d5e1ad2e0ca0e708a6f2043da5fcbe3ea94ec5c529e0d3d9c5b067c21a966631
+  metadata.gz: 16cf294defeea6391e30918da1c1e7cf1519a5175ed6e3adeb29f16e9a554f6f94f7c8bce451434115efe33560c3be56b9a5d815de5ca1db6eb0dbbe4910d294
+  data.tar.gz: 5a40776566d7fb692d93e4bc424aba88b5dda41558d05153143c1a5b94b2b5cf2c5eedacb3a5ff89a3fb5bbda8f04b7725cc49091bc67bc5507f3ef5bfbbbf41

data/Gemfile.lock

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

data/README.md

@@ -64,25 +64,25 @@ Local reports on the machine are located in the `/var/log/mtr` directory, and
 the following structure:
 
 ``` txt
-/var/log/mtr/<name>-<YYYY-DD-MM>-<host-ip-address>-<target-ip-address>-<HH-MM>.log
+/var/log/mtr/<name>__<YYYY-DD-MM-HH-MM>__<host-ip-address>_to_<target-ip-address>.txt
 ```
 
 For example, if you call your report `hetzner-to-us-east-1` and run it at
 `2017-12-18 12:33:06`, the log will be generated in:
 
 ``` txt
-/var/log/mtr/hetzner-to-us-east-1-2017-12-18-142-21-43-11-138-21-32-191-12-33.log
+/var/log/mtr/hetzner-to-us-east-1__2017-12-18-12-33__142-21-43-11_to_138-21-32-191.txt
 ```
 
 On S3, the path will follow the same convention, but will use a nested directory
 structure:
 
 ``` txt
-s3://<bucket-name>/<name>/<YYYY-DD-MM>/<host-ip-address>/<target-ip-address>/<HH-MM>.log
+s3://<bucket-name>/<name>/<YYYY-DD-MM-HH-MM>/<host-ip-address>_to_<target-ip-address>.txt
 ```
 
 ``` txt
-s3://<bucket-name>/hetzner-to-us-east-1/2017-12-18/142-21-43-11/138-21-32-191/12-33.log
+s3://<bucket-name>/hetzner-to-us-east-1/2017-12-18-12-33/142-21-43-11_to_138-21-32-191.txt
 ```
 
 ## Report Name
@@ -125,13 +125,19 @@ s3_bucket             = "my-private-bucket-name" # change this
 aws_access_key_id     = "<KEY>"
 aws_secret_access_key = "<KEY>"
 
-report = MtrMonitor::Report.new(name,
-                                domain,
-                                s3_bucket,
-                                aws_access_key_id,
-                                aws_secret_access_key)
-
-report.generate
+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
 ```
 
 This above snippet will :
@@ -200,52 +206,3 @@ information read the code in `lib/mtr_monitor/metrics.rb`.
 This is deployed as a docker-compose group of docker images. One docker images
 generates the MTR reports, while the other onw exposes an nginx server that
 responsd yes to incomming requests.
-
-### MTR incident tracing
-
-To trace the incident when it occurs, the `mtr_monitor` contains the executable which
-comes out of the box with the gem.
-
-1. Make sure you have `mtr_monitor` gem installed:
-```
-gem install mtr_monitor
-```
-
-and `~/.aws/credentials` set up.
-
-2. Run executable:
-```
-`mtr-incident-trace`
-```
-
-The executable will collect latest MTR logs from S3 bucket and create the report
-with the following format:
-
-```
-1. AWS us-east
-1.1 US => DE
---links
-
-1.2 DE => US
---links
-
-2. AWS us-west
-2.1 US => DE
---links
-
-2.2 DE => US
---links
--
-
-3. GitHub (San Francisco)
-3.1 US => DE (Only GitHub can provide this)
-
-3.2 DE => US
---links
-```
-
-### Tier 1 provider info
-
-The information of the network provider on which we are running on is
-continuously emitted to
-[LogDNA](https://app.logdna.com/5691b7bf97/logs/dashboard).

data/lib/mtr_monitor.rb

@@ -12,10 +12,10 @@ module MtrMonitor
 
   #
   # MtrMonitor generates a MTR report for a domain and saves the report to:
-  # /var/log/mtr/<name>-<YYYY-DD-MM>-<host-ip-address>-<HH-MM>.log
+  # /var/log/mtr/<name>__<YYYY-DD-MM-HH-MM>__<host-ip-address>_to_<target-ip-address>.txt
   #
   # After that, it uploads the report to S3:
-  # s3://<bucket-name>/<name>/<YYYY-DD-MM>/<host-ip-address>/<target-ip-address>/<HH-MM>.txt
+  # s3://<bucket-name>/<name>/<YYYY-DD-MM-HH-MM>/<host-ip-address>_to_<target-ip-address>.txt
   #
   # Parameters:
   #

data/lib/mtr_monitor/log_dna.rb

@@ -24,7 +24,7 @@ module MtrMonitor
     def submit
       msg = "Route: #{@route_name}, Host: #{@hostname}, Tier1: #{tier1_provider}, s3: #{@s3_url}"
 
-      @logdna.log(@msg)
+      @logdna.log(msg)
       @logger.info("Emitted to LogDNA: #{msg}")
     end
 

data/lib/mtr_monitor/version.rb

@@ -1,3 +1,3 @@
 module MtrMonitor
-  VERSION = "1.6.0"
+  VERSION = "1.7.0"
 end

metadata

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