mongodb-graphite 0.1.4 → 0.1.5

data/bin/mongodb-graphite

@@ -4,15 +4,15 @@ require 'mongo'
 require 'graphite'
 require 'peach'
 
-graphite_server = ARGV[0]
-
+graphite_server = ARGV[1]
+prefix_common = ARGV[0]+"."
+puts graphite_server
 g = Graphite::Logger.new(graphite_server)
 
 to_ignore =[ "set", "repl", "time","qr|qw","ar|aw","conn"]
 to_convert = ["mapped","vsize","res","netIn","netOut"]
 output_average = ["mapped","vsize","res","locked","idxmiss"]
 output_sum = ["netIn", "netOut","insert","query","update","delete","getmore","command","flushes","faults"]
-prefix_common = "criteo.mongodb."
 
 def convert(s)
   mul = case s[-1] 
@@ -41,7 +41,7 @@ end
 
 
 
-def treat_replicaset(g,to_ignore,to_convert, output_average, output_sum ,prefix_common,host,port)
+def treat_replicaset(g,to_ignore,to_convert, output_average, output_sum ,prefix_common,host,port, shard_name)
   #puts "shard : ", host,port
   connHost = Mongo::Connection.new(host, port)
   slaves = Array.new
@@ -58,7 +58,7 @@ def treat_replicaset(g,to_ignore,to_convert, output_average, output_sum ,prefix_
     values= values.delete_if {|line| line.start_with?('insert')}.map { |line| line.gsub('*','').split}
     values = values.transpose
 
-    prefix = prefix_common + host +"."+port+"."
+    prefix = prefix_common +shard_name+"."+ host +"."+port+"."
     headers = headers.map { |key| prefix+key }
     metrics = Hash[headers.zip(values)]
     to_ignore.each { |key| metrics.delete(prefix + key) }
@@ -80,13 +80,14 @@ begin
   shards = Array.new
   puts @conn["config"]["shards"].find().each { |shard|  shards << shard["host"] }
   shards.each { |s|
+    puts s
     Process.fork do
     host,port =  s.split(/,|\//)[1].split(':')
-    treat_replicaset(g,to_ignore,to_convert, output_average, output_sum ,prefix_common,host,port)
+    treat_replicaset(g,to_ignore,to_convert, output_average, output_sum ,prefix_common,host,port, s.split(/,|\//)[0])
     end
   }
 rescue
   puts "not mongos"
-  treat_replicaset(g,to_ignore,to_convert, output_average, output_sum ,prefix_common,hostt,portt)
+  treat_replicaset(g,to_ignore,to_convert, output_average, output_sum ,prefix_common,hostt,portt, "direct")
 end
-Process.wait
+Process.wait

data/mongodb-graphite.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "mongodb-graphite"
-  s.version     = '0.1.4'
+  s.version     = '0.1.5'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Grégoire Seux"]
   s.email       = ["g.seux@criteo.com"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mongodb-graphite
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - "Gr\xC3\xA9goire Seux"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-09 00:00:00 Z
+date: 2012-03-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mongo