dynamo-autoscale 0.2.8 → 0.2.9

data/CHANGELOG

@@ -1,3 +1,8 @@
+v0.2.9
+
+- Fixed a problem where scale events weren't being showed in the scale report
+	emails.
+
 v0.2.8
 
 - It seems that CloudWatch only has new data every 5 minutes. CloudWatch polling

data/README.md

@@ -425,10 +425,11 @@ Report Issues/Feature requests on
 
  * Fork the project.
  * Make your feature addition or bug fix.
- * Add tests for it. This is important so we don't break it in a
-   future version unintentionally.
- * Commit, do not modify the rakefile, version, or history.
-   (if you want to have your own version, that is fine but bump version in a commit by itself so it can be ignored when we pull)
+ * Add tests for it. This is important so we don't break it in a future version
+ 	 unintentionally.
+ * Commit, do not modify the rakefile, version, or history.  (if you want to
+ 	 have your own version, that is fine but bump version in a commit by itself so
+ 	 it can be ignored when we pull)
  * Send a pull request. Bonus points for topic branches.
 
 ### Copyright

data/lib/dynamo-autoscale/actioner.rb

@@ -134,7 +134,10 @@ module DynamoAutoscale
 
       # Because upscales are not limited, we don't need to queue this operation.
       if result = scale(metric, to)
-        table.scale_events[now] = { metric => to }
+        table.scale_events[now] = {
+          "#{metric}_to".to_sym => to,
+          "#{metric}_from".to_sym => from,
+        }
 
         @provisioned[metric][now] = to
         @upscales += 1
@@ -163,11 +166,11 @@ module DynamoAutoscale
           "#{from ? from.round(2) : "Unknown"} -> #{to.round(2)}"
       end
 
-      queue_operation! metric, to
+      queue_operation! metric, from, to
     end
 
-    def queue_operation! metric, value
-      @pending[metric] = value
+    def queue_operation! metric, from, to
+      @pending[metric] = [from, to]
       try_flush!
     end
 
@@ -192,16 +195,18 @@ module DynamoAutoscale
       now = Time.now.utc
 
       if @pending[:writes] and @pending[:reads]
-        wvalue = @pending[:writes]
-        rvalue = @pending[:reads]
+        wfrom, wto = @pending[:writes]
+        rfrom, rto = @pending[:reads]
 
-        if result = scale_both(rvalue, wvalue)
-          @provisioned[:writes][now] = wvalue
-          @provisioned[:reads][now] = rvalue
+        if result = scale_both(rto, wto)
+          @provisioned[:writes][now] = wto
+          @provisioned[:reads][now] = rto
 
           table.scale_events[now] = {
-            writes: wvalue,
-            reads: rvalue,
+            writes_from: wfrom,
+            writes_to:   wto,
+            reads_from:  rfrom,
+            reads_to:    rto,
           }
 
           @pending[:writes] = nil
@@ -212,24 +217,24 @@ module DynamoAutoscale
           logger.error "[flush] Failed to flush a read and write event."
         end
       elsif @pending[:writes]
-        value = @pending[:writes]
+        from, to = @pending[:writes]
 
-        if result = scale(:writes, value)
-          @provisioned[:writes][now] = value
-          table.scale_events[now] = { writes: value }
-          @pending[:writes] = nil
+        if result = scale(:writes, to)
+          @provisioned[:writes][now] = to
+          table.scale_events[now]    = { writes_from: from, writes_to: to }
+          @pending[:writes]          = nil
 
           logger.info "[flush] Flushed a write event."
         else
           logger.error "[flush] Failed to flush a write event."
         end
       elsif @pending[:reads]
-        value = @pending[:reads]
+        from, to = @pending[:reads]
 
-        if result = scale(:reads, value)
-          @provisioned[:reads][now] = value
-          table.scale_events[now] = { reads: value }
-          @pending[:reads] = nil
+        if result = scale(:reads, to)
+          @provisioned[:reads][now] = to
+          table.scale_events[now]   = { reads_from: from, reads_to: to }
+          @pending[:reads]          = nil
 
           logger.info "[flush] Flushed a read event."
         else

data/lib/dynamo-autoscale/scale_report.rb

@@ -16,12 +16,16 @@ module DynamoAutoscale
       end
     end
 
+    def email_content
+      @erb.result(binding)
+    end
+
     def send
       return false unless @enabled
 
       result = Pony.mail({
         subject: "Scale event for #{@table.name}",
-        body:    @erb.result(binding),
+        body:    email_content,
       })
 
       if result

data/lib/dynamo-autoscale/version.rb

@@ -1,3 +1,3 @@
 module DynamoAutoscale
-  VERSION = '0.2.8'
+  VERSION = '0.2.9'
 end

data/templates/scale_report_email.erb

@@ -1,3 +1,9 @@
+Last 5 scale events:
+
+<% @table.scale_events.reverse_each.take(5).each do |time, scale_event| %>
+  <%= time.iso8601 %>: <%= scale_event %>
+<% end %>
+
 Last 5 triggered rules:
 
 <% @table.triggered_rules.reverse_each.take(5).each do |time, rule| %>
@@ -10,8 +16,3 @@ Last 20 data points:
   <%= 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.2.8
+  version: 0.2.9
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ autorequire:
 bindir:
 - bin
 cert_chain: []
-date: 2013-07-04 00:00:00.000000000 Z
+date: 2013-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk