elasticDynamoDb 1.4.2 → 1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3e141d1b383dc91f130bb2cced514154efaacbf
-  data.tar.gz: cccbf958b309bf07b3ca5050b96171b913463b71
+  metadata.gz: ab92c209e72914d232932624af454e823ea8916d
+  data.tar.gz: 394e933da2f2318d322d7cc912e46b360624297b
 SHA512:
-  metadata.gz: 385a80033cc3d16b2018ee21d8abd3d564492c7ea45e3f3e13dcb3b364074d9dfbef0c1c3b5f5f10172fe64a5e10e31f57ce9988c7a8e5fb50f33f64ff4f1da3
-  data.tar.gz: ef9448d2161f9defd8fd25169b5c69bffca18f712c4ff41a359a4d65b0cbb8f417be07006b36bf99bdd139bc46ea4e7e3b82e1855759b0cc654bbf94c6ecddf3
+  metadata.gz: 867c68fc402f5422d86ca890d5a069350f02dbeccc3500792bc7543f13ad4c55162f7b55a42fad436f5d008b643f0500b74dc96873c9bb56a049b6c77f7176de
+  data.tar.gz: 35fa7c1447f695ce8167968599faeebdc854a6078cec488fea26850a138a453d965393b571f280f646daa3fe1bcdd81468e79423d8cd324cdf834a06712b053b

data/CHANGES.md

@@ -1,4 +1,4 @@
-1.4.1
+1.4.2
 -----
 fix issue of scaling incorrectly when using decimals for example 
 scale factor of 0.3 on a provisioned throuput of 1 would become 1 (using ciel)

data/elasticDynamoDb.gemspec

@@ -1,4 +1,6 @@
 $:.push File.expand_path("../lib", __FILE__)
+$:.push File.expand_path("../lib/elasticDynamoDb", __FILE__)
+
 require File.expand_path('../lib/elasticDynamoDb', __FILE__)
 
 Gem::Specification.new do |s|

data/lib/elasticDynamoDb.rb

@@ -1,5 +1,5 @@
 module ElasticDynamoDb
-  VERSION   = "1.4.2"
+  VERSION   = "1.5"
   ABOUT     = "ElasticDynamoDb v#{VERSION} (c) #{Time.now.strftime("2014-%Y")} @innovia"
   
   autoload :Cli, 		  'elasticDynamoDb/cli'

data/lib/elasticDynamoDb/cli.rb

@@ -1,15 +1,19 @@
 #!/usr/bin/env ruby
 require 'thor'
-require 'aws-sdk-core'
+require 'aws-sdk'
 require 'fileutils'
-
-autoload :ConfigParser, 'elasticDynamoDb/configparser'
+$:.unshift File.expand_path(File.join(File.dirname(__FILE__), '.'))
 
 class ElasticDynamoDb::Cli < Thor
   include Thor::Actions
+  autoload :ConfigParser, 'configparser'
+  autoload :CloudWatch,   'cloudwatch'
+
+  include CloudWatch
+  
   default_task  :onDemand
-  attr_accessor :restore_in_progress, :backup_folder, :config_file_name, :original_config_file, :config, :ddb,
-                :log_file, :automated_reason
+  attr_accessor :restore_in_progress, :backup_folder, :config_file_name, :original_config_file, :config, :ddb, :cw,
+                :log_file, :automated_reason, :skip_cloudwatch
 
   desc "onDemand", "Ease autoscale by schedule or scale factor"
   class_option :factor,            :type => :numeric,                         :banner => 'scale factor can be decimal too 0.5 for instance'
@@ -70,6 +74,8 @@ private
     self.original_config_file = "#{self.backup_folder}/#{self.config_file_name}-#{options[:timestamp]}"
 
     FileUtils.mkdir_p self.backup_folder
+
+    self.skip_cloudwatch = false
   end
 
   def aws_init
@@ -77,16 +83,20 @@ private
       ENV['AWS_REGION'] = 'us-east-1'
       say "using local DynamoDB"
       self.ddb = Aws::DynamoDB::Client.new({endpoint: 'http://localhost:4567', api: '2012-08-10'})
+      self.skip_cloudwatch = true
     else
       credentials = Aws::Credentials.new(
         self.config['global']['aws-access-key-id'], self.config['global']['aws-secret-access-key-id']
       )
 
