sensu-plugins-mongodb 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: adbff6eb2e9cf5561f9934b9d1adb3113271c7fe
-  data.tar.gz: 9a5736e402cfb088cb0b07bb03a72d810c3d0bac
+  metadata.gz: 66b2d5a053085a584cd966e891d11bbff8500999
+  data.tar.gz: 19ae5997b3440b58fe9b60f96b31faa50e9ba503
 SHA512:
-  metadata.gz: f57055be8c51424806f80ba63bc784f0d2d5865cc182e22c8ab64767842cd59793cf798f2a53c80e715469b7e96e1330460eed2897619560287483e1f9058977
-  data.tar.gz: 3cf34b90f91e2996c35bc975d2c3767c51c777da775896e168ffa72c9a8ff21ae4f5ad71dba7248d144e0be82d1326bb638dd700b1d3d6dafc8cec1e2ccfc1d9
+  metadata.gz: 34e01de3b9d4aa25022540fa4f6774d9e5a1a442323a7247f3c65de126512193210ed144268cf0c6d9c865ec1cd5e3a8176e9c2ae4f5c556120c61441489ee38
+  data.tar.gz: 945d1d2cfe04f5f842b1109560a28af11ef0411fbadde16d8aa67833f2cfac242d97a19414c14b83af1c4aaff19cf889cd9468ed1fce27f715cdda4b1c3270cd

data/CHANGELOG.md

@@ -4,6 +4,12 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
 
 ## [Unreleased]
+
+## [1.3.0]
+### Added
+- Support for database size metrics (@naemono)
+- Tests covering returning database size metrics (@naemono)
+
 ## [1.2.2]
 ### Fixed
 - `check-mongodb.py`: will now correctly crit on connection issues (@majormoses)
@@ -95,7 +101,8 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 ### Added
 - initial release
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-mongodb/compare/1.2.1...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-mongodb/compare/1.3.0...HEAD
+[1.3.0]: https://github.com/sensu-plugins/sensu-plugins-mongodb/compare/1.2.1...1.3.0
 [1.2.1]: https://github.com/sensu-plugins/sensu-plugins-mongodb/compare/1.2.0...1.2.1
 [1.2.0]: https://github.com/sensu-plugins/sensu-plugins-mongodb/compare/1.1.0...1.2.0
 [1.1.0]: https://github.com/sensu-plugins/sensu-plugins-mongodb/compare/1.0.0...1.1.0

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

@@ -12,6 +12,7 @@ module SensuPluginsMongoDB
       @config = config
       @connected = false
       @db = nil
+      @mongo_client = nil
     end
 
     # Connects to a mongo database.
@@ -22,38 +23,16 @@ module SensuPluginsMongoDB
         raise 'Already connected to a database'
       end
 
-      @connected = true
-      host = @config[:host]
-      port = @config[:port]
       db_user = @config[:user]
       db_password = @config[:password]
-      ssl = @config[:ssl]
-      ssl_cert = @config[:ssl_cert]
-      ssl_key = @config[:ssl_key]
-      ssl_ca_cert = @config[:ssl_ca_cert]
-      ssl_verify = @config[:ssl_verify]
 
       if Gem.loaded_specs['mongo'].version < Gem::Version.new('2.0.0')
-        mongo_client = MongoClient.new(host, port)
-        @db = mongo_client.db(db_name)
+        @mongo_client = get_mongo_client(db_name)
+        @db = @mongo_client.db(db_name)
         @db.authenticate(db_user, db_password) unless db_user.nil?
       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 = Mongo::Client.new([address_str], client_opts)
-        @db = mongo_client.database
+        @mongo_client = get_mongo_client(db_name)
+        @db = @mongo_client.database
       end
     end
 
@@ -170,6 +149,25 @@ module SensuPluginsMongoDB
         end
       end
 
+      # Database Sizes
+      @mongo_client.database_names.each do |name|
+        @mongo_client.use(name)
+        db = @mongo_client.database
+        result = db.command(dbstats: 1).documents.first
+        server_metrics["databaseSizes.#{name}.collections"] = result['collections']
+        server_metrics["databaseSizes.#{name}.objects"] = result['objects']
+        server_metrics["databaseSizes.#{name}.avgObjSize"] = result['avgObjSize']
+        server_metrics["databaseSizes.#{name}.dataSize"] = result['dataSize']
+        server_metrics["databaseSizes.#{name}.storageSize"] = result['storageSize']
+        server_metrics["databaseSizes.#{name}.numExtents"] = result['numExtents']
+        server_metrics["databaseSizes.#{name}.indexes"] = result['indexes']
+        server_metrics["databaseSizes.#{name}.indexSize"] = result['indexSize']
+        server_metrics["databaseSizes.#{name}.fileSize"] = result['fileSize']
+        server_metrics["databaseSizes.#{name}.nsSizeMB"] = result['nsSizeMB']
+      end
+      # Reset back to previous database
+      @mongo_client.use(@db.name)
+
       # Journaling (durability)
       if server_status.key?('dur')
         dur = server_status['dur']
@@ -336,5 +334,40 @@ module SensuPluginsMongoDB
       end
       clean_metrics
     end
+
+    private
+
+    def get_mongo_client(db_name)
+      @connected = true
+      host = @config[:host]
+      port = @config[:port]
+      db_user = @config[:user]
+      db_password = @config[:password]
+      ssl = @config[:ssl]
+      ssl_cert = @config[:ssl_cert]
+      ssl_key = @config[:ssl_key]
+      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)
+      end
+    end
   end
 end

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-mongodb
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-09 00:00:00.000000000 Z
+date: 2017-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson