mongodb-graphite-agent 0.0.8 → 0.0.9

data/.gitignore

@@ -1,20 +1,20 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-.idea/*
-lastsample
-*.iml
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
+.idea/*
+lastsample
+*.iml

data/Gemfile

@@ -1,3 +1,3 @@
-source 'https://rubygems.org'
-
+source 'https://rubygems.org'
+
 gemspec

data/bin/mongodb-graphite-agent.rb

@@ -1,30 +1,30 @@
-#!/usr/bin/env ruby
-
-$:.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 :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
-  opt :dry_run, "Dry run", :type => :boolean, :default => false
-  opt :verbose, "Verbose", :type => :boolean, :default => false
-end
-
-if opts[:dry_run]
-  puts "\n\nWARNING!!! This is a dry run\n\n\n"
-  sleep 1
-end
-
-Trollop::die :mongodb_host, "must be specified" unless opts[:mongodb_host]
-Trollop::die :graphite_host, "(or --dry-run) must be specified " if (opts[:graphite_host].blank? and opts[:dry_run].blank?)
-
-runner = Mongodb::Graphite::Agent::Runner.new(opts)
-runner.run
+#!/usr/bin/env ruby
+
+$:.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
+  opt :dry_run, "Dry run", :type => :boolean, :default => false
+  opt :verbose, "Verbose", :type => :boolean, :default => false
+end
+
+if opts[:dry_run]
+  puts "\n\nWARNING!!! This is a dry run\n\n\n"
+  sleep 1
+end
+
+Trollop::die :graphite_host, "(or --dry-run) must be specified" if (opts[:graphite_host].blank? and opts[:dry_run].blank?)
+
+runner = Mongodb::Graphite::Agent::Runner.new(opts)
+runner.run

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

@@ -1,21 +1,21 @@
-module Mongodb
-  module Graphite
-    module Agent
-      class GraphiteWriter
-        def initialize(opts)
-          @graphite = ::Graphite.new({:host => opts[:host], :port => opts[:port]})
-          @opts = opts
-        end
-
-        def write(metric_hash)
-          @metric_hash_with_hostname = Hash[metric_hash.map { |k,v| ["#{@opts[:metrics_prefix]}.#{k}", v]}]
-          if @opts[:verbose]
-            puts "Sending data to graphite..."
-            ap @metric_hash_with_hostname
-          end
-          @graphite.send_metrics @metric_hash_with_hostname
-        end
-      end
-    end
-  end
-end
+module Mongodb
+  module Graphite
+    module Agent
+      class GraphiteWriter
+        def initialize(opts)
+          @graphite = ::Graphite.new({:host => opts[:host], :port => opts[:port]})
+          @opts = opts
+        end
+
+        def write(metric_hash)
+          @metric_hash_with_hostname = Hash[metric_hash.map { |k,v| ["#{@opts[:metrics_prefix]}.#{k}", v]}]
+          if @opts[:verbose]
+            puts "Sending data to graphite..."
+            ap @metric_hash_with_hostname
+          end
+          @graphite.send_metrics @metric_hash_with_hostname
+        end
+      end
+    end
+  end
+end

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

@@ -1,26 +1,26 @@
-require 'date'
-
-module Mongodb
-  module Graphite
-    module Agent
-
-      class OpCountersSample
-        attr_reader :values, :sample_time
-
-        def initialize(values, sample_time = DateTime.now.to_s)
-          @values = values
-          @sample_time = sample_time
-        end
-
-        def marshal_dump
-          [@sample_time, @values]
-        end
-
-        def marshal_load array
-          @sample_time, @values = array
-        end
-
-      end
-    end
-  end
+require 'date'
+
+module Mongodb
+  module Graphite
+    module Agent
+
+      class OpCountersSample
+        attr_reader :values, :sample_time
+
+        def initialize(values, sample_time = DateTime.now.to_s)
+          @values = values
+          @sample_time = sample_time
+        end
+
+        def marshal_dump
+          [@sample_time, @values]
+        end
+
+        def marshal_load array
+          @sample_time, @values = array
+        end
+
+      end
+    end
+  end
 end

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

@@ -1,29 +1,29 @@
-module Mongodb
-  module Graphite
-    module Agent
-
-      module Utils
-        def self.merge_all
-          self.inject({}) { |h1, h2|
-            h1.merge! h2
-          }
-        end
-
-        def self.json_descent(pre, json)
-          json.map do |k, v|
-            key = pre + [k]
-            if v.is_a? BSON::OrderedHash
-              json_descent(key, v)
-            else
-              {key.join('.') => v}
-            end
-          end
-        end
-
-        def self.to_hash(s)
-          json_descent([], s).flatten.reduce Hash.new, :merge
-        end
-      end
-    end
-  end
-end
+module Mongodb
+  module Graphite
+    module Agent
+
+      module Utils
+        def self.merge_all
+          self.inject({}) { |h1, h2|
+            h1.merge! h2
+          }
+        end
+
+        def self.json_descent(pre, json)
+          json.map do |k, v|
+            key = pre + [k]
+            if v.is_a? BSON::OrderedHash
+              json_descent(key, v)
+            else
+              {key.join('.') => v}
+            end
+          end
+        end
+
+        def self.to_hash(s)
+          json_descent([], s).flatten.reduce Hash.new, :merge
+        end
+      end
+    end
+  end
+end

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

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

data/lib/mongodb/graphite/agent.rb

@@ -1,82 +1,85 @@
-require 'rubygems'
-require 'bundler/setup'
-require 'mongo'
-require 'simple-graphite'
-require 'bson'
-require 'socket'
-require 'awesome_print'
-require 'time_difference'
-require 'mongodb/graphite/agent/utils'
-require 'mongodb/graphite/agent/op_counters_sample'
-
-module Mongodb
-  module Graphite
-    module Agent
-      class Runner
-
-        def initialize(opts)
-          @opts = opts
-        end
-
-        def run
-          connection = Mongo::MongoClient.new(@opts.mongodb_host, @opts.mongodb_port, :slave_ok => true)
-          unless (@opts[:mongodb_username].blank? && @opts[:mongodb_password].blank?)
-            connection["admin"].authenticate(@opts.mongodb_username, @opts.mongodb_password)
-          end
-
-          server_status_result = connection["local"].command('serverStatus' => 1)
-          metric_hash = Utils.to_hash(server_status_result).select { |k|
-            k.match('^connection|^network\.|^cursors|^mem\.mapped|^indexCounters|^repl.oplog')
-          }
-
-          opcounters_per_second_metric_hash = calculate_opcounters_per_second server_status_result["opcounters"]
-
-          if @opts[:verbose]
-            puts "Calculating metrics..."
-            ap metric_hash
-            ap opcounters_per_second_metric_hash
-          end
-
-
-
-          unless (@opts[:dry_run])
-            graphite_writer = GraphiteWriter.new({:host => @opts[:graphite_host],
-                                                  :port => @opts[:graphite_port],
-                                                  :verbose => @opts[:verbose],
-                                                  :metrics_prefix => @opts[:graphite_metrics_prefix]})
-            graphite_writer.write(metric_hash)
-            graphite_writer.write(opcounters_per_second_metric_hash)
-          end
-        end
-
-        def calculate_opcounters_per_second(opcounters)
-          current_sample = OpCountersSample.new Hash[opcounters]
-          previous_sample = current_sample.dup
-          result = {}
-
-          if File.exist? 'lastsample'
-            File.open('lastsample', 'r') do |file|
-              previous_sample = Marshal.load(file)
-            end
-          end
-
-          delta = TimeDifference.between(Time.parse(current_sample.sample_time), Time.parse(previous_sample.sample_time))
-          puts "Last sample was taken #{delta.in_seconds.round(0)} seconds ago"
-
-          previous_sample.values.keys.sort.each do |k|
-            previous_sample_value = previous_sample.values[k]
-            current_sample_value = current_sample.values[k]
-            value_per_seconds = ((current_sample_value - previous_sample_value) / delta.in_seconds).round(2)
-            result["#{k}_per_seconds"] = value_per_seconds
-          end
-
-          File.open('lastsample', 'w') do |file|
-            Marshal.dump(current_sample, file)
-          end
-
-          result
-        end
-      end
-    end
-  end
+require 'rubygems'
+require 'bundler/setup'
+require 'mongo'
+require 'simple-graphite'
+require 'bson'
+require 'socket'
+require 'awesome_print'
+require 'time_difference'
+require 'mongodb/graphite/agent/utils'
+require 'mongodb/graphite/agent/op_counters_sample'
+
+module Mongodb
+  module Graphite
+    module Agent
+      class Runner
+
+        def initialize(opts)
+          @opts = opts
+        end
+
+        def run
+          connection = Mongo::MongoClient.new(@opts.mongodb_host, @opts.mongodb_port, :slave_ok => true)
+          unless (@opts[:mongodb_username].blank? && @opts[:mongodb_password].blank?)
+            connection["admin"].authenticate(@opts.mongodb_username, @opts.mongodb_password)
+          end
+
+          server_status_result = connection["local"].command('serverStatus' => 1)
+          metric_hash = Utils.to_hash(server_status_result).select { |k|
+            k.match('^connection|^network\.|^cursors|^mem\.mapped|^indexCounters|^repl.oplog')
+          }
+
+          unless (@opts[:mongodb_replicaset].blank?)
+            opcounters_per_second_metric_hash = calculate_opcounters_per_second server_status_result["opcountersRepl"]
+          else
+            opcounters_per_second_metric_hash = calculate_opcounters_per_second server_status_result["opcounters"]
+          end
+
+          if @opts[:verbose]
+            puts "Calculating metrics..."
+            ap metric_hash
+            ap opcounters_per_second_metric_hash
+          end
+
+
+          unless (@opts[:dry_run])
+            graphite_writer = GraphiteWriter.new({:host => @opts[:graphite_host],
+                                                  :port => @opts[:graphite_port],
+                                                  :verbose => @opts[:verbose],
+                                                  :metrics_prefix => @opts[:graphite_metrics_prefix]})
+            graphite_writer.write(metric_hash)
+            graphite_writer.write(opcounters_per_second_metric_hash)
+          end
+        end
+
+        def calculate_opcounters_per_second(opcounters)
+          current_sample = OpCountersSample.new Hash[opcounters]
+          previous_sample = current_sample.dup
+          result = {}
+
+          if File.exist? 'lastsample'
+            File.open('lastsample', 'r') do |file|
+              previous_sample = Marshal.load(file)
+            end
+          end
+
+          delta = TimeDifference.between(Time.parse(current_sample.sample_time), Time.parse(previous_sample.sample_time))
+          puts "Last sample was taken #{delta.in_seconds.round(0)} seconds ago"
+
+          previous_sample.values.keys.sort.each do |k|
+            previous_sample_value = previous_sample.values[k]
+            current_sample_value = current_sample.values[k]
+            value_per_seconds = ((current_sample_value - previous_sample_value) / delta.in_seconds).round(2)
+            result["#{k}_per_seconds"] = value_per_seconds
+          end
+
+          File.open('lastsample', 'w') do |file|
+            Marshal.dump(current_sample, file)
+          end
+
+          result
+        end
+      end
+    end
+  end
 end

data/mongodb-graphite-agent.gemspec

@@ -1,31 +1,31 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'mongodb/graphite/agent/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = "mongodb-graphite-agent"
-  spec.version       = Mongodb::Graphite::Agent::VERSION
-  spec.authors       = ["Michele Cantelli"]
-  spec.email         = ["michele.cantelli@jobrapido.com"]
-  spec.description   = ""
-  spec.summary       = ""
-  spec.homepage      = "https://github.com/emmekappa/mongodb-graphite-agent"
-  spec.license       = "MIT"
-
-  spec.files         = `git ls-files`.split($/)
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
-
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
-
-  spec.add_dependency 'mongo'
-  spec.add_dependency 'simple-graphite'
-  spec.add_dependency 'bson'
-  spec.add_dependency 'bson_ext'
-  spec.add_dependency 'awesome_print'
-  spec.add_dependency 'time_difference'
-  spec.add_dependency 'trollop'
-end
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'mongodb/graphite/agent/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = "mongodb-graphite-agent"
+  spec.version       = Mongodb::Graphite::Agent::VERSION
+  spec.authors       = ["Michele Cantelli"]
+  spec.email         = ["michele.cantelli@jobrapido.com"]
+  spec.description   = ""
+  spec.summary       = ""
+  spec.homepage      = "https://github.com/emmekappa/mongodb-graphite-agent"
+  spec.license       = "MIT"
+
+  spec.files         = `git ls-files`.split($/)
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+
+  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "rake"
+
+  spec.add_dependency 'mongo'
+  spec.add_dependency 'simple-graphite'
+  spec.add_dependency 'bson'
+  spec.add_dependency 'bson_ext'
+  spec.add_dependency 'awesome_print'
+  spec.add_dependency 'time_difference'
+  spec.add_dependency 'trollop'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongodb-graphite-agent
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-04 00:00:00.000000000 Z
+date: 2013-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -188,15 +188,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2166291128576152408
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2166291128576152408
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: ''