Merge pull request #16 from jhsubscribe/master

Basic Mongo 3 support for metrics-mongodb.rb
sensu-plugins · Nov 12, 2015 · 62eb54e · 62eb54e
2 parents bbaa6e3 + b78b0e9
commit 62eb54e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
 
 ## Unreleased
+### Fixed
+- Stopped trying to gather indexCounters data from mongo 3 (metrics-mongodb.rb)
 
 ## [0.0.6] - 2015-10-13
 ### Fixed

diff --git a/bin/metrics-mongodb.rb b/bin/metrics-mongodb.rb
@@ -93,7 +93,9 @@ def run
   end
 
   def gather_replication_metrics(server_status)
+    mongo_version = server_status['version'].gsub(/[^0-9\.]/i, '')  # Handle versions like "2.6.11-pre" etc
     server_metrics = {}
+
     server_metrics['lock.ratio'] = "#{sprintf('%.5f', server_status['globalLock']['ratio'])}" unless server_status['globalLock']['ratio'].nil?
 
     server_metrics['lock.queue.total'] = server_status['globalLock']['currentQueue']['total']
@@ -103,14 +105,16 @@ def gather_replication_metrics(server_status)
     server_metrics['connections.current'] = server_status['connections']['current']
     server_metrics['connections.available'] = server_status['connections']['available']
 
-    if server_status['indexCounters']['btree'].nil?
-      server_metrics['indexes.missRatio'] = "#{sprintf('%.5f', server_status['indexCounters']['missRatio'])}"
-      server_metrics['indexes.hits'] = server_status['indexCounters']['hits']
-      server_metrics['indexes.misses'] = server_status['indexCounters']['misses']
-    else
-      server_metrics['indexes.missRatio'] = "#{sprintf('%.5f', server_status['indexCounters']['btree']['missRatio'])}"
-      server_metrics['indexes.hits'] = server_status['indexCounters']['btree']['hits']
-      server_metrics['indexes.misses'] = server_status['indexCounters']['btree']['misses']
+    if Gem::Version.new(mongo_version) < Gem::Version.new('3.0.0')
+      if server_status['indexCounters']['btree'].nil?
+        server_metrics['indexes.missRatio'] = "#{sprintf('%.5f', server_status['indexCounters']['missRatio'])}"
+        server_metrics['indexes.hits'] = server_status['indexCounters']['hits']
+        server_metrics['indexes.misses'] = server_status['indexCounters']['misses']
+      else
+        server_metrics['indexes.missRatio'] = "#{sprintf('%.5f', server_status['indexCounters']['btree']['missRatio'])}"
+        server_metrics['indexes.hits'] = server_status['indexCounters']['btree']['hits']
+        server_metrics['indexes.misses'] = server_status['indexCounters']['btree']['misses']
+      end
     end
 
     server_metrics['cursors.open'] = server_status['cursors']['totalOpen']

diff --git a/sensu-plugins-mongodb.gemspec b/sensu-plugins-mongodb.gemspec
@@ -42,9 +42,9 @@ Gem::Specification.new do |s|
   s.test_files             = s.files.grep(%r{^(test|spec|features)/})
   s.version                = SensuPluginsMongoDB::Version::VER_STRING
 
-  s.add_runtime_dependency 'bson',              '1.9.2'
-  s.add_runtime_dependency 'bson_ext',          '1.9.2'
-  s.add_runtime_dependency 'mongo',             '1.9.2'
+  s.add_runtime_dependency 'bson',              '1.12.3'
+  s.add_runtime_dependency 'bson_ext',          '1.12.3'
+  s.add_runtime_dependency 'mongo',             '1.12.3'
   s.add_runtime_dependency 'sensu-plugin',      '1.2.0'
 
   s.add_development_dependency 'bundler',                   '~> 1.7'