sensu-plugins-mongodb-boutetnico 1.0.1 → 1.4.0

data/bin/metrics-mongodb-replication.rb

@@ -112,30 +112,23 @@ class MongoDB < Sensu::Plugin::Metric::CLI::Graphite
     rs.documents[0]
   end
 
-  # connects to mongo and sets @db, works with MongoClient < 2.0.0
   def connect_mongo_db
-    if Gem.loaded_specs['mongo'].version < Gem::Version.new('2.0.0')
-      mongo_client = MongoClient.new(host, port)
-      @db = mongo_client.db(db_name)
-      @db.authenticate(db_user, db_password) unless db_user.nil?
-    else
-      address_str = "#{config[:host]}:#{config[:port]}"
-      client_opts = {}
-      client_opts[:database] = 'admin'
-      unless config[:user].nil?
-        client_opts[:user] = config[:user]
-        client_opts[:password] = config[:password]
-      end
-      if config[:ssl]
-        client_opts[:ssl] = true
-        client_opts[:ssl_cert] = config[:ssl_cert]
-        client_opts[:ssl_key] = config[:ssl_key]
-        client_opts[:ssl_ca_cert] = config[:ssl_ca_cert]
-        client_opts[:ssl_verify] = config[:ssl_verify]
-      end
-      mongo_client = Mongo::Client.new([address_str], client_opts)
-      @db = mongo_client.database
+    address_str = "#{config[:host]}:#{config[:port]}"
+    client_opts = {}
+    client_opts[:database] = 'admin'
+    unless config[:user].nil?
+      client_opts[:user] = config[:user]
+      client_opts[:password] = config[:password]
+    end
+    if config[:ssl]
+      client_opts[:ssl] = true
+      client_opts[:ssl_cert] = config[:ssl_cert]
+      client_opts[:ssl_key] = config[:ssl_key]
+      client_opts[:ssl_ca_cert] = config[:ssl_ca_cert]
+      client_opts[:ssl_verify] = config[:ssl_verify]
     end
+    mongo_client = Mongo::Client.new([address_str], client_opts)
+    @db = mongo_client.database
   end
 
   def run
@@ -225,8 +218,6 @@ class MongoDB < Sensu::Plugin::Metric::CLI::Graphite
   def gather_replication_metrics(replication_status)
     replication_metrics = {}
 
-    replication_metrics['replica_set'] = replication_status['set']
-    replication_metrics['date'] = replication_status['date']
     replication_metrics['myState'] = replication_status['myState']
     replication_metrics['term'] = replication_status['term']
     replication_metrics['heartbeatIntervalMillis'] = replication_status['heartbeatIntervalMillis']
@@ -238,14 +229,11 @@ class MongoDB < Sensu::Plugin::Metric::CLI::Graphite
     replication_member_metrics = {}
 
     replication_member_metrics['id'] = replication_member_details['_id']
-    replication_member_metrics['name'] = replication_member_details['name']
     replication_member_metrics['health'] = replication_member_details['health']
     replication_member_metrics['state'] = replication_member_details['state']
-    replication_member_metrics['stateStr'] = replication_member_details['stateStr']
     member_hierarchy = replication_member_details['stateStr']
     if member_hierarchy == 'PRIMARY'
       @primary_optime_date = replication_member_details['optimeDate']
-      replication_member_metrics['primary.startOptimeDate'] = @primary_optime_date
     end
     if member_hierarchy == 'SECONDARY'
       @secondary_optime_date = replication_member_details['optimeDate']
@@ -256,12 +244,9 @@ class MongoDB < Sensu::Plugin::Metric::CLI::Graphite
       replication_member_metrics['minutesBehindPrimary'] = difference_in_minutes
       replication_member_metrics['hoursBehindPrimary'] = difference_in_hours
     end
-    replication_member_metrics['optimeDate'] = replication_member_details['optimeDate']
     replication_member_metrics['uptime'] = replication_member_details['uptime']
-    replication_member_metrics['lastHeartbeat'] = replication_member_details['lastHeartbeat']
     replication_member_metrics['lastHeartbeatRecv'] = replication_member_details['lastHeartbeatiRecv']
     replication_member_metrics['pingMs'] = replication_member_details['pingMs']
-    replication_member_metrics['syncingTo'] = replication_member_details['syncingTo']
     replication_member_metrics['configVersion'] = replication_member_details['configVersion']
 
     replication_member_metrics

data/lib/sensu-plugins-mongodb/metrics.rb

@@ -23,16 +23,9 @@ module SensuPluginsMongoDB
         raise 'Already connected to a database'
       end
 
-      db_user = @config[:user]
-      db_password = @config[:password]
       @mongo_client = get_mongo_client(db_name)
 
-      if Gem.loaded_specs['mongo'].version < Gem::Version.new('2.0.0')
-        @db = @mongo_client.db(db_name)
-        @db.authenticate(db_user, db_password) unless db_user.nil?
-      else
-        @db = @mongo_client.database
-      end
+      @db = @mongo_client.database
     end
 
     # Fetches a document from the mongo db.
