deadman_check 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 59091e4397024d50031cf4368adfea22a4057207
-  data.tar.gz: dcc1a25d10b623e2b4e13c928ba19cbef1ccc1e9
+SHA256:
+  metadata.gz: 06a27e3e58908d95fb177ec711fbbebc034f580984a3844559b8596d0467a666
+  data.tar.gz: f3f0d62652404c7ebcfb2be5ad1227212236b6f7b7126e4415c9e0659b10e6d5
 SHA512:
-  metadata.gz: 394b714ccbb820e3fc3e526baadc3bb75ef51309ba3a08cd058548cbe8c6b4fe5da7219182023a523d9db19438319a42f30ff7e39d92098bf93bbe8f1c9f1ae0
-  data.tar.gz: bfc91fcadb9bb51475fd7382516dc687adce7d3c5917e5fa8b6bb26989432301e17ae9d06ee7fed3e74332a6eaa0ca1a6d6b984e6371a2439dd480c861f66e2b
+  metadata.gz: f70837725131659a48352a6a0978411a24493f0220ba1aa8ec11a328f956ab640bb2ad1f601b12574e87f0cfeb4938f4033e342270db11f2810ff451ee126b92
+  data.tar.gz: 69d404ced5622354ed654b6a3d2e514680aed661117f808dfd10322f57eb7d9c3af304639e757ad87498f2daee19e0ac0a06980dc5b591b0ca4a382a849e0f8e

data/.travis.yml

@@ -2,6 +2,7 @@ sudo: required
 language: ruby
 rvm:
 - 2.4.0
+- 2.7.0
 install:
 - gem install bundler
 - bundle install

data/README.md

@@ -21,8 +21,11 @@ is expected for that job.
 * [Consul](https://www.consul.io/) instance or cluster to report to
 
 ### Alerting Options
-* [Slack](https://slack.com/) 
-* [AWS SNS](https://aws.amazon.com/documentation/sns/)
+* [Slack](https://slack.com/)
+<img width="752" alt="screen shot 2017-03-26 at 3 29 28 pm" src="https://cloud.githubusercontent.com/assets/538171/24335811/2e57eee8-1239-11e7-9fff-c8a10d956f2e.png">
+
+* [AWS SNS](https://aws.amazon.com/documentation/sns/) - Broadcasting alerts and/or triggering [AWS Lambda functions](https://docs.aws.amazon.com/sns/latest/dg/sns-lambda.html) to run code
+<img width="903" alt="screen shot 2017-08-04 at 11 39 12 am" src="https://user-images.githubusercontent.com/538171/28982223-e576743c-7909-11e7-8e65-ebb0b4a76762.png">
 
 ## Example Usage
 
@@ -197,7 +200,7 @@ job "DeadmanMonitoring" {
 }
 ```
 
-<img width="903" alt="screen shot 2017-08-04 at 11 39 12 am" src="https://user-images.githubusercontent.com/538171/28982223-e576743c-7909-11e7-8e65-ebb0b4a76762.png">
+
 
 # Non-Nomad Use:
 

data/bin/deadman-check

@@ -28,11 +28,13 @@ command :switch_monitor do |c|
   c.option '--alert-to-sns-region AWSREGION', String, 'Amazon Web Services region the SNS topic is in, defaults to us-west-2'
   c.option '--daemon', 'Run as a daemon, otherwise will run check just once'
   c.option '--daemon-sleep SECONDS', String, 'Set the number of seconds to sleep in between switch checks, default 300'
+  c.option '--consul-token TOKEN', String, 'Consul KV access token'
   c.action do |args, options|
     options.default :daemon_sleep => 300,
                     :alert_to_sns_region => 'us-west-2',
                     :alert_to_sns => nil,
-                    :alert_to_slack => nil
+                    :alert_to_slack => nil,
+                    :consul_token => ""
 
     if options.key_path && options.key
       abort("Specify --key-path or --key, don't specify both")
@@ -47,7 +49,7 @@ command :switch_monitor do |c|
     switch_monitor = DeadmanCheck::SwitchMonitor.new(
       options.host, options.port,
       target, options.alert_to_slack, options.alert_to_sns,
-      options.alert_to_sns_region, recurse, options.daemon_sleep)
+      options.alert_to_sns_region, recurse, options.daemon_sleep, options.consul_token)
     if options.daemon
       Daemons.run(switch_monitor.run_check_daemon)
     else
@@ -66,7 +68,10 @@ command :key_set do |c|
   c.option '--port PORT', String, 'port Consul is listening on'
   c.option '--key KEY', String, 'Consul key to report EPOCH time and frequency for service'
   c.option '--frequency FREQUENCY', String, 'Frequency at which this key should be updated in seconds'
+  c.option '--consul-token TOKEN', String, 'Consul KV access token'
   c.action do |args, options|
+    options.default :consul_token => ""
+
     if options.frequency.nil?
       abort("Specify --frequency at which this key should be updated by the service")
     end
@@ -74,7 +79,7 @@ command :key_set do |c|
       abort("Must specify a --key")
     end
     key_set = DeadmanCheck::KeySet.new(options.host, options.port, options.key,
-      options.frequency)
+                                       options.frequency, options.consul_token)
     key_set.run_consul_key_update
   end
 end

data/deadman_check.gemspec

@@ -30,14 +30,14 @@ Gem::Specification.new do |spec|
   spec.executables   = "deadman-check"
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.13"
+  spec.add_development_dependency "bundler", "~> 2.1"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "webmock", "~> 3.0"
 
   spec.add_dependency 'commander', '~> 4.4', '>= 4.4.3'
-  spec.add_dependency 'diplomat', '~> 2.0.0', '>= 2.0.0'
+  spec.add_dependency 'diplomat', '~> 2.2.5', '>= 2.0.0'
   spec.add_dependency 'slack-ruby-client', '~> 0.8.0'
   spec.add_dependency 'daemons', '~> 1.2.4', '>=1.2.4'
-  spec.add_dependency 'aws-sdk', '~> 2.10.21', '>=2.10.21'
+  spec.add_dependency 'aws-sdk-sns', '~> 1'
 end

data/lib/deadman_check/version.rb

@@ -1,3 +1,3 @@
 module DeadmanCheck
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/lib/deadman_check_global.rb

@@ -9,9 +9,12 @@ module DeadmanCheck
       return epoch_time_now
     end
 
-    def configure_diplomat(host, port)
+    def configure_diplomat(host, port, consul_token)
       Diplomat.configure do |config|
         config.url = "http://#{host}:#{port}"
+        if consul_token != ""
+            config.options = {headers: {"X-Consul-Token" => consul_token}}
+        end
       end
     end
   end

data/lib/deadman_check_keyset.rb

@@ -6,17 +6,18 @@ require 'json'
 module DeadmanCheck
   # KeySet Class
   class KeySet
-    attr_accessor :host, :port, :key, :frequency
+    attr_accessor :host, :port, :key, :frequency, :consul_token
 
-    def initialize(host, port, key, frequency)
+    def initialize(host, port, key, frequency, consul_token)
       @host = host
       @port = port
       @key  = key
       @frequency = frequency
+      @consul_token = consul_token
     end
 
     def run_consul_key_update
-      update_consul_key(@host, @port, @key, @frequency)
+      update_consul_key(@host, @port, @key, @frequency, @consul_token)
     end
 
     private
@@ -25,8 +26,8 @@ module DeadmanCheck
         consul_key.to_json
       end
 
-      def update_consul_key(host, port, key, frequency)
-        DeadmanCheck::DeadmanCheckGlobal.new.configure_diplomat(host, port)
+      def update_consul_key(host, port, key, frequency, consul_token)
+        DeadmanCheck::DeadmanCheckGlobal.new.configure_diplomat(host, port, consul_token)
         epoch_time_now = DeadmanCheck::DeadmanCheckGlobal.new.get_epoch_time
         Diplomat::Kv.put(key, "#{generate_json(epoch_time_now, frequency)}")
         puts "Consul key #{key} updated EPOCH to #{epoch_time_now}"

data/lib/deadman_check_switch.rb

@@ -3,7 +3,7 @@ require 'deadman_check_global'
 require 'diplomat'
 require 'slack-ruby-client'
 require 'json'
-require 'aws-sdk'
+require 'aws-sdk-sns'
 
 module DeadmanCheck
   # Switch class
@@ -12,7 +12,7 @@ module DeadmanCheck
     :alert_to_sns, :alert_to_sns_region, :recurse, :daemon_sleep
 
     def initialize(host, port, target, alert_to_slack, alert_to_sns,
-                  alert_to_sns_region, recurse, daemon_sleep)
+                  alert_to_sns_region, recurse, daemon_sleep, consul_token)
       @host = host
       @port = port
       @target = target
@@ -21,6 +21,7 @@ module DeadmanCheck
       @alert_to_sns_region = alert_to_sns_region
       @recurse = recurse
       @daemon_sleep = daemon_sleep.to_i
+      @consul_token = consul_token
 
       unless @alert_to_slack.nil?
         Slack.configure do |config|
@@ -60,7 +61,7 @@ module DeadmanCheck
       end
 
       def get_recorded_epochs(host, port, target, recurse)
-        DeadmanCheck::DeadmanCheckGlobal.new.configure_diplomat(host, port)
+        DeadmanCheck::DeadmanCheckGlobal.new.configure_diplomat(host, port, @consul_token)
         recorded_epochs = Diplomat::Kv.get(target, recurse: recurse)
         return recorded_epochs
       end
@@ -79,7 +80,7 @@ module DeadmanCheck
 
       def parse_recorded_epoch(recorded_epochs)
         # {"epoch":1493000501,"frequency":"300"}
-        value_json = JSON.parse(recorded_epochs[0][:value])
+        value_json = JSON.parse(recorded_epochs)
         frequency = value_json["frequency"]
         epoch = value_json["epoch"]
         return epoch, frequency

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deadman_check
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - zane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-04 00:00:00.000000000 Z
+date: 2020-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -92,7 +92,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.2.5
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
@@ -102,7 +102,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.2.5
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
@@ -141,25 +141,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.2.4
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
+  name: aws-sdk-sns
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.10.21
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.10.21
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.10.21
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.10.21
+        version: '1'
 description: |-
   A script to check a given Consul key EPOCH for
       freshness. Good for monitoring cron jobs or batch jobs. Have the last step
@@ -211,7 +205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Monitor a Consul key that contains an EPOCH time entry. Send email if EPOCH