-      self.ddb = Aws::DynamoDB::Client.new({
-        api: '2012-08-10', 
+      aws_config = {        
         region: self.config['global']['region'],
         credentials: credentials
-      })  
+      }
+
+      self.ddb = Aws::DynamoDB::Client.new(aws_config.merge({api: '2012-08-10'}))
+
+      self.cw  = Aws::CloudWatch::Client.new(aws_config)  
     end
   end
 
@@ -234,7 +244,7 @@ private
 
     if confirmed
      
-      provisioning ={}
+      provisioning = {}
 
       active_throughputs = self.config.keys.select{|k| k =~ /table/}
       active_throughputs.inject(provisioning) { |acc, config_section|
@@ -251,14 +261,19 @@ private
           acc[table] ||= {}
           acc[table]['reads']  = self.config[config_section]['min-provisioned-reads'].to_i
           acc[table]['writes'] = self.config[config_section]['min-provisioned-writes'].to_i
+          acc[table]['sns-topic-arn'] = self.config[config_section]['sns-topic-arn'] if !self.config[config_section]['sns-topic-arn'].nil?
+          acc[table]['reads-upper-alarm-threshold'] = self.config[config_section]['reads-upper-alarm-threshold'] if !self.config[config_section]['reads-upper-alarm-threshold'].nil?
+          acc[table]['writes-upper-alarm-threshold'] = self.config[config_section]['writes-upper-alarm-threshold'] if !self.config[config_section]['writes-upper-alarm-threshold'].nil?
         end
+
         acc  
       }
       
       log_changes("Update AWS via api call with the following data:\n #{provisioning}\n")
       
       say "\nWill update: #{provisioning.keys.size} tables\n\n\n", color = :blue
-      
+      puts "provisioning: #{provisioning}"
+
       update_tables(provisioning)
     else
       
@@ -310,19 +325,25 @@ private
     indexes_status
   end
 
-  def update_single_table(table_options)
+  def update!(table_options)
+    puts "table_options: #{table_options}"
+    say "Updating provisioning for table: #{table_options[:table_name]}...", color = :cyan
+    self.ddb.update_table(table_options.reject {|k| k =~ /sns|alarm/})
+  end
+
+  def update_table_if_ready(table_options)
     while true
       ready = check_status(table_options[:table_name])
 
       if ready
-        say "Updating provisioning for table: #{table_options[:table_name]}...", color = :cyan
         begin
-          result = self.ddb.update_table(table_options)
+          result = update!(table_options)
         rescue Exception => e
           say "\nUnable to update table: #{e.message}\n", color = :red
           
           if e.message.include?('The requested throughput value equals the current value') || e.message.include?('The requested value equals the current value')
             say "Skipping table update - the requested throughput value equals the current value", color = :yellow
+            set_cloudwatch_alarms(table_options) unless self.skip_cloudwatch 
             return         
           end
 
@@ -333,10 +354,11 @@ private
           end
 
           say "\nRetrying update on #{table_options[:table_name]}", color = :yellow
-          update_single_table(table_options) if e.message.include?('The requested throughput value equals the current value')          
+          update!(table_options) if e.message.include?('The requested throughput value equals the current value')          
         end
-        return
         
+        set_cloudwatch_alarms(table_options) unless self.skip_cloudwatch
+        return
       else
         say "Table #{table_options[:table_name]} is not ready for update, waiting 5 sec before retry", color = :yellow
         sleep 5
@@ -346,32 +368,31 @@ private
 
   def update_tables(provisioning)
     provisioning.each do |table, values|
+      say "table values before provisioning: #{values}", color  = :cyan
+
       table_options = {
-                  :table_name => table,
-                  :provisioned_throughput => {
-                                              :read_capacity_units =>  values['reads'],
-                                              :write_capacity_units =>  values['writes']
-                  }
+        :table_name => table,
+        :provisioned_throughput => {:read_capacity_units =>  values['reads'], :write_capacity_units =>  values['writes']}
       }
         
