sensu-plugins-mongodb 0.0.4 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e2ab74c7f77a0bfdebcab9aa2e160bf99ccb103
-  data.tar.gz: 77a732675fa8c87c4a4f38edd48f65ae8673b45a
+  metadata.gz: 0c77f96e9ed54c0ebae93b22ef9d2c3ba3b31f6c
+  data.tar.gz: af8a77dffb87f0e09221a0156b5ea0a93074d481
 SHA512:
-  metadata.gz: 31fe971def9daa515971c56c7265fe9782c427c34c2fc22a81d8bab89f8efffcf274132ca4b6408663de629113eeea9301052e202e585d94ffcf24b48c3b84a3
-  data.tar.gz: cd4b1c87c141a300083fcfc7339743ae4e728eef78c2cdada8ab6c5601ca7846514ab3434c026092f5dc99d2808b3b38f2cd71061de8e3613c9d945ebb7aae4c
+  metadata.gz: 09d393f5829685dd5c9fd9143af1f87b67c74e7d836e7608f9353cf09d6c90fffb1b3e79c01888d22fb64bc1d1917eb5b601527e3abb05f6c0b498fb131e5084
+  data.tar.gz: 4108df7689502003b4b00662e46508d08c913c90ab0f6bc2dddf07d5fe479e3a50f83164060323c21032480c84075faf27301aa7ae87d721e17e8a3537f03167

data/CHANGELOG.md

@@ -5,6 +5,16 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 
 ## Unreleased
 
+## [0.0.6] - 2015-10-13
+### Fixed
+- Rename option to avoid naming conflict with class variable name
+- Add message for replica set state 9 (rollback)
+- Installation fix
+
+## [0.0.5] - 2015-09-04
+### Fixed
+- Fixed non ssl mongo connections
+
 ## [0.0.4] - 2015-08-12
 ### Changed
 - general gem cleanup

data/bin/check-mongodb.py

@@ -152,7 +152,7 @@ def main(argv):
     p.add_option('-D', '--perf-data', action='store_true', dest='perf_data', default=False, help='Enable output of Nagios performance data')
     p.add_option('-d', '--database', action='store', dest='database', default='admin', help='Specify the database to check')
     p.add_option('--all-databases', action='store_true', dest='all_databases', default=False, help='Check all databases (action database_size)')
-    p.add_option('-s', '--ssl', dest='ssl', default=False, action='callback', callback=optional_arg(True), help='Connect using SSL')
+    p.add_option('-s', '--ssl-enabled', dest='ssl_enabled', default=False, action='callback', callback=optional_arg(True), help='Connect using SSL')
     p.add_option('-r', '--replicaset', dest='replicaset', default=None, action='callback', callback=optional_arg(True), help='Connect to replicaset')
     p.add_option('-q', '--querytype', action='store', dest='query_type', default='query', help='The query type to check [query|insert|update|delete|getmore|command] from queries_per_second')
     p.add_option('-c', '--collection', action='store', dest='collection', default='admin', help='Specify the collection to check')
@@ -177,7 +177,7 @@ def main(argv):
     perf_data = options.perf_data
     max_lag = options.max_lag
     database = options.database
-    ssl = options.ssl
+    ssl_enabled = options.ssl_enabled
     replicaset = options.replicaset
 
     if action == 'replica_primary' and replicaset is None:
@@ -189,7 +189,7 @@ def main(argv):
     # moving the login up here and passing in the connection
     #
     start = time.time()
-    err, con = mongo_connect(host, port, ssl, user, passwd, replicaset)
+    err, con = mongo_connect(host, port, ssl_enabled, user, passwd, replicaset)
     if err != 0:
         return err
 
@@ -267,14 +267,14 @@ def main(argv):
         return check_connect(host, port, warning, critical, perf_data, user, passwd, conn_time)
 
 
-def mongo_connect(host=None, port=None, ssl=False, user=None, passwd=None, replica=None):
+def mongo_connect(host=None, port=None, ssl_enabled=False, user=None, passwd=None, replica=None):
     try:
         # ssl connection for pymongo > 2.3
         if pymongo.version >= "2.3":
             if replica is None:
-                con = pymongo.MongoClient(host, port, ssl=ssl)
+                con = pymongo.MongoClient(host, port, ssl=ssl_enabled)
             else:
-                con = pymongo.Connection(host, port, read_preference=pymongo.ReadPreference.SECONDARY, ssl=ssl, replicaSet=replica, network_timeout=10)
+                con = pymongo.Connection(host, port, read_preference=pymongo.ReadPreference.SECONDARY, ssl=ssl_enabled, replicaSet=replica, network_timeout=10)
         else:
             if replica is None:
                 con = pymongo.Connection(host, port, slave_okay=True, network_timeout=10)
@@ -700,7 +700,7 @@ def check_replset_state(con, perf_data, warning="", critical=""):
     try:
         warning = [int(x) for x in warning.split(",")]
     except:
-        warning = [0, 3, 5]
+        warning = [0, 3, 5, 9]
     try:
         critical = [int(x) for x in critical.split(",")]
     except:
@@ -735,6 +735,8 @@ def check_replset_state(con, perf_data, warning="", critical=""):
             message = "State: %i (Secondary)" % state
         elif state == 7:
             message = "State: %i (Arbiter)" % state
+        elif state == 9:
+            message = "State: %i (Rollback)" % state
         elif state == -1:
             message = "Not running with replSet"
         else:

data/bin/metrics-mongodb.rb

@@ -92,9 +92,9 @@ class MongoDB < Sensu::Plugin::Metric::CLI::Graphite
     end
   end
 
-  def gather_replication_metrics(server_status) # rubocop:disable all
+  def gather_replication_metrics(server_status)
     server_metrics = {}
-    server_metrics['lock.ratio'] = "#{sprintf('%.5f', server_status['globalLock']['ratio'])}" unless server_status['globalLock']['ratio'].nil? # rubocop:disable all
+    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']
     server_metrics['lock.queue.readers'] = server_status['globalLock']['currentQueue']['readers']
@@ -104,11 +104,11 @@ class MongoDB < Sensu::Plugin::Metric::CLI::Graphite
     server_metrics['connections.available'] = server_status['connections']['available']
 
     if server_status['indexCounters']['btree'].nil?
-      server_metrics['indexes.missRatio'] = "#{sprintf('%.5f', server_status['indexCounters']['missRatio'])}" # rubocop:disable all
+      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'])}" # rubocop:disable all
+      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

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-mongodb
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
@@ -30,7 +30,7 @@ cert_chain:
   8sHuVruarogxxKPBzlL2is4EUb6oN/RdpGx2l4254+nyR+abg//Ed27Ym0PkB4lk
   HP0m8WSjZmFr109pE/sVsM5jtOCvogyujQOjNVGN4gz1wwPr
   -----END CERTIFICATE-----
-date: 2015-08-12 00:00:00.000000000 Z
+date: 2015-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson
@@ -224,6 +224,7 @@ description: |-
 email: "<sensu-users@googlegroups.com>"
 executables:
 - metrics-mongodb.rb
+- check-mongodb.py
 extensions: []
 extra_rdoc_files: []
 files: