sensu-plugins-mongodb-boutetnico 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5158f79cf0b2ca17989024073a6e6763c813a12
-  data.tar.gz: 33d481c535410f57d938cc3ed9a1d909978a7a56
+  metadata.gz: 20bd487d838baf2695377d4f9427abb2ab216b42
+  data.tar.gz: ba4b4e0e4d895b9f1df4c20dd598e1cf3df67ac9
 SHA512:
-  metadata.gz: 7398a60f9c355056cc4904f5a723c5f27cf9d2e3293570bda98764acccbdfca8f63e04f04f78178dd5fd67c77b82ae3e8288612f64bc534b19cc7d18137f68d2
-  data.tar.gz: 5d13573db9f1ddc5f27e458c34fe14507a9ac7e25e73890a10e3ff1a9c5be0077aa1ae9acf32ed240aaf060c72cee0490c0801ff63b41a78b6c8b10da4435d2c
+  metadata.gz: 6489d8a793494b7cccd8b141f6d1b0414764692149289a4bfb201af868fdf81106d77c0e0b48b8841524dd8d2d6d6b0147df3cd8c0f6dfcc3d9437951243f598
+  data.tar.gz: f1b84acd7d5a6afc1e0fac77d6612fb241a139b01b5448d61588a54a5cab8e69f8df34e5a0ac73dd50aaf6711bf532fb4cb210dc2515097e62a2bb0b507c7502

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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-mongodb-boutetnico
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-09 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,11 +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: