dynamo-autoscale 0.1.4 → 0.2

data/script/monitor

@@ -11,37 +11,20 @@
 # To exit the program entirely, drop into the REPL and run "exit!".
 
 require_relative '../config/environment/common'
-require 'pp'
-require 'timecop'
 include DynamoAutoscale
 
-ruleset = ARGV.shift
-tables  = ARGV
+if ARGV[0]
+  DynamoAutoscale.setup_from_config(ARGV[0], dry_run: true)
+elsif ARGV[0].nil?
+  STDERR.puts "Usage: script/monitor path/to/config.yml"
 
-if tables.empty? or ruleset.nil?
-  STDERR.puts "Usage: script/monitor ruleset table_name [another_table_name ... ]"
   exit 1
-end
-
-# These filters use the arrays inside the local actioner to fake the provisioned
-# reads and writes when the local data enters the system. It makes it look like
-# we're actually modifying the provisioned numbers.
-filters = [
-  Proc.new do |time, datum|
-    if writes = DynamoAutoscale.actioner.provisioned_writes(table).last
-      datum[:provisioned_writes] = writes.last
-    end
-
-    if reads = DynamoAutoscale.actioner.provisioned_reads(table).last
-      datum[:provisioned_reads] = reads.last
-    end
-  end,
-]
+elsif ARGV[0] and !File.exists?(ARGV[0])
+  STDERR.puts "Usage: script/monitor path/to/config.yml"
+  STDERR.puts "Error: The path you specified is to a file that does not exist."
 
-DynamoAutoscale.rules          = RuleSet.new(ruleset)
-DynamoAutoscale.dispatcher     = Dispatcher.new
-DynamoAutoscale.poller         = CWPoller.new(tables: tables)
-DynamoAutoscale.actioner_class = LocalActioner
+  exit 1
+end
 
 begin
   DynamoAutoscale.poller.run

data/script/simulator

@@ -5,27 +5,29 @@
 # through the data chronologically, dropping you into a REPL with each new
 # timeslice.
 #
-# Useful for checking that code works without having to make calls to the
-# CloudWatch API.
+# You will first need to have obtained historic data on the tables in your
+# config file. To do this, run:
+#
+#   $ script/historic_data path/to/config.yml
+#
+# This script does not change any throughputs on DynamoDB whatsoever. The
+# historic script data will hit CloudWatch fairly hard to get its data, though.
 
 require_relative '../config/environment/common'
-require 'timecop'
-require 'pp'
 include DynamoAutoscale
 
-ruleset = ARGV.shift
-tables  = ARGV
+if ARGV[0]
+  DynamoAutoscale.setup_from_config(ARGV[0], dry_run: true)
+elsif ARGV[0].nil?
+  STDERR.puts "Usage: script/simulator path/to/config.yml"
 
-if ruleset.nil? or tables.empty?
-  STDERR.puts "Usage: script/simulator ruleset table_name [another_table_name ... ]"
   exit 1
-end
+elsif ARGV[0] and !File.exists?(ARGV[0])
+  STDERR.puts "Usage: script/simulator path/to/config.yml"
+  STDERR.puts "Error: The path you specified is to a file that does not exist."
 
-filters                        = LocalActioner.faux_provisioning_filters
-DynamoAutoscale.rules          = RuleSet.new(ruleset)
-DynamoAutoscale.dispatcher     = Dispatcher.new
-DynamoAutoscale.poller         = LocalDataPoll.new(tables: tables, filters: filters)
-DynamoAutoscale.actioner_class = LocalActioner
+  exit 1
+end
 
 DynamoAutoscale.poller.run do |table, time, datum|
   Timecop.travel(time)

data/script/test

@@ -1,34 +1,42 @@
 #!/usr/bin/env ruby
 
+# This script will locally test the tables and options you have specified in
+# your config passed in as ARGV[0].
+#
+# You will first need to have obtained historic data on the tables in your
+# config file. To do this, run:
+#
+#   $ script/historic_data path/to/config.yml
+#
+# This script does not change any throughputs on DynamoDB whatsoever. The
+# historic script data will hit CloudWatch fairly hard to get its data, though.
+
 require_relative '../config/environment/common'
-require 'pp'
-require 'timecop'
-include DynamoAutoscale
-extend  DynamoAutoscale
 
-graph   = !!(ARGV.delete("--graph") or ARGV.delete("-g"))
-ruleset = ARGV.shift
-tables  = ARGV
+OptionParser.new do |opts|
+  opts.on("--graph") do
+    GRAPH = true
+  end
+end.parse!
+
+if ARGV[0]
+  DynamoAutoscale.setup_from_config(ARGV[0], dry_run: true)
+elsif ARGV[0].nil?
+  STDERR.puts "Usage: script/test path/to/config.yml"
 
-if tables.empty? or ruleset.nil?
-  STDERR.puts "Usage: script/test ruleset table_name [another_table_name ... ] [-g|--graph]"
   exit 1
-end
+elsif ARGV[0] and !File.exists?(ARGV[0])
+  STDERR.puts "Usage: script/test path/to/config.yml"
+  STDERR.puts "Error: The path you specified is to a file that does not exist."
 
-filters                        = LocalActioner.faux_provisioning_filters
-DynamoAutoscale.rules          = RuleSet.new(ruleset)
-DynamoAutoscale.dispatcher     = Dispatcher.new
-DynamoAutoscale.poller         = LocalDataPoll.new(tables: tables, filters: filters)
-DynamoAutoscale.actioner_class = LocalActioner
-DynamoAutoscale.actioner_opts  = { group_downscales: true, flush_after: 2.hours }
+  exit 1
+end
 
 # Uncomment this and the below RubyProf lines if you want profiling information.
 # RubyProf.start
 
 begin
-  DynamoAutoscale.poller.run do |table_name, time|
-    Timecop.travel(time)
-  end
+  DynamoAutoscale.poller.run { |table_name, time| Timecop.travel(time) }
 rescue Interrupt
   Ripl.start binding: binding
 end
@@ -40,12 +48,10 @@ end
 # Uncomment this if you want to drop into a REPL at the end of the test.
 # Ripl.start binding: binding
 
-tables.each do |table_name|
-  table = DynamoAutoscale.tables[table_name]
-
+DynamoAutoscale.tables.each do |_, table|
   table.report!
 
-  if graph
+  if GRAPH
     path = table.graph! open: true
     puts "Graph saved to #{path}"
   end

data/script/validate_ruleset

@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 
 require_relative '../config/environment/common'
-include DynamoAutoscale
-extend  DynamoAutoscale
 
 ruleset = ARGV.shift
 
@@ -12,7 +10,7 @@ if ruleset.nil?
 end
 
 begin
-  RuleSet.new(ruleset)
+  DynamoAutoscale::RuleSet.new(ruleset)
   puts "Rules seem legit."
 rescue ArgumentError => e
   puts "Ruleset has problem: #{e.message}"

data/spec/actioner_spec.rb

@@ -16,6 +16,12 @@ describe DynamoAutoscale::Actioner do
       })
     end
 
+    it "should add a scale event to its table" do
+      Timecop.travel(10.minutes.from_now)
+      actioner.set(:writes, 90).should be_true
+      table.scale_events.should_not be_empty
+    end
+
     it "should not be allowed more than 4 times per day" do
       actioner.set(:writes, 90).should be_true
       Timecop.travel(10.minutes.from_now)

data/spec/rule_spec.rb

@@ -252,6 +252,12 @@ describe DynamoAutoscale::Rule do
 
         subject { rule.test(table) }
         it      { should be_true }
+
+        describe "table" do
+          subject               { table }
+          before                { rule.test(table) }
+          its(:triggered_rules) { should_not be_empty }
+        end
       end
 
       describe "should not match" do

data/templates/scale_report_email.erb

@@ -0,0 +1,17 @@
+Last 5 triggered rules:
+
+<% @table.triggered_rules.reverse_each.take(5).each do |time, rule| %>
+  <%= time.iso8601 %>: <%= rule.to_english %>
+<% end %>
+
+Last 20 data points:
+
+<% @table.data.reverse_each.take(20).each do |time, datum| %>
+  <% time.iso8601 %>: <%= datum %>
+<% end %>
+
+Last 5 scale events:
+
+<% @table.scale_events.reverse_each.take(5) do |time, scale_event| %>
+  <%= time.iso8601 %>: <%= scale_event %>
+<% end %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynamo-autoscale
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: '0.2'
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ autorequire:
 bindir:
 - bin
 cert_chain: []
-date: 2013-07-02 00:00:00.000000000 Z
+date: 2013-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -92,6 +92,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pony
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Will automatically monitor DynamoDB tables and scale them based on rules.
 email: developers@getinvisiblehand.com
 executables:
@@ -108,14 +124,16 @@ files:
 - Rakefile
 - aws.sample.yml
 - bin/dynamo-autoscale
+- config/dynamo-autoscale-test.yml
 - config/environment/common.rb
 - config/environment/console.rb
 - config/environment/test.rb
-- config/logger.yml
 - config/services/aws.rb
 - config/services/logger.rb
+- config/services/signals.rb
 - data/.gitkeep
 - dynamo-autoscale.gemspec
+- dynamo-autoscale.sample.yml
 - lib/dynamo-autoscale.rb
 - lib/dynamo-autoscale/actioner.rb
 - lib/dynamo-autoscale/cw_poller.rb
@@ -130,6 +148,7 @@ files:
 - lib/dynamo-autoscale/pretty_formatter.rb
 - lib/dynamo-autoscale/rule.rb
 - lib/dynamo-autoscale/rule_set.rb
+- lib/dynamo-autoscale/scale_report.rb
 - lib/dynamo-autoscale/table_tracker.rb
 - lib/dynamo-autoscale/unit_cost.rb
 - lib/dynamo-autoscale/version.rb
@@ -151,6 +170,7 @@ files:
 - spec/rule_spec.rb
 - spec/spec_helper.rb
 - spec/table_tracker_spec.rb
+- templates/scale_report_email.erb
 homepage: http://github.com/invisiblehand/dynamo-autoscale
 licenses:
 - MIT

data/config/logger.yml

@@ -1,11 +0,0 @@
-test:
-  :level: INFO
-  :sync:  false
-
-development:
-  :level: INFO
-  :sync:  true
-
-production:
-  :level: INFO
-  :sync:  true