mtr_monitor 0.10.3 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f12fdabab86bed8fb2fb0aa71a0f982c4233eb5
-  data.tar.gz: 77fd11168473a7774b6bf6acf99fe06de0d98cec
+  metadata.gz: f243ceb197f20b9d5de15bf051212a8c5a77e435
+  data.tar.gz: 14228fd786c832de71a24e11ef3a21cf5b040665
 SHA512:
-  metadata.gz: 6e4d5e4a13e759a8ef0e8a3afe02137478970661b5f43704fbcc8c4c119bbb5055deba549387b31ac86d4109206e7abe2523a4fd76d0f7e9cc675cc63327d0c8
-  data.tar.gz: bc5ade1a28b27579d3ba9a1291d972071c28b0952b8123502aaa5caba9dea4d759867c4136763bedd965ce8046e418776e826853b4fdfd08de841b5557bd1ca4
+  metadata.gz: 12a84d0a0a2366827312408036b06588f336416041b9431c71faaaa81b7170ebad449873654caacc1024678460fddd775c2f8df5c9eb9e79ce0bbda1fffd821c
+  data.tar.gz: 8307dc83389ae67865afb23ecbe6af31ee66e77d95098258e47e24cd70bff854be44e5df29ba0e6c06a08c99c020ea5935fb8893f1b3477f0a0e298df8e90177

data/Gemfile.lock

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

data/exe/mtr_report

@@ -32,6 +32,9 @@ loop do
   logger.info "Generating report"
   report.generate
 
+  logger.info "Running Cleaner"
+  MtrMonitor::Cleaner.execute(logger)
+
   logger.info "Sleeping for #{sleep_time} minutes"
   sleep(sleep_time * 60)
 end

data/lib/mtr_monitor.rb

@@ -4,12 +4,16 @@ require "logger"
 require "mtr_monitor/version"
 require "mtr_monitor/hop"
 require "mtr_monitor/metrics"
+require "mtr_monitor/cleaner"
 
 module MtrMonitor
   #
   # Runs a mtr trace toward a domain and saves the report
   # to /var/log/mtr/<domain>_timestamp.log , uploads to s3 and reports metrics to statsd.
   #
+
+  REPORTS_PATH = "/var/log/mtr"
+
   class Report
     attr_reader :log_path
     attr_reader :logger
@@ -26,7 +30,7 @@ module MtrMonitor
       @logger                = logger || Logger.new(STDOUT)
 
       @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("/", "-")}"
+      @log_path  = "#{MtrMonitor::REPORTS_PATH}/#{@log_name.gsub("/", "-")}"
       @s3_path   = "s3://#{@s3_bucket}/#{@log_name}"
     end
 

data/lib/mtr_monitor/cleaner.rb

@@ -0,0 +1,28 @@
+module MtrMonitor
+  module Cleaner
+
+    MAX_AGE = 2 * 7 * 24 * 60 * 60 # two weeks
+
+    def self.execute(logger)
+      logger.info("[CLEANER] Deleting reports created more than 2 weeks ago")
+
+      old_reports.each do |filename|
+        logger.info("Deleting #{filename}")
+        `sudo rm -f #{filename}`
+      end
+
+      logger.info("[CLEANER] Done.")
+    end
+
+    def self.old_reports
+      all_reports.select do |filename|
+        File.mtime(filename) < (Time.now - MAX_AGE)
+      end
+    end
+
+    def self.all_reports
+      Dir.glob("#{MtrMonitor::REPORTS_PATH}/*")
+    end
+
+  end
+end

data/lib/mtr_monitor/version.rb

@@ -1,3 +1,3 @@
 module MtrMonitor
-  VERSION = "0.10.3"
+  VERSION = "0.11.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mtr_monitor
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 0.11.0
 platform: ruby
 authors:
 - RenderedText DevOps Team
@@ -88,6 +88,7 @@ files:
 - docker-compose.yml
 - exe/mtr_report
 - lib/mtr_monitor.rb
+- lib/mtr_monitor/cleaner.rb
 - lib/mtr_monitor/hop.rb
 - lib/mtr_monitor/metrics.rb
 - lib/mtr_monitor/version.rb