sensu-plugins-mongodb-boutetnico 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffc709ffc7e8052e326a4e74a4a4382039f07eb4
-  data.tar.gz: 5d4c88516eda7175370e534a68469a105ae02829
+  metadata.gz: 82b2b780876d1a1af5cc8931813ab7cc771060d0
+  data.tar.gz: 7f69ddce72818fd3ff68f4a5fde1e9604985dbb4
 SHA512:
-  metadata.gz: 22bd4b61fca8b1665f2bf44650b082a9d25369c721e5d70e6a38778b1a17ef00539bdcbc6e653f10dec8eee251379b9abdd6dded4602c5e970d921b0591c8e6d
-  data.tar.gz: ef2f19166c6f4e633c20cfd99d45492cdddc5191724f4680bc6320e473f98905ccfe87ce9cec0560ad0775d6dffd7c92303d8248683f20392a06485c5e2b965e
+  metadata.gz: e5a31f5b24c4e2d4120353cc6553fcf96d0850937ed16aa87b5d9c9d87d731f2dcac5f5c4e5f067e28bf5e4baab9c8c02b4a7b87d162eb76da1643d05673ed07
+  data.tar.gz: 79efb4e3240b178c3be6370bad593dbdafbd1f7d2efb42f2a75a77ef802c192a42d58aff1a4e75ebe803213ebf0e717784f55ebad6e8b073cc1e53390b5601ab

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 = 1
-    PATCH = 1
+    MINOR = 2
+    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.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-05 00:00:00.000000000 Z
+date: 2020-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson