graphiterb 0.2.9 → 0.2.10

data/VERSION

@@ -1 +1 @@
-0.2.9
+0.2.10

data/graphiterb.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{graphiterb}
-  s.version = "0.2.9"
+  s.version = "0.2.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Philip (flip) Kromer (@mrflip)"]
-  s.date = %q{2010-09-20}
+  s.date = %q{2010-09-21}
   s.description = %q{Uses http://github.com/mrflip/configliere and http://graphite.wikidot.com}
   s.email = %q{info@infochimps.org}
   s.extra_rdoc_files = [

data/lib/graphiterb/monitors/accumulations_consumer.rb

@@ -12,6 +12,10 @@ module Graphiterb
       # accumulations are stored (defaults to 'graphiterb')
       attr_accessor :namespace
 
+      # The key used to store the last report time.  Will live inside
+      # the namespace.
+      attr_accessor :report_timestamp_key
+
       # The Redis namespace used for the accumulators.
       attr_accessor :accumulators
 
@@ -44,18 +48,38 @@ module Graphiterb
         @namespace    = options[:namespace] || 'graphiterb'
         @accumulators = Redis::Namespace.new(namespace, :redis => @redis)
         @regexp       = options[:regexp] || /.*/
+        @report_timestamp_key = options[:report_timestamp_key] || '_last_report_timestamp_'
         super('fake_scope', options) # FIXME shouldn't have to use a fake scope
       end
 
       # Uses Redis' +getset+ call to retrieve total accumulated counts
       # from Redis and reset them to 0 atomically.
       def get_metrics metrics, since
+        # compute the length of the interval between the last time
+        # this monitor ran and now
+        last_report_timestamp = accumulators.get(report_timestamp_key).to_i
+        now                   = Time.now.to_i
+        interval              = now - last_report_timestamp
+
         accumulators.keys.each do |target|
-          next unless regexp =~ target
-          current_count = accumulators.getset(target, 0)  rescue 0.0
-          rate          = current_count.to_f / since.to_f rescue 0.0
+          next unless regexp && regexp =~ target
+          current_count = accumulators.getset(target, 0) rescue 0.0
+
+          # if we don't know when the last time we ran was, we bail,
+          # resetting the accumulated count to 0 in preparation for
+          # the next iteration
+          #
+          # we lost a data point this way (say the monitor went down
+          # for a while and we brought it back up) but we also don't
+          # ruin the scale of the graph...
+          next if last_report_timestamp == 0
+          
+          rate          = current_count.to_f / interval.to_f rescue 0.0
           metrics << [target, rate] # no need to scope as targets are pre-scoped
         end
+
+        # store the timestamp for this run for the next
+        accumulators.set(report_timestamp_key, now)
       end
       
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: graphiterb
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: false
   segments: 
   - 0
   - 2
-  - 9
-  version: 0.2.9
+  - 10
+  version: 0.2.10
 platform: ruby
 authors: 
 - Philip (flip) Kromer (@mrflip)
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-20 00:00:00 -05:00
+date: 2010-09-21 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency