vector 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 541f21bb927907e0a40dc80e6383fafadbfed41b
-  data.tar.gz: 608fb28e14b4f8b6e35ae093ef30d02346b910ca
+  metadata.gz: 07a60786d7b8111e9a6d00a5a316477e385e5066
+  data.tar.gz: 355b002c3f11ae3ac4eb6dc440c06f2ac5a80730
 SHA512:
-  metadata.gz: e54156a992bdec104878d7be100673797e153198d3f9888307df09966421ec7c63833529745a4c61cba22c905f9df8b7f8c9aa56bd1900c510b12ebe97a6b30e
-  data.tar.gz: 272cdb7eba79cdc60425fb2c14dbbb793911696b62c401e695f97beeacd2f48b198e1b25e48e082013bdd747578378b532f737d8e04f929be76892de760fddfb
+  metadata.gz: 9902bc75ba6da80cf50325d6ea68e0b1ce0be41ffcbd83de825e3690bcd7212a38ca52e8153016c31c4110f48536b98a7812b9ccb75dd947d77b593c52839581
+  data.tar.gz: d69df377f6ed4eb40bf47b805c6392c5dd1a6cdbadfd395dc694da6fa9d37bcc454bbf5f12aaf0da08bfb146118b7db31539bdad9ad9317d00661a4f695ae566

data/lib/vector.rb

@@ -46,7 +46,11 @@ module Vector
 
     def hlog(string)
       return unless @@enabled
-      puts "[#{@components.join ','}] #{string}"
+      puts "[#{hlog_ctx_string}] #{string}"
+    end
+
+    def hlog_ctx_string
+      @components.join ','
     end
   end
 end

data/lib/vector/functions/flexible_down_scaling.rb

@@ -48,7 +48,7 @@ module Vector
                 if policy.adjustment_type == "ChangeInCapacity" &&
                    ps_check_procs &&
                    ps_check_procs.any? {|ps_check_proc|
-                     ps_check_proc.call(group.desired_capacity + policy.scaling_adjustment) }
+                     ps_check_proc.call(group.desired_capacity + policy.scaling_adjustment, self) }
                   hlog("Predictive scaleup would trigger a scaleup if group were shrunk")
                   next
                 end
@@ -130,9 +130,10 @@ module Vector
                     hlog("Not all datapoints are beneath the variable threshold #{(threshold * 100).to_i}: #{stats.datapoints}")
                     next
                   end
+
+                  hlog("Variable threshold: #{(threshold * 100).to_i}, #{group.desired_capacity} nodes")
                 end
 
-                outside_cooldown = outside_cooldown_period(group)
                 unless outside_cooldown_period(group)
                   hlog("Group is not outside the specified cooldown periods")
                   next

data/lib/vector/functions/predictive_scaling.rb

@@ -75,15 +75,29 @@ module Vector
 
                         # now take the past total load and divide it by the
                         # current number of instances to get the predicted value
-                        check_proc = Proc.new do |num_nodes|
+
+                        # (we capture our original log context here in order to display
+                        # the source of these checks later when this proc is called by
+                        # scaledown stuff).
+                        orig_ctx = hlog_ctx_string
+                        check_proc = Proc.new do |num_nodes, logger|
                           predicted_value = past_load.to_f / num_nodes
-                          hlog "Predicted #{alarm.metric.name}: #{predicted_value} (#{num_nodes} nodes)"
+
+                          log_str = "Predicted #{alarm.metric.name}: #{predicted_value} (#{num_nodes} nodes)"
+
+                          # Tack on the original context if we're in a different logger
+                          # (for the case where this is called during scaledown checks).
+                          if orig_ctx != logger.hlog_ctx_string
+                            log_str += " (from #{orig_ctx})"
+                          end
+
+                          logger.hlog log_str
 
                           check_alarm_threshold(alarm, predicted_value)
                         end
                         result[:check_procs] << check_proc
 
-                        if check_proc.call(now_num)
+                        if check_proc.call(now_num, self)
                           if @dry_run
                             hlog "Executing policy (DRY RUN)"
                           else

data/lib/vector/version.rb

@@ -1,3 +1,3 @@
 module Vector
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vector
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Zach Wily
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-13 00:00:00.000000000 Z
+date: 2015-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk