deadman_check 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d953112773ed31bd80555e610d6b73feda3b838
-  data.tar.gz: c59eebf4b31ea08b59e2a68889e5e5fb872b6adf
+  metadata.gz: 2d643575c257f288cce1175773ad1fa98d5f52d4
+  data.tar.gz: cbae19c566d01e356d98d2e888994d97e4e831ef
 SHA512:
-  metadata.gz: 818481b65efc9641f6c02cc3ef53d124ab89ace427d1ccc18eaed0854ec472917e904eb0bb2a60fb622ee83e3975c5a5c1be196cca00ee5cdb2b8b4fe2e27e8d
-  data.tar.gz: fe69bac98527ed9acc0251723b61f2645241fa4d502a8a3a3b0b057c5bd3baa8a7a378900a2a7158551caf6ed6da8da5b8b9371e2f7adb2a78eb2ac74251b046
+  metadata.gz: 06a21149acca3601911646814a1e7bc6c9d4deed764b78971c66f478d1e7b54807283e0083ab2eb03ab075e7ac956c1da3ae0a4139bdd2da3023c2c65921a500
+  data.tar.gz: ad681fbab87b1dd342e0541aab287e5c1310f8281ec1c148e8bc7e2c697a61312f02bd890f2f9c281bbadb4d8975f6119bd42cb0c757b5090bdaf0a6d4e10deb

data/README.md

@@ -1,7 +1,7 @@
-# DeadmanCheck
+# Deadman Check
 
-[![Build Status](https://travis-ci.org/sepulworld/deadman-check.svg)](https://travis-ci.org/sepulworld/deadman_check)
-[![Gem Version](https://badge.fury.io/rb/deadman-check.svg)](http://badge.fury.io/rb/deadman_check)
+[![Build Status](https://travis-ci.org/sepulworld/deadman-check.svg)](https://travis-ci.org/sepulworld/deadman-check)
+[![Gem Version](https://badge.fury.io/rb/deadman_check.svg)](http://badge.fury.io/rb/deadman_check)
 
 A monitoring companion for Nomad periodic jobs that alerts if periodic jobs are
 not processing as expected. The deadman-check has 2 modes, one to run with the
@@ -10,8 +10,8 @@ is intended to run as a separate process that will monitor the Redis key's EPOCH
 time value and alert if that value fails to meet a time 'freshness' threshold that
 is expected for that job.
 
-* requires a Redis instance
-* alerting requires a SLACK_API_TOKEN environment variable
+* Requires a Consul instance
+* Alerting requires a SLACK_API_TOKEN environment variable
 
 ## Example Usage
 
@@ -90,7 +90,7 @@ job "SilverBulletPeriodic" {
 }
 ```
 
-Now the key, deadman/SilverBulletPeriodicProcess, in redis1.mydomain.net will be updated with
+Now the key, deadman/SilverBulletPeriodicProcess, at 10.0.0.1 will be updated with
 the EPOCH time for each SilverBulletPeriodic job run. If the job hangs or fails to run
 we will know via the EPOCH time entry going stale.
 
@@ -135,6 +135,9 @@ job "DeadmanMonitoring" {
 
 Monitor a Redis key that contains an EPOCH time entry. Send a Slack message if EPOCH age hits given threshold
 
+
+# Non-Nomad Use:
+
 ## Local system installation
 
 execute:

data/bin/deadman-check

@@ -7,17 +7,17 @@ require 'daemons'
 
 program :name, 'deadman-check'
 program :version, DeadmanCheck::VERSION
-program :description, %q{Monitor a Redis key that contains an EPOCH time entry. Send email if EPOCH age hits given threshold}
+program :description, %q{Monitor a Consul key that contains an EPOCH time entry. Send email if EPOCH age hits given threshold}
 
 command :switch_monitor do |c|
   c.syntax = 'deadman-check switch_monitor [options]'
-  c.summary = 'Target a Redis key to monitor'
+  c.summary = 'Target a Consul key to monitor'
   c.description = ''
-  c.example %q{Target a Redis key deadman/myservice, and this key has an EPOCH value to check looking to alert on 500 second or greater freshness},
+  c.example %q{Target a Consul key deadman/myservice, and this key has an EPOCH value to check looking to alert on 500 second or greater freshness},
     %q{deadman-check switch_monitor --host 127.0.0.1 --port 6379 --key deadman/myservice --freshness 500 --alert-to ops@mycomany.tld --alert-from ops-no-reply-email@mycomany.tld}
-  c.option '--host HOST', String, 'IP address or hostname of Redis system'
-  c.option '--port PORT', String, 'port Redis is listening on'
-  c.option '--key KEY', String, 'Redis key to monitor'
+  c.option '--host HOST', String, 'IP address or hostname of Consul system'
+  c.option '--port PORT', String, 'port Consul is listening on'
+  c.option '--key KEY', String, 'Consul key to monitor'
   c.option '--freshness SECONDS', String, %q{The value in seconds to alert on when the recorded
     EPOCH value exceeds current EPOCH}
   c.option '--alert-to SLACKROOM', String, 'Slackroom to alert to'
@@ -37,16 +37,16 @@ end
 
 command :key_set do |c|
   c.syntax = 'deadman-check key_set [options]'
-  c.summary = 'Update a given Redis key with current EPOCH'
+  c.summary = 'Update a given Consul key with current EPOCH'
   c.description = ''
-  c.example %q{Update a Redis key deadman/myservice, with current EPOCH time},
+  c.example %q{Update a Consul key deadman/myservice, with current EPOCH time},
     %q{deadman-check key_set --host 127.0.0.1 --port 6379 --key deadman/myservice}
-  c.option '--host HOST', String, 'IP address or hostname of Redis system'
-  c.option '--port PORT', String, 'port Redis is listening on'
-  c.option '--key KEY', String, 'Redis key to report EPOCH time to'
+  c.option '--host HOST', String, 'IP address or hostname of Consul system'
+  c.option '--port PORT', String, 'port Consul is listening on'
+  c.option '--key KEY', String, 'Consul key to report EPOCH time to'
   c.action do |args, options|
     key_set = DeadmanCheck::KeySet.new(options.host, options.port,
       options.key)
-    key_set.run_redis_key_update
+    key_set.run_consul_key_update
   end
 end

data/deadman_check.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "minitest", "~> 5.0"
 
   spec.add_dependency 'commander', '~> 4.4', '>= 4.4.3'
-  spec.add_dependency 'redis', '~> 3.3', '>= 3.3.3'
+  spec.add_dependency 'diplomat', '~> 1.2', '>= 1.2.0'
   spec.add_dependency 'slack-ruby-client', '~> 0.8.0'
   spec.add_dependency 'daemons', '~> 1.2.4', '>=1.2.4'
 end

data/lib/deadman_check/version.rb

@@ -1,3 +1,3 @@
 module DeadmanCheck
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/lib/deadman_check_global.rb

@@ -1,10 +1,18 @@
 require 'deadman_check/version'
+require 'diplomat'
 
 module DeadmanCheck
   class DeadmanCheckGlobal
+
     def get_epoch_time
       epoch_time_now = Time.now.to_i
       return epoch_time_now
     end
+
+    def configure_diplomat(host, port)
+      Diplomat.configure do |config|
+        config.url = "http://#{host}:#{port}"
+      end
+    end
   end
 end

data/lib/deadman_check_keyset.rb

@@ -1,6 +1,6 @@
 require 'deadman_check/version'
 require 'deadman_check_global'
-require 'redis'
+require 'diplomat'
 
 module DeadmanCheck
   # KeySet Class
@@ -13,15 +13,21 @@ module DeadmanCheck
       @key  = key
     end
 
-    def _update_redis_key(host, port, key)
+    def _configure_diplomat(host, port)
+      Diplomat.configure do |config|
+        config.url = "http://#{host}:#{port}"
+      end
+    end
+
+    def _update_consul_key(host, port, key)
+      DeadmanCheck::DeadmanCheckGlobal.new.configure_diplomat(host, port)
       epoch_time_now = DeadmanCheck::DeadmanCheckGlobal.new.get_epoch_time
-      redis = Redis.new(:host => host, :port => port)
-      redis.set(key, epoch_time_now)
-      puts "Redis key #{key} updated EPOCH to #{epoch_time_now}"
+      Diplomat::Kv.put(key, "#{epoch_time_now}")
+      puts "Consul key #{key} updated EPOCH to #{epoch_time_now}"
     end
 
-    def run_redis_key_update
-      _update_redis_key(@host, @port, @key)
+    def run_consul_key_update
+      _update_consul_key(@host, @port, @key)
     end
   end
 end

data/lib/deadman_check_switch.rb

@@ -1,6 +1,6 @@
 require 'deadman_check/version'
 require 'deadman_check_global'
-require 'redis'
+require 'diplomat'
 require 'slack-ruby-client'
 
 module DeadmanCheck
@@ -27,8 +27,8 @@ module DeadmanCheck
     end
 
     def _get_recorded_epoch(host, port, key)
-      redis = Redis.new(:host => host, :port => port)
-      recorded_epoch = redis.get(key)
+      DeadmanCheck::DeadmanCheckGlobal.new.configure_diplomat(host, port)
+      recorded_epoch = Diplomat::Kv.get(key)
       return recorded_epoch
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deadman_check
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - zane
@@ -73,25 +73,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.4.3
 - !ruby/object:Gem::Dependency
-  name: redis
+  name: diplomat
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.3
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.3
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: slack-ruby-client
   requirement: !ruby/object:Gem::Requirement