graphiterb 0.2.6 → 0.2.7

data/VERSION

@@ -1 +1 @@
-0.2.6
+0.2.7

data/graphiterb.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{graphiterb}
-  s.version = "0.2.6"
+  s.version = "0.2.7"
 
   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-08-18}
+  s.date = %q{2010-09-10}
   s.description = %q{Uses http://github.com/mrflip/configliere and http://graphite.wikidot.com}
   s.email = %q{info@infochimps.org}
   s.extra_rdoc_files = [
@@ -32,7 +32,9 @@ Gem::Specification.new do |s|
      "examples/toy.rb",
      "graphiterb.gemspec",
      "lib/graphiterb.rb",
+     "lib/graphiterb/accumulator.rb",
      "lib/graphiterb/monitors.rb",
+     "lib/graphiterb/monitors/accumulations_consumer.rb",
      "lib/graphiterb/monitors/directory_tree.rb",
      "lib/graphiterb/monitors/disk_space.rb",
      "lib/graphiterb/monitors/system.rb",

data/lib/graphiterb.rb

@@ -3,11 +3,12 @@ require 'graphiterb/utils'
 module Graphiterb
   autoload :Monitors, 'graphiterb/monitors'
   autoload :Sender,   'graphiterb/sender'
+  autoload :Accumulator, 'graphiterb/accumulator'
 end
 
 Settings.use :define, :config_file
 
-Settings.define :log,            :default => STDOUT,      :description => "Log output for Graphiterb"
+Settings.define :log,                                     :description => "Log output for Graphiterb"
 Settings.define :carbon_server,  :default => 'localhost', :description => "Host address for carbon database server", :required => true
 Settings.define :carbon_port,    :default => '2003',      :description => "Port for carbon database server", :required => true
 Settings.define :update_delay,   :default => 30,          :description => "How long to wait between updates. Must be faster than the value in the graphite/conf/storage-schemas", :required => true, :type => Integer

data/lib/graphiterb/accumulator.rb

@@ -0,0 +1,81 @@
+module Graphiterb
+
+  # An accumulator that uses a Redis database as a fast store.
+  #
+  #   a = Accumulator.new
+  #   a.increment('my_value')
+  #
+  # It's assumed that the Redis database is local and on the default
+  # port, but pass in :host or :port (or any other options Redis.new
+  # understands) to change this.
+  #
+  # By default incrementing 'my_value' which actually increment a
+  # counter stored at the key
+  # 'graphiterb_accumulator:my_value:HOSTNAME'.
+  #
+  # See Graphiterb::Monitors::AccumulationsConsumer for the periodic
+  # monitor that will consume the accumulated counts.
+  class Accumulator
+
+    # The Redis database.
+    attr_accessor :redis
+
+    # The Redis namespace used for the accumulators.
+    attr_accessor :accumulators
+
+    # The top-level scope under which to accumulate.
+    attr_accessor :main_scope
+
+    # Provides methods for finding out about the node this code is
+    # running on.
+    include Graphiterb::Utils::SystemInfo
+
+    # Initialize a new Accumulator.
+    #
+    # Takes the same options as Redis.new.
+    #
+    # @param [String] main_scope
+    # @param [Hash] options
+    def initialize main_scope, options={}
+      require 'redis'
+      require 'redis-namespace'
+      @main_scope   = main_scope
+      @redis        = Redis.new(options)
+      @accumulators = Redis::Namespace.new('graphiterb_accumulators', :redis => redis)
+    end
+
+    # Increment the Graphite target +args+ by the given +amount+.
+    #
+    # The target will be automatically scoped, see Accumulator#scope.
+    #
+    # @param [Integer] amount      
+    # @param [Array<String>, String] args
+    def increment_by amount, *args
+      accumulators.incrby(scope(*args), amount)
+    end
+    
+    # Increment the Graphite target +args+.
+    #
+    # @param [Array<String>, String] args
+    def increment *args
+      accumulators.incr(scope(*args))
+    end
+
+    # Return the scoped accumulator name.
+    #
+    # This will be a valid string target that can be passed directly
+    # to Graphite.
+    #
+    #   a = Accumulator.new('scrapers')
+    #   a.scope('foo.bar', 'baz')
+    #   #=> 'scrapers.foo.bar.baz.ip-120.112.4.383'
+    #
+    # @param [Array<String>, String] args
+    # @return [String]
+    def scope *args
+      [main_scope, args, hostname].flatten.compact.map(&:to_s).join('.')
+    end
+
+  end
+end
+

data/lib/graphiterb/monitors.rb

@@ -4,6 +4,7 @@ module Graphiterb
     autoload :DiskSpace,      'graphiterb/monitors/disk_space'
     autoload :System,         'graphiterb/monitors/system'
     autoload :DirectoryTree,  'graphiterb/monitors/directory_tree'
+    autoload :AccumulationsConsumer, 'graphiterb/monitors/accumulations_consumer'
 
     # Accepts a lightweight call every iteration.
     #

data/lib/graphiterb/monitors/accumulations_consumer.rb

@@ -0,0 +1,51 @@
+module Graphiterb
+  module Monitors
+
+    # A monitor which consumes counts accumulated in a Redis store by
+    # Graphiterb::Accumulator.
+    class AccumulationsConsumer < Graphiterb::Monitors::PeriodicMonitor
+
+      # The Redis database.
+      attr_accessor :redis
+
+      # The Redis namespace used for the accumulators.
+      attr_accessor :accumulators
+
+      # A regular expression that must match the Graphite target
+      # (defaults to always matching).
+      attr_accessor :regexp
+
+      # Instantiate a new AccumulationsConsumer.
+      #
+      # Options are passed to Redis.new as well as
+      # Graphiterb::Monitors::PeriodicMonitor.
+      #
+      # Include the :regexp option if you want this monitor to only
+      # consume keys corresponding to Graphite targets which match the
+      # regexp.  This is useful for having multiple
+      # AccumulationsConsumer monitors running with different
+      # frequencies tracking different Graphite target families.
+      def initialize options={}
+        require 'redis'
+        require 'redis-namespace'
+        @redis        = Redis.new(options)
+        @accumulators = Redis::Namespace.new('graphiterb_accumulators', :redis => @redis)
+        @regexp       = options[:regexp] || /.*/
+        super('fake_scope', options)
+      end
+
+      # Uses Redis' +getset+ call to retrieve total accumulated counts
+      # from Redis and reset them to 0 atomically.
+      def get_metrics metrics, since
+        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
+          metrics << [target, rate] # no need to scope as targets are pre-scoped
+        end
+      end
+      
+    end
+  end
+end
+

data/lib/graphiterb/sender.rb

@@ -34,6 +34,7 @@ module Graphiterb
     end
 
     def send *metrics
+      return if metrics.blank?
       now = timestamp
       safely do
         message = metrics.map{|metric, val, ts| [metric, val, (ts||now)].join(" ") }.join("\n")+"\n"

data/lib/graphiterb/utils/log.rb

@@ -4,10 +4,8 @@ module Graphiterb
 
   class << self; attr_accessor :log end
 
-  # Create a Logger and point it at Graphiterb::LOG_FILE_DESTINATION which is
-  # set in ~/.imwrc and defaults to STDERR.
   def self.instantiate_logger!
-    Graphiterb.log ||= Logger.new(Settings[:log])
+    Graphiterb.log ||= Logger.new(Settings[:log] || STDOUT)
     Graphiterb.log.datetime_format = "%Y%m%d-%H:%M:%S "
     Graphiterb.log.level           = Logger::INFO
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: graphiterb
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 2
-  - 6
-  version: 0.2.6
+  - 7
+  version: 0.2.7
 platform: ruby
 authors: 
 - Philip (flip) Kromer (@mrflip)
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-18 00:00:00 -05:00
+date: 2010-09-10 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -87,7 +87,9 @@ files:
 - examples/toy.rb
 - graphiterb.gemspec
 - lib/graphiterb.rb
+- lib/graphiterb/accumulator.rb
 - lib/graphiterb/monitors.rb
+- lib/graphiterb/monitors/accumulations_consumer.rb
 - lib/graphiterb/monitors/directory_tree.rb
 - lib/graphiterb/monitors/disk_space.rb
 - lib/graphiterb/monitors/system.rb