deckard 0.5.7 → 0.5.8

data/README

@@ -15,10 +15,13 @@ Features:
 * Alert priorities (log, email, SMS and notifo)
 * Simple setup via cron
 * Basic scheduling to silence alerts
+* Adjustable delay before firing check content requests
 
 Usage:
 
-$ deckard ./deckard.yml
+$ deckard --all ./deckard.yml
+
+You now have the option of running --all, --failover, --content, --replication if you only want to run a subset of checks
 
 Setup:
 
@@ -26,7 +29,7 @@ Setup:
 * Create a crontab entry
 
 $ crontab -e
-*/5 * * * * deckard /path/deckard.yml &> /dev/null
+*/5 * * * * deckard --all /path/deckard.yml &> /dev/null
 
 
 Example documents:

data/config/deckard-test.yml

@@ -0,0 +1,33 @@
+defaults:
+  email_to: "joe@cloudant.com"
+  email_from: "joe@cloudant.com"
+  email_host: "localhost"
+  db_user:
+  db_password:
+  db_host: "localhost"
+  db_port: "5984"
+  on_call_db: "monitor_on_call"
+  on_call_doc: "on_call_person"
+  log_file: "./log"
+
+content_check:
+  retry_count: 1
+  retry_interval: 5
+  db: "monitor_content_check"
+  delay: false
+  delay_upper_bound: 10
+
+fo_check:
+  retry_count: 1
+  aws_key: "AKIAIZU26DXCWA2EHUSA"
+  aws_secret: "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"
+  db: "monitor_fo_check"
+
+rep_check:
+  doc_behind_threshold: 5000
+  doc_ahead_threshold: -100
+  db: "monitor_rep_check"
+
+notifo:
+  user: "username"
+  apikey: "password"

data/config/deckard.yml

@@ -14,6 +14,8 @@ content_check:
   retry_count: 1
   retry_interval: 5
   db: "monitor_content_check"
+  delay: false
+  delay_upper_bound: 10
 
 fo_check:
   retry_count: 1
@@ -28,4 +30,4 @@ rep_check:
 
 notifo:
   user: "username"
-  apikey: "password"
+  apikey: "password"

data/lib/deckard.rb

@@ -30,6 +30,8 @@ class Deckard
   def self.content_check
     retry_count = Deckard::Config.content_check_retry
     db_name = Deckard::Config.content_check_db
+    delay = Deckard::Config.content_check_delay
+    upper_bound = Deckard::Config.content_check_delay_upper_bound
     list = Array.new
 
     nodes = Deckard::Util.get_nodes(db_name)
@@ -38,6 +40,9 @@ class Deckard
       run = Thread.new {
         Deckard::Monitor.content_check(node["url"], node["content"], node["priority"], retry_count, node["schedule"])
         }
+      if delay
+			  sleep(rand(upper_bound))
+      end 
       list << run
     end
 
@@ -90,9 +95,18 @@ class Deckard
   def self.main
     list = Array.new
 
-    list << Thread.new { content_check }
-    list << Thread.new { rep_check }
-    list << Thread.new { fo_check }
+    case ARGV[0]
+    when "--all"
+      list << Thread.new { content_check }
+      list << Thread.new { rep_check }
+      list << Thread.new { fo_check }
+    when "--content"
+      list << Thread.new { content_check }
+    when "--replication"
+      list << Thread.new { rep_check }
+    when "--failover"
+      list << Thread.new { fo_check }
+    end
 
     list.each { |x|
       x.join

data/lib/deckard/config.rb

@@ -1,6 +1,6 @@
 class Deckard
   class Config
-    monitor_config = YAML.load(File.open(ARGV[0]))
+    monitor_config = YAML.load(File.open(ARGV[1]))
     extend Mixlib::Config
     configure do |c|
       c[:email_to] = monitor_config["defaults"]["email_to"]
@@ -17,6 +17,8 @@ class Deckard
       c[:content_check_retry] = monitor_config["content_check"]["retry_count"]
       c[:content_check_retry_interval] = monitor_config["content_check"]["retry_interval"]
       c[:content_check_db] = monitor_config["content_check"]["db"]
+      c[:content_check_delay] = monitor_config["content_check"]["delay"]
+      c[:content_check_delay_upper_bound] = monitor_config["content_check"]["delay_upper_bound"]
 
       c[:fo_check_retry] = monitor_config["fo_check"]["retry_count"]
       c[:aws_key] = monitor_config["fo_check"]["aws_key"]

data/lib/deckard/monitoring.rb

@@ -66,16 +66,17 @@ class Deckard
           Deckard::Util.alert(priority, subject, body, log, schedule, "http://#{elastic_ip}")
 
           instance_id = Deckard::Ec2.get_association(region, elastic_ip)
-          
- 					if Deckard::Ec2.disassociate_address(region, elastic_ip) == "true"
-          	Deckard::Log.info("ALERT :: Disassociated #{elastic_ip}")
- 					else
- 				    Deckard::Log.info("ALERT :: Could not disassociate #{elastic_ip}")
-         		Deckard::Util.alert(priority, "ALERT :: Could not disassociate #{elastic_ip}", "ALERT :: Could not disassociate #{elastic_ip}", log, schedule, "http://#{elastic_ip}")	
-					end
+
+          if Deckard::Ec2.disassociate_address(region, elastic_ip)
+            Deckard::Log.info("ALERT :: Disassociated #{elastic_ip}")
+          else
+            Deckard::Log.info("ALERT :: Could not disassociate #{elastic_ip}")
+            Deckard::Util.alert(priority, "ALERT :: Could not disassociate #{elastic_ip}", "ALERT :: Could not disassoci
+ate #{elastic_ip}", log, schedule, "http://#{elastic_ip}")
+          end
 
           if instance_id == primary_instance_id
-            if Deckard::Ec2.associate_address(region, secondary_instance_id, elastic_ip) == "true"
+            if Deckard::Ec2.associate_address(region, secondary_instance_id, elastic_ip)
 							info = "ALERT :: associated #{elastic_ip} to #{secondary_instance_id}"
             	Deckard::Log.info("ALERT :: associated #{elastic_ip} to #{secondary_instance_id}")
             	subject = "ALERT :: Failover Complete for #{elastic_ip} #{secondary_instance_id}"
@@ -88,7 +89,7 @@ class Deckard
 						end
 
           elsif instance_id == secondary_instance_id
-            if Deckard::Ec2.associate_address(region, primary_instance_id, elastic_ip) == "true"
+            if Deckard::Ec2.associate_address(region, primary_instance_id, elastic_ip)
 							info = "ALERT :: associated #{elastic_ip} to #{secondary_instance_id}"
             	Deckard::Log.info("ALERT :: associated #{elastic_ip} to #{secondary_instance_id}")
             	subject = "ALERT :: Failover Complete for #{elastic_ip} #{secondary_instance_id}"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 7
-  version: 0.5.7
+  - 8
+  version: 0.5.8
 platform: ruby
 authors: 
 - joe williams
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-05 00:00:00 -07:00
+date: 2010-09-09 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -119,6 +119,7 @@ files:
 - lib/deckard/monitoring.rb
 - lib/deckard/util.rb
 - lib/deckard.rb
+- config/deckard-test.yml
 - config/deckard.yml
 - README
 has_rdoc: true