@@ -321,10 +314,13 @@ module SensuPluginsMongoDB
       server_metrics['metrics.repl.network.getmores_totalMillis'] = repl['network']['getmores']['totalMillis']
       server_metrics['metrics.repl.network.ops'] = repl['network']['ops']
       server_metrics['metrics.repl.network.readersCreated'] = repl['network']['readersCreated']
-      server_metrics['metrics.repl.preload.docs_num'] = repl['preload']['docs']['num']
-      server_metrics['metrics.repl.preload.docs_totalMillis'] = repl['preload']['docs']['totalMillis']
-      server_metrics['metrics.repl.preload.indexes_num'] = repl['preload']['indexes']['num']
-      server_metrics['metrics.repl.preload.indexes_totalMillis'] = repl['preload']['indexes']['totalMillis']
+
+      if Gem::Version.new(mongo_version) <= Gem::Version.new('4.0.0')
+        server_metrics['metrics.repl.preload.docs_num'] = repl['preload']['docs']['num']
+        server_metrics['metrics.repl.preload.docs_totalMillis'] = repl['preload']['docs']['totalMillis']
+        server_metrics['metrics.repl.preload.indexes_num'] = repl['preload']['indexes']['num']
+        server_metrics['metrics.repl.preload.indexes_totalMillis'] = repl['preload']['indexes']['totalMillis']
+      end
 
       # Metrics (replicaset status)
       # MongoDB will fail if not running with --replSet, hence the check for nil
@@ -333,7 +329,7 @@ module SensuPluginsMongoDB
       end
 
       # Metrics (storage)
-      if Gem::Version.new(mongo_version) >= Gem::Version.new('2.6.0')
+      if Gem::Version.new(mongo_version) <= Gem::Version.new('4.0.0')
         freelist = server_status['metrics']['storage']['freelist']
         server_metrics['metrics.storage.freelist.search_bucketExhauseted'] = freelist['search']['bucketExhausted']
         server_metrics['metrics.storage.freelist.search_requests'] = freelist['search']['requests']
@@ -375,25 +371,21 @@ module SensuPluginsMongoDB
       ssl_ca_cert = @config[:ssl_ca_cert]
       ssl_verify = @config[:ssl_verify]
 
-      if Gem.loaded_specs['mongo'].version < Gem::Version.new('2.0.0')
-        MongoClient.new(host, port)
-      else
-        address_str = "#{host}:#{port}"
-        client_opts = {}
-        client_opts[:database] = db_name
-        unless db_user.nil?
-          client_opts[:user] = db_user
-          client_opts[:password] = db_password
-        end
-        if ssl
-          client_opts[:ssl] = true
-          client_opts[:ssl_cert] = ssl_cert
-          client_opts[:ssl_key] = ssl_key
-          client_opts[:ssl_ca_cert] = ssl_ca_cert
-          client_opts[:ssl_verify] = ssl_verify
-        end
-        Mongo::Client.new([address_str], client_opts)
+      address_str = "#{host}:#{port}"
+      client_opts = {}
+      client_opts[:database] = db_name
+      unless db_user.nil?
+        client_opts[:user] = db_user
+        client_opts[:password] = db_password
+      end
+      if ssl
+        client_opts[:ssl] = true
+        client_opts[:ssl_cert] = ssl_cert
+        client_opts[:ssl_key] = ssl_key
+        client_opts[:ssl_ca_cert] = ssl_ca_cert
+        client_opts[:ssl_verify] = ssl_verify
       end
+      Mongo::Client.new([address_str], client_opts)
     end
   end
 end

data/lib/sensu-plugins-mongodb/version.rb

@@ -1,8 +1,8 @@
 module SensuPluginsMongoDB
   module Version
     MAJOR = 1
-    MINOR = 0
-    PATCH = 1
+    MINOR = 4
+    PATCH = 0
 
     VER_STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-mongodb-boutetnico
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-05 00:00:00.000000000 Z
+date: 2020-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.85.0
+        version: 0.93.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.85.0
+        version: 0.93.1
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -187,10 +187,11 @@ description: |-
                                 more.
 email: "<sensu-users@googlegroups.com>"
 executables:
-- check-mongodb.rb
+- check-mongodb-query-count.rb
 - metrics-mongodb.rb
-- check-mongodb-metric.rb
+- check-mongodb.rb
 - metrics-mongodb-replication.rb
+- check-mongodb-metric.rb
 extensions: []
 extra_rdoc_files: []
 files:
@@ -198,6 +199,7 @@ files:
 - LICENSE
 - README.md
 - bin/check-mongodb-metric.rb
+- bin/check-mongodb-query-count.rb
 - bin/check-mongodb.py
 - bin/check-mongodb.rb
 - bin/metrics-mongodb-replication.rb