dynamo-autoscale 0.3 → 0.3.1

data/.ruby-version

@@ -0,0 +1 @@
+1.9.3-p392

data/CHANGELOG

@@ -1,3 +1,8 @@
+v0.3.1
+
+- Mainly quality of life changes. We're playing nicely in the CLI now, with a
+	--help and --version flag (schoolboy stuff, my bad).
+
 v0.3
 
 - Added backdating on startup. When dynamo-autoscale starts up, it now fetches 6

data/Gemfile

@@ -6,6 +6,7 @@ group :development do
   gem 'pry'
   gem 'ripl'
   gem 'timecop'
+  gem 'rake'
 end
 
 group :test do

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dynamo-autoscale (0.1.4)
+    dynamo-autoscale (0.3.1)
       activesupport
       aws-sdk
       colored
@@ -44,6 +44,7 @@ GEM
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
+    rake (10.0.4)
     rbtree (0.4.1)
     ripl (0.7.0)
       bond (~> 0.4.2)
@@ -72,6 +73,7 @@ PLATFORMS
 DEPENDENCIES
   dynamo-autoscale!
   pry
+  rake
   ripl
   rspec
   timecop

data/README.md

@@ -118,8 +118,9 @@ reads  for:  2.hours, less_than: "50%", min: 2, scale: { on: :consumed, by: 2 }
 writes for:  2.hours, less_than: "50%", min: 2, scale: { on: :consumed, by: 2 }
 ```
 
-You would put this ruleset in a file and then pass that file in as the first
-argument to `dynamo-autoscale` on the command line.
+You would put this ruleset in a file and then add the path to the ruleset to
+your `dynamo-autoscale` config. If you specify a relative path, the program will
+assume a path relative to its `Dir.pwd`.
 
 The first two rules are designed to deal with spikes. They are saying that if
 the consumed capacity units is greater than 90% of the provisioned throughput
@@ -241,6 +242,22 @@ row, scale by the amount consumed multiplied by 1.5. A new check will only
 happen when the table receives new data from cloud watch, which means that the
 10 minute windows could potentially overlap.
 
+### Table-specific rules
+
+If you only want some rules to apply to certain tables, you can do the
+following:
+
+``` ruby
+table "my_table_name" do
+  reads for: 2.hours, less_than: 10, scale: { on: :consumed, by: 2 }
+end
+
+reads for: 2, less_than: "20%", scale: { on: :consumed, by: 2 }
+```
+
+Anything outside of a `table` block will apply to all tables you specify in your
+config.
+
 ## Downscale grouping
 
 You can downscale reads or writes individually and this will cost you one of
@@ -432,6 +449,13 @@ Report Issues/Feature requests on
  	 it can be ignored when we pull)
  * Send a pull request. Bonus points for topic branches.
 
+### About InvisibleHand
+
+InvisibleHand is a price comparison API and browser extension which provides real-time
+prices for millions of products at hundreds of retailers, and automatic price comparison.
+
+For more information about our API and technologies, please read our [DevBlog](http://devblog.getinvisiblehand.com/).
+
 ### Copyright
 
 Copyright (c) 2013 InvisibleHand Software Ltd. See

data/USAGE

@@ -0,0 +1,14 @@
+Usage: dynamo-autoscale <path/to/config.yml>
+       dynamo-autoscale [-v|--version]
+       dynamo-autoscale [-h|--help]
+
+Available options are:
+
+    --version       prints out the version number of dynamo-autoscale
+    --help          prints out this documentation
+
+Details of what a configuration file should look to can be found at the
+following url: https://github.com/invisiblehand/dynamo-autoscale.
+
+For any queries, please email developers@getinvisiblehand.com.
+

data/bin/dynamo-autoscale

@@ -1,16 +1,43 @@
 #!/usr/bin/env ruby
 
+require 'optparse'
+
+# This OptionParser block is here to ensure the queries to --version are
+# actually fast and don't have to go through all of the Ruby requiring lark.
+begin
+  OptionParser.new do |opts|
+    opts.on('--version', 'Prints the version of this application.') do
+      require_relative '../lib/dynamo-autoscale/version'
+      puts DynamoAutoscale::VERSION
+      exit 0
+    end
+
+    opts.on('--help', 'Shows this documentation.') do
+      puts File.read(File.join(File.dirname(__FILE__), '..', 'USAGE'))
+      exit 0
+    end
+  end.parse!
+rescue OptionParser::InvalidOption => e
+  STDERR.puts e.message
+  STDERR.puts
+
+  STDERR.puts File.read(File.join(File.dirname(__FILE__), '..', 'USAGE'))
+  exit 1
+end
+
 require_relative '../config/environment/common'
 
+
 if ARGV[0]
   DynamoAutoscale.setup_from_config(ARGV[0])
 elsif ARGV[0].nil?
-  STDERR.puts "Usage: dynamo-autoscale path/to/config.yml"
+  STDERR.puts File.read(File.join(File.dirname(__FILE__), '..', 'USAGE'))
 
   exit 1
 elsif ARGV[0] and !File.exists?(ARGV[0])
-  STDERR.puts "Usage: dynamo-autoscale path/to/config.yml"
   STDERR.puts "Error: The path you specified is to a file that does not exist."
+  STDERR.puts
+  STDERR.puts File.read(File.join(File.dirname(__FILE__), '..', 'USAGE'))
 
   exit 1
 end

data/config/environment/common.rb

@@ -1,5 +1,4 @@
 require 'logger'
-require 'optparse'
 require 'fileutils'
 require 'time'
 require 'csv'

data/lib/dynamo-autoscale/local_actioner.rb

@@ -39,7 +39,6 @@ module DynamoAutoscale
         end
 
         actioner.provisioned_writes.reverse_each do |wtime, writes|
-          logger.debug "Checking if #{time} > #{wtime}"
           if time > wtime
             logger.debug "[filter] Faked provisioned_writes to be #{writes} at #{time}"
             datum[:provisioned_writes] = writes

data/lib/dynamo-autoscale/scale_report.rb

@@ -8,7 +8,9 @@ module DynamoAutoscale
       @table = table
       @erb = ERB.new(File.read(TEMPLATE))
 
-      if config = DynamoAutoscale.config[:email]
+      if DynamoAutoscale.config[:dry_run]
+        @enabled = false
+      elsif config = DynamoAutoscale.config[:email]
         @enabled = true
         Pony.options = config
       else
@@ -16,6 +18,10 @@ module DynamoAutoscale
       end
     end
 
+    def email_subject
+      "Scale event for #{@table.name}"
+    end
+
     def email_content
       @erb.result(binding)
     end
@@ -24,7 +30,7 @@ module DynamoAutoscale
       return false unless @enabled
 
       result = Pony.mail({
-        subject: "Scale event for #{@table.name}",
+        subject: email_subject,
         body:    email_content,
       })
 

data/lib/dynamo-autoscale/version.rb

@@ -1,3 +1,3 @@
 module DynamoAutoscale
-  VERSION = '0.3'
+  VERSION = '0.3.1'
 end

data/rlib/dynamodb_graph.r

@@ -8,6 +8,8 @@ data$time = strptime(data$time, "%Y-%m-%dT%H:%M:%SZ")
 measure.vars = c('provisioned_reads','provisioned_writes',
                  'consumed_reads','consumed_writes')
 
+# measure.vars = c('consumed_reads','consumed_writes')
+
 ive.melted = melt(data, id.vars='time', measure.vars = measure.vars)
 
 g = ggplot(ive.melted, aes(x=time, y=value, color=variable)) + geom_line()

data/script/email_test

@@ -0,0 +1,68 @@
+#!/usr/bin/env ruby
+
+require_relative '../config/environment/common'
+include DynamoAutoscale
+
+# This script is for testing the output of emails and configuration of email
+# servers to send mail from this gem.
+#
+# If you invoke this script with a config path, it will try and send the email
+# using your email configuration.
+#
+# If you invoke this script without a config path, it will just print the email
+# content to STDOUT.
+
+table = TableTracker.new("fake_table")
+
+rulepool = RuleSet.new do
+  reads  last: 2, greater_than: "90%", scale: { on: :consumed, by: 1.7 }
+  reads  last: 2, greater_than: "80%", scale: { on: :consumed, by: 1.5 }
+
+  writes last: 2, greater_than: "90%", scale: { on: :consumed, by: 1.7 }
+  writes last: 2, greater_than: "80%", scale: { on: :consumed, by: 1.5 }
+
+  reads  for:  2.hours, less_than: "20%", min: 10, scale: { on: :consumed, by: 1.8 }
+  reads  for:  2.hours, less_than: "30%", min: 10, scale: { on: :consumed, by: 1.8 }
+
+  writes for:  2.hours, less_than: "20%", min: 10, scale: { on: :consumed, by: 1.8 }
+  writes for:  2.hours, less_than: "30%", min: 10, scale: { on: :consumed, by: 1.8 }
+end.rules.values.flatten
+
+20.times do
+  table.tick(rand(1..100).minutes.ago, {
+    :provisioned_reads  => rand(1..1000),
+    :provisioned_writes => rand(1..1000),
+    :consumed_reads     => rand(1..1000),
+    :consumed_writes    => rand(1..1000),
+  })
+end
+
+10.times do
+  table.triggered_rules[rand(1..100).minutes.ago] = rulepool[rand(rulepool.length)]
+end
+
+10.times do
+  table.scale_events[rand(1..100).minutes.ago] = {
+    reads_from:  rand(1..1000),
+    reads_to:    rand(1..1000),
+    writes_from: rand(1..1000),
+    writes_to:   rand(1..1000),
+  }
+end
+
+report = ScaleReport.new(table)
+
+if ARGV[0]
+  DynamoAutoscale.setup_from_config(ARGV[0], dry_run: false)
+
+  report.send
+elsif ARGV[0].nil?
+  puts "Subject: #{report.email_subject}"
+  puts
+  puts report.email_content
+elsif ARGV[0] and !File.exists?(ARGV[0])
+  STDERR.puts "Usage: script/email_test [path/to/config.yml]"
+  STDERR.puts "Error: The path you specified is to a file that does not exist."
+
+  exit 1
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynamo-autoscale
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ autorequire:
 bindir:
 - bin
 cert_chain: []
-date: 2013-07-05 00:00:00.000000000 Z
+date: 2013-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -116,13 +116,14 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .ruby-version
 - CHANGELOG
 - Gemfile
 - Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
-- aws.sample.yml
+- USAGE
 - bin/dynamo-autoscale
 - config/dynamo-autoscale-test.yml
 - config/environment/common.rb
@@ -160,6 +161,7 @@ files:
 - rulesets/gradual_tail.rb
 - rulesets/none.rb
 - script/console
+- script/email_test
 - script/historic_data
 - script/hourly_wastage
 - script/monitor
@@ -191,6 +193,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3081011429766319992
 requirements:
 - If you want to graph your tables, you'll need R with the ggplot and reshape packages
   installed.

data/aws.sample.yml

@@ -1,16 +0,0 @@
-default: &default
-  :access_key_id: your_id
-  :secret_access_key: your_key
-
-development:
-  <<: *default
-  :dynamo_db_endpoint: dynamodb.us-east-1.amazonaws.com
-
-test:
-  <<: *default
-  :dynamo_db_endpoint: localhost
-  :dynamo_db_port: 4568
-
-production:
-  <<: *default
-  :dynamo_db_endpoint: dynamodb.us-east-1.amazonaws.com