nat-monitor 3.0.6 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2d895268e15e8f4652f7957bc640e433cce2e10
-  data.tar.gz: 9f1091d77b11b1b4de113a34987a791bc0c55b24
+  metadata.gz: 3f3019dd6a06c41744e25d25878d8fc1743c027b
+  data.tar.gz: 4a2a3844adb2dbb5cb2d4dcbee79540df5e4fa50
 SHA512:
-  metadata.gz: b65a92e8cb17fb483f02cbe521224902e9508d852e943923d6f8eb4cfac74bdb35e088d144a59b34692a513efc13adced47ebbb631bb5b6d57200728ccbd51c8
-  data.tar.gz: b27966f54669bd1117ba155457cde5c798cbee858dc90b7e30f2b6cb342e1de1a38ab0941abaaae8608353c465f8681088c9a767797074b29e7a6a89eb185b8d
+  metadata.gz: ec75a2d9eb9e77f8ff85fec7a6496a9a8c48d3dfd843757e289d6b4d9840d4ee0801502b154649226136911c95c50b1a24958b23b4d162430959b36581839407
+  data.tar.gz: 9aee1e3836a53a2791567fe04e5b921c4afbe187e3290a9888c497e13c30e0958c39f2399ac2306f002eb99c5ce88d08b5e8baa24f1c3cc1dfcd41747bee7f33

data/README.md

@@ -66,15 +66,37 @@ Note that:
 
 - If you don't specify the AWS credentials it will use the IAM role of the instance
 
-The NAT Monitor has the ability to report out, via a simple URL request, its start, success, and failures. This functionality is modeled after what [Cronitor.io](http://cronitor.io) expects.
+The NAT Monitor has the ability to report out to [Cronitor.io](http://cronitor.io) its status. This comes courtesy of the [`cronitor`](https://github.com/evertrue/cronitor) gem.
 
-Requisite configuration needed:
+You will need to set `monitor_enabled: true` and then supply either a Cronitor API token & monitor options:
 
 ```yaml
-monitor_urls:
-    run: your.url/run
-    complete: your.url/complete
-    fail: your.url/fail
+monitor_enabled: true
+monitor_token: abcd
+monitor_opts:
+  name: My Fancy Monitor
+  notifications:
+    emails:
+      - test@example.com
+    slack:
+      - https://url-to-slack.webhook
+    pagerduty:
+      - pagerduty-service-api-token
+    phones:
+      - +12345678900
+    webhooks:
+      - 'http://example.com'
+  rules:
+    - rule_type: 'not_run_in',
+      duration: 5,
+      time_unit: 'seconds'
+```
+
+or the code for an existing Cronitor monitor:
+
+```yaml
+monitor_enabled: true
+monitor_code: abcd
 ```
 
 ## Contributing

data/Rakefile

@@ -1,5 +1,6 @@
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
+require 'bump/tasks'
 
 desc 'Run RSpec unit tests'
 RSpec::Core::RakeTask.new do |t|

data/lib/nat-monitor.rb

@@ -156,15 +156,26 @@ module EtTools
       current_master == node_id
     end
 
+    def monitor
+      return unless @conf['monitor_enabled']
+
+      if @conf['monitor_token']
+        @monitor ||= Cronitor.new(
+          token: @conf['monitor_token'],
+          opts: @conf['monitor_opts']
+        )
+      else
+        @monitor ||= Cronitor.new code: @conf['monitor_code']
+      end
+    end
+
     def notify_monitor(status, msg = nil)
       output msg unless msg.nil?
       return unless @conf['monitor_enabled']
-      url = @conf['monitor_urls'][status]
-      url += "?msg=#{URI.escape(msg)}" if status == 'fail' && !msg.nil?
 
-      output 'Notifying external heartbeat monitor'
+      output 'Notifying Cronitor'
 
-      Net::HTTP.get(URI url)
+      monitor.ping status, msg
     end
 
     private

data/lib/nat-monitor/version.rb

@@ -1,5 +1,5 @@
 module EtTools
   class NatMonitor
-    VERSION = '3.0.6'
+    VERSION = '4.0.0'
   end
 end

data/nat-monitor.gemspec

@@ -23,7 +23,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'byebug'
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'bump', '~> 0.1'
 
   spec.add_runtime_dependency 'net-ping'
   spec.add_runtime_dependency 'fog', '~> 1.23', '>= 1.30'
+  spec.add_runtime_dependency 'cronitor', '~> 1.1'
 end

data/spec/lib/nat-monitor_spec.rb

@@ -13,11 +13,7 @@ describe EtTools::NatMonitor do
     @yaml_conf = { 'route_table_id' => @route_table_id,
                    'aws_access_key_id' => 'AWS_ACCESS_KEY_ID',
                    'aws_secret_access_key' => 'AWS_SECRET_ACCESS_KEY',
-                   'monitor_urls' => {
-                     'run'      => 'run',
-                     'complete' => 'complete',
-                     'fail'     => 'fail'
-                   },
+                   'monitor_code' => 'abcd',
                    'nodes' => (
                      { @my_instance_id => '1.1.1.1' }
                    ).merge(@other_nodes) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nat-monitor
 version: !ruby/object:Gem::Version
-  version: 3.0.6
+  version: 4.0.0
 platform: ruby
 authors:
 - Eric Herot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-29 00:00:00.000000000 Z
+date: 2015-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: bump
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: net-ping
   requirement: !ruby/object:Gem::Requirement
@@ -114,6 +128,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.30'
+- !ruby/object:Gem::Dependency
+  name: cronitor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 description: A service for providing an HA NAT in EC2
 email:
 - eric.github@herot.com