mongodb-graphite-agent 0.0.9 → 0.1.0

data/bin/mongodb-graphite-agent.rb

@@ -4,14 +4,12 @@ $:.unshift File.expand_path("#{File.dirname(__FILE__)}/../lib")
 
 require 'trollop'
 require 'mongodb/graphite/agent'
-require 'mongodb/graphite/agent/graphite_writer'
 
 opts = Trollop::options do
   opt :mongodb_username, "MongoDB username", :type => :string
   opt :mongodb_host, "MongoDB host", :type => :string, :default => "localhost"
   opt :mongodb_post, "MongoDB host", :type => :int, :default => 27017
   opt :mongodb_password, "MongoDB password", :type => :string
-  opt :mongodb_replicaset, "Set this flag if the host is part of a MongoDB replicaSet", :type => :boolean, :default => false
   opt :graphite_host, "Graphite host", :type => :string
   opt :graphite_port, "Graphite port", :type => :string
   opt :graphite_metrics_prefix, "Graphite metrics prefix", :type => :string, :default => Socket.gethostname

data/lib/mongodb/graphite/agent.rb

@@ -8,6 +8,7 @@ require 'awesome_print'
 require 'time_difference'
 require 'mongodb/graphite/agent/utils'
 require 'mongodb/graphite/agent/op_counters_sample'
+require 'mongodb/graphite/agent/mongo_cient_extensions'
 
 module Mongodb
   module Graphite
@@ -29,9 +30,11 @@ module Mongodb
             k.match('^connection|^network\.|^cursors|^mem\.mapped|^indexCounters|^repl.oplog')
           }
 
-          unless (@opts[:mongodb_replicaset].blank?)
+          if (connection.is_replicaset?)
+            puts "ReplicaSet detected" if @opts[:verbose]
             opcounters_per_second_metric_hash = calculate_opcounters_per_second server_status_result["opcountersRepl"]
           else
+            puts "Single host mode detected" if @opts[:verbose]
             opcounters_per_second_metric_hash = calculate_opcounters_per_second server_status_result["opcounters"]
           end
 

data/lib/mongodb/graphite/agent/mongo_cient_extensions.rb

@@ -0,0 +1,15 @@
+module Mongo
+
+  class MongoClient
+    def is_replicaset?
+      begin
+        cmd = BSON::OrderedHash.new
+        cmd["replSetGetStatus"] = 1
+        result = self.db("admin").command(cmd)
+        return !result["set"].blank?
+      rescue Mongo::OperationFailure
+        return false
+      end
+    end
+  end
+end

data/lib/mongodb/graphite/agent/version.rb

@@ -1,7 +1,7 @@
 module Mongodb
   module Graphite
     module Agent
-        VERSION = "0.0.9"
+        VERSION = "0.1.0"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongodb-graphite-agent
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-12 00:00:00.000000000 Z
+date: 2013-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -171,6 +171,7 @@ files:
 - bin/mongodb-graphite-agent.rb
 - lib/mongodb/graphite/agent.rb
 - lib/mongodb/graphite/agent/graphite_writer.rb
+- lib/mongodb/graphite/agent/mongo_cient_extensions.rb
 - lib/mongodb/graphite/agent/op_counters_sample.rb
 - lib/mongodb/graphite/agent/utils.rb
 - lib/mongodb/graphite/agent/version.rb
@@ -190,7 +191,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2166291128576152408
+      hash: 4101892219957888543
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -199,7 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2166291128576152408
+      hash: 4101892219957888543
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25