+      table_options.merge!({:sns_topic_arn => values['sns-topic-arn']}) if values['sns-topic-arn']
+      table_options.merge!({:reads_upper_alarm_threshold => values['reads-upper-alarm-threshold']}) if values['reads-upper-alarm-threshold']
+      table_options.merge!({:writes_upper_alarm_threshold => values['writes-upper-alarm-threshold']}) if values['writes-upper-alarm-threshold']
+
       # if one of the keys for the table contain index merge the options for update table
       indexes = provisioning[table].keys.select { |key| key.match(/index/) }
       if !indexes.empty?
         indexes.each do |index|
           table_options.merge!({ 
-                         :global_secondary_index_updates => [{:update => { 
-                                                                            :index_name => index,
-                                                                            :provisioned_throughput => {
-                                                                              :read_capacity_units =>  values[index]['reads'],
-                                                                              :write_capacity_units => values[index]['writes'] 
-                                                                            }
-                                                                          }
-                                                              }]
+            :global_secondary_index_updates => [{:update => { 
+              :index_name => index,
+              :provisioned_throughput => {:read_capacity_units =>  values[index]['reads'], :write_capacity_units => values[index]['writes']}
+            }}]
           })
         end
       end
 
-      update_single_table(table_options)
+      update_table_if_ready(table_options)
     end
   end
 end

data/lib/elasticDynamoDb/cloudwatch.rb

@@ -0,0 +1,52 @@
+#!/usr/bin/env ruby
+
+module ElasticDynamoDb::Cli::CloudWatch
+  
+  def set_default_options(hash, member)
+    if hash[member] && !hash[member].nil?
+      default = hash[member]
+    else
+      default =  self.config["default_options"][member.to_s.gsub("_", "-")] if !self.config["default_options"][member.to_s.gsub("_", "-")].nil?
+    end
+  end
+
+  def put_metric_alarm(table_options, mode, threshold, arn)
+    cw_options = {
+      alarm_name: "#{table_options[:table_name]}-#{mode.capitalize}CapacityUnitsLimit-BasicAlarm",
+      alarm_description: "Consumed#{mode.capitalize}Capacity",
+      actions_enabled: true,
+      ok_actions: [arn],
+      alarm_actions: [arn],
+      metric_name: "Consumed#{mode.capitalize}CapacityUnits",
+      namespace: "AWS/DynamoDB",
+      statistic: "Sum",
+      dimensions: [
+        {
+          name: "TableName",
+          value: table_options[:table_name]
+        }
+      ],
+      period: 60,
+      unit: "Count",
+      threshold: threshold,
+      evaluation_periods: 60,
+      comparison_operator: "GreaterThanOrEqualToThreshold"
+    }
+    self.cw.put_metric_alarm(cw_options)
+  end
+
+  def set_cloudwatch_alarms(table_options)
+    arn = set_default_options(table_options, :sns_topic_arn)   
+    reads_upper_alarm_threshold = set_default_options(table_options, :reads_upper_alarm_threshold)      
+    writes_upper_alarm_threshold = set_default_options(table_options, :writes_upper_alarm_threshold)
+
+  	say  "Setting CloudWatch alarms thresholds for #{table_options[:table_name]} with upper read threshold of #{reads_upper_alarm_threshold}% and upper writes of #{writes_upper_alarm_threshold}%", color = :magenta
+    
+    if !arn.nil? && !reads_upper_alarm_threshold.nil? && !writes_upper_alarm_threshold.nil?
+      put_metric_alarm(table_options, 'read', (table_options[:provisioned_throughput][:read_capacity_units] * 300) * reads_upper_alarm_threshold.to_i/100, arn)
+      put_metric_alarm(table_options, 'writes', (table_options[:provisioned_throughput][:write_capacity_units] * 300) * writes_upper_alarm_threshold.to_i/100, arn)
+  	else
+      say "unable to find sns topic in config file - skipping cloudwatch alerts", color = :yellow
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticDynamoDb
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: '1.5'
 platform: ruby
 authors:
 - Ami Mahloof
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-01 00:00:00.000000000 Z
+date: 2015-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: configparser
@@ -81,6 +81,7 @@ files:
 - elasticDynamoDb.gemspec
 - lib/elasticDynamoDb.rb
 - lib/elasticDynamoDb/cli.rb
+- lib/elasticDynamoDb/cloudwatch.rb
 - lib/elasticDynamoDb/configparser.rb
 homepage: https://github.com/innovia/ElasticDynamoDb
 licenses: