memcached_graphite 0.0.1 → 0.0.2

data/bin/memcached_graphite

@@ -4,7 +4,7 @@ require 'pp'
 require 'logger'
 require 'optparse'
 require 'rubygems'
-require 'dalli'
+require 'memcache_do'
 require 'graphite'
 require 'memcached_graphite'
 
@@ -22,19 +22,24 @@ def format_hostname ( hostname, options )
   options[:reverse_hostname] ? hn.reverse : hn.to_s
 end
 
+def get_stats_slabs (host, port)
+  Hash[MemcacheDo.exec('stats slabs',host,port).gsub(/^STAT (\d+):/,'STAT slab_\1.').scan(/^STAT (.*?) (.*)\r$/)]
+end
+
+def get_stats (host, port)
+  Hash[MemcacheDo.exec('stats',host,port).scan(/^STAT (.*?) (.*)\r$/)]
+end
+
 #format the stats in a way that graphite expects
-def format_stats ( allstats, options )
-  carbon_prefix = options[:carbon_prefix]
+def format_stats ( server_stats, host = 'localhost', port = 11211, options = {} )
   stats = {}
-  allstats.each do |server,server_stats|
-    server_split = server.split(':')
-    server_piece = sprintf("%s.port_%s", 
-                           format_hostname(server_split[0], options),
-                           server_split[1] || 11211 )
+  carbon_prefix = options[:carbon_prefix]
+  server_piece = sprintf("%s.port_%s", 
+                         format_hostname(host, options),
+                         port)
 
-    prefix = [carbon_prefix, server_piece].join('.')
-    stats.merge! server_stats.prefix_keys("#{prefix}.")
-  end
+  prefix = [carbon_prefix, server_piece].join('.')
+  stats.merge! server_stats.prefix_keys("#{prefix}.")
 
 # only return numeric values
 # & convert to floats
@@ -82,9 +87,19 @@ opts.on("-h", "--help", "help" ) do |v|
 end
 opts.parse!
 
-Dalli.logger = logger
-dc = Dalli::Client.new options[:memcached_servers]
-g  = Graphite::Logger.new(options[:carbon_server], logger)
+g = Graphite::Logger.new(options[:carbon_server], logger)
+
+options[:memcached_servers].each do |server|
+  stats = {}
+  host,port = server.split(':')  
+  host ||= 'localhost'
+  port ||= 11211
+
+  stats = get_stats(host,port)
+  stats.merge! get_stats_slabs(host,port)
+  stats = format_stats(stats, host, port, options)
+
+  g.log(Time.now.to_i, stats)
+end
+
 
-stats = format_stats(dc.stats, options)
-g.log(Time.now.to_i, stats)

data/lib/memcached_graphite/version.rb

@@ -1,3 +1,3 @@
 module MemcachedGraphite
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/memcached_graphite.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
 
   # specify any dependencies here; for example:
   # s.add_development_dependency "rspec"
-  s.add_runtime_dependency "dalli"
   s.add_runtime_dependency "graphite"
+  s.add_runtime_dependency "memcache_do"
   s.rubygems_version = '1.3.5'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: memcached_graphite
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Aaron Brown
@@ -15,10 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-31 00:00:00 Z
+date: 2012-11-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: dalli
+  name: graphite
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -32,7 +32,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: graphite
+  name: memcache_do
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false