aws_site_monitor 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c82ef18a627acea47eba9c717821d2d521481325
-  data.tar.gz: 327a17f119ec3e359b190901c4633833293f634d
+  metadata.gz: 1b4efdad1bd774afcda2cdfb73079a02d503ee84
+  data.tar.gz: 7f076bb696837c26bf682705dba6cf1723eedc1d
 SHA512:
-  metadata.gz: fe1d718eb5d70e8599e16a05ae1cae06d3236aedcc8f5490fb0af744fc7bdc60671ca900f163b545be9156ea55c0cdba5ad38e9619aa97abf69decb7e37b90bf
-  data.tar.gz: be476950872ad2fcbd4605dacb1dc2e7690189a90e5e1276e8d2db8feeb6a38757a6b2d72e1e45a704af19c289400858eb354f550eb33ee39a3fcc1f738e2678
+  metadata.gz: ce4dbcc315b7cc39fce9afb36596774752162f5dbb9f543367941b9e5c14ceca25cccd1dd19342efa5ef7eeb4a8cd8140cd68e681739ad91b6878a892bd4eb64
+  data.tar.gz: 4b768c6daa6ed908d4d6582b4a090da4d61b115664d4902f27aeb2af1bd70b7524083ef87721771d62b75441c84caa964843430f775c322b6cc4f060fc86e47f

data/.gitignore

@@ -7,6 +7,7 @@
 /spec/reports/
 /tmp/
 .pstore
+*.pstore
 
 # rspec failure tracking
 .rspec_status

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    aws_site_monitor (0.1.1)
+    aws_site_monitor (0.1.2)
       activesupport
       aws-sdk
       concurrent-ruby

data/README.md

@@ -14,18 +14,36 @@ gem install aws_site_monitor
 ## Usage
 
 ### Add a site to watch list
-`bin/monitor add --url=https://www.google.com --instance-ids=12345 123456`
+`aws_site_monitor add --url=https://www.google.com --instance-ids=12345 123456`
 
 ### Remove a site from watch list
-`bin/monitor remove --url=https://www.google.com`
+`aws_site_monitor remove --url=https://www.google.com`
+
+### List sites on watchlist
+`aws_site_monitor ls`
 
 ### Start watching
-`bin/monitor start --check_every_seconds=30 --aws_region='us-east-1'`
+`aws_site_monitor start --check_every_seconds=60 --request_timeout_seconds=15 --aws_region='us-east-1'`
+
+### Watch sites with killswitch url
+Basically this feature is if you are running the script on a local server, i.e. raspberry pi,
+and you want to stop the process without physical access to it. You can pass in a killswitch_url,
+which can be for instance a dropbox url. Then if you need to kill the script,
+you can just delete the file.
+
+`aws_site_monitor start --killswitch_url=https://www.dropbox.com/s/gtcocntwdm6ae16/site_monitor_killswitch.txt?dl=0`
+
+### List events (only tracked when non 200 response occurs)
+`aws_site_monitor list_events`
+
+### Clear events
+`aws_site_monitor clear_events`
+
 
 Also make sure you have ENV variables set up for AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY
 
 ## Contributing
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/aws-site-monitor.
+Bug reports and pull requests are welcome on GitHub at https://github.com/jasonayre/aws-site-monitor.
 
 ## License
 

data/lib/aws/site_monitor.rb

@@ -7,6 +7,8 @@ require "active_support/core_ext"
 require 'aws-sdk'
 require 'pstore'
 require 'aws/site_monitor/pstore_record'
+require 'aws/site_monitor/site'
+require 'aws/site_monitor/event'
 require 'aws/site_monitor/cli'
 
 ENV['AWS_REGION'] ||= 'us-east-1'
@@ -19,51 +21,8 @@ module Aws
           credentials: ::Aws::Credentials.new(ENV['AWS_ACCESS_KEY_ID'], ENV['AWS_SECRET_ACCESS_KEY'])
         })
 
-        ::Aws::EC2::Client.new(region: AWS_REGION)
+        ::Aws::EC2::Client.new(region: ENV['AWS_REGION'])
       end
     end
-
-    def self.register(url:, instance_ids:)
-      ::Aws::SiteMonitor::Site.create(url: url, instance_ids: instance_ids)
-    end
-
-    def self.unregister(url:)
-      ::Aws::SiteMonitor::Site.find_by(:url => url)
-    end
-
-    class Event
-      include ::Aws::SiteMonitor::PstoreRecord
-
-      def initialize(occured_at: ::Time.now, status_code:, **attributes)
-        super(occured_at: occured_at, status_code: status_code, **attributes)
-      end
-    end
-
-    class Site
-      include ::Aws::SiteMonitor::PstoreRecord
-    end
-
-    class RestartTask
-      def initialize(site)
-        @site = site
-      end
-
-      def run
-        ::Aws::SiteMonitor.ec2_client.reboot_instances({
-          instance_ids: @site[:instance_ids]
-        })
-      end
-
-      # todo: maybe support hard shutdown / start
-      # def stop
-      #   begin
-      #     Aws::SiteMonitor.ec2_client.stop_instances
-      #     ec2.wait_until(:instance_stopped, instance_ids:[@id])
-      #     puts "instance stopped"
-      #   rescue Aws::Waiters::Errors::WaiterFailed => error
-      #     puts "failed waiting for instance running: #{error.message}"
-      #   end
-      # end
-    end
   end
 end

data/lib/aws/site_monitor/cli.rb

@@ -1,8 +1,10 @@
 module Aws
   module SiteMonitor
     class CLI < ::Thor
-      option :check_every_seconds, :type => :numeric, :default => 5, :desc => 'Check every x seconds'
+      option :check_every_seconds, :type => :numeric, :default => 60, :desc => 'Check every x seconds'
       option :aws_region, :type => :string, :default => 'us-east-1', :desc => 'AWS region'
+      option :killswitch_url, :type => :string, :desc => 'If a file no longer exists at this url, kill script'
+      option :request_timeout_seconds, :type => :numeric, :default => 15, :desc => 'How long to wait for response before request times out which will trigger a reboot'
 
       desc "start", "Start Watching"
       def start
@@ -10,7 +12,7 @@ module Aws
         start_monitoring!
         sleep
       rescue => e
-        puts e.inspect
+        puts "ERROR #{e.message}"
         start_monitoring!
       end
 
@@ -32,6 +34,24 @@ module Aws
         puts "removed #{site[:url]} from watchlist"
       end
 
+
+      desc "ls", "List sites being monitored"
+      def ls
+        sites = ::Aws::SiteMonitor::Site.all.map(&:attributes).join("\n")
+        puts sites.inspect
+      end
+
+      desc "list_events", "List events"
+      def list_events
+        events = ::Aws::SiteMonitor::Event.all.map(&:attributes).join("\n")
+        puts events.inspect
+      end
+
+      desc "clear_events", "Clear events"
+      def clear_events
+        ::Aws::SiteMonitor::Event.all.map(&:destroy)
+      end
+
       no_tasks do
         def configure!
           configure_traps
@@ -55,24 +75,38 @@ module Aws
             execution_interval: options.check_every_seconds,
             timeout_interval: options.check_every_seconds
           ) do
-            tasks = ::Aws::SiteMonitor::Site.all.map do |site|
+            check_killswitch if check_killswitch?
+
+            ::Aws::SiteMonitor::Site.all.each do |site|
               puts "MAKING REQUEST TO #{site[:url]}"
-              result = `curl -s -o /dev/null -I -w "%{http_code}" #{site[:url]}`
-              puts result.inspect
+              result = `curl -s -o /dev/null -I -w "%{http_code}" --max-time #{options.request_timeout_seconds} #{site[:url]}`
 
-              if result[0] === "2"
+              if result[0] == "2"
                 puts "GOT 200 EVERYTHING OK"
-                nil
               else
                 ::Aws::SiteMonitor::Event.create(:status_code => result)
-                ::Aws::SiteMonitor::RestartTask.new(site)
+                site.reboot_instances!
               end
             end
-
-            tasks.flatten.compact.map(&:run)
           end
         end
 
+        def check_killswitch
+          puts "CHECKING KILLSWITCH #{options.killswitch_url}"
+          result = `curl -s -o /dev/null -I -w "%{http_code}" -L #{options.killswitch_url}`
+          puts result
+          kill_process! if result[0] != "2"
+        end
+
+        def check_killswitch?
+          !!options.killswitch_url
+        end
+
+        #because we are in a new thread with the timer task, exit/abort wont work
+        def kill_process!
+          ::Process.kill 9, ::Process.pid
+        end
+
         def start_monitoring!
           monitor_task.shutdown if @monitor_task
           @monitor_task = nil

data/lib/aws/site_monitor/event.rb

@@ -0,0 +1,11 @@
+module Aws
+  module SiteMonitor
+    class Event
+      include ::Aws::SiteMonitor::PstoreRecord
+
+      def initialize(occured_at: ::Time.now, status_code:, **attributes)
+        super(occured_at: occured_at, status_code: status_code, **attributes)
+      end
+    end
+  end
+end

data/lib/aws/site_monitor/site.rb

@@ -0,0 +1,24 @@
+module Aws
+  module SiteMonitor
+    class Site
+      include ::Aws::SiteMonitor::PstoreRecord
+
+      def reboot_instances!
+        puts "RESTARTING SITE #{self.attributes}"
+        ::Aws::SiteMonitor.ec2_client.reboot_instances(
+          instance_ids: self[:instance_ids]
+        )
+      rescue ::Aws::EC2::Errors::IncorrectState => e
+        puts e.message
+        start_instances!
+      end
+
+      def start_instances!
+        puts "STARTING STOPPED INSTANCES"
+        ::Aws::SiteMonitor.ec2_client.start_instances(
+          instance_ids: self[:instance_ids]
+        )
+      end
+    end
+  end
+end

data/lib/aws/site_monitor/version.rb

@@ -1,5 +1,5 @@
 module Aws
   module SiteMonitor
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws_site_monitor
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Jason Ayre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-28 00:00:00.000000000 Z
+date: 2018-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -146,7 +146,9 @@ files:
 - bin/setup
 - lib/aws/site_monitor.rb
 - lib/aws/site_monitor/cli.rb
+- lib/aws/site_monitor/event.rb
 - lib/aws/site_monitor/pstore_record.rb
+- lib/aws/site_monitor/site.rb
 - lib/aws/site_monitor/version.rb
 homepage: https://github.com/jasonayre/aws_site_monitor
 licenses: