memcache2graphite 1.0.1 → 1.1.0

data/bin/memcache2graphite

@@ -16,10 +16,10 @@ graphite = Graphite.new({
 memcache_conf = conf["memcache"]
 options = {}
 if memcache_conf["username"]
-  options[:username] = bucket["username"]
+  options[:username] = memcache_conf["username"]
 end
 if memcache_conf["password"]
-  options[:password] = bucket["password"]
+  options[:password] = memcache_conf["password"]
 end
 memcache = Dalli::Client.new("#{memcache_conf.fetch("host","localhost")}:#{memcache_conf.fetch("port",11211)}", options)
 
@@ -40,9 +40,10 @@ def collect(conf, memcache, graphite, state)
   message = {}
   memcache.stats.each do |node, metrics|
     metrics.select{|metric, value| metrics_filter.has_key?(metric)}.each do |metric, value|
-      to_send = aggregate(metric, value, metrics_filter[metric], state)
+      type = metrics_filter[metric]
+      to_send = aggregate(metric, value, type, state)
       if to_send
-        message["#{conf["graphite"]["root-path"]}.#{metrics_filter[metric]}.#{metric}"] = value
+        message["#{conf["graphite"]["root-path"].gsub(/<type>/,type)}.#{metrics_filter[metric]}.#{metric}"] = value
       end
     end
   end

data/conf.yml

@@ -1,6 +1,6 @@
 freq : 1
 graphite :
-  root-path : toto.memcache.my_bucket.debian-sf
+  root-path : toto.memcache.my_bucket.<type>.debian-sf
   host : localhost
   port : 3333
   type : udp 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: memcache2graphite
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors: