continuent-monitors-nagios 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4adb289e16938bc7425f2202c7346b1d25a33711
-  data.tar.gz: 6b0616429d4309d9141e996b3e0a4df3164e8135
+  metadata.gz: fca110aa38c24c19f840dc25d174e7f56296389e
+  data.tar.gz: 0aee544247f2c9a0798bf8642ae550c9fe7a57ed
 SHA512:
-  metadata.gz: d2c8ea7d429a8e4140bffdf7232d27839f08b2452ace4c905e1fe8416172c342cdcaf53fd78dda29122e5d179c93fb56a43ab6675a513d0e5769b6724f1bec57
-  data.tar.gz: 86197aee006dee89a0e0ad2845cdf16472d0c8284e860ed249396d1e0c54ccee8e4c79ac4ec5a9dacdb348bdd9d17669bead61aa60de1210e5a48c9a9373c21e
+  metadata.gz: 84e761f28274ab04ce34778f18f616d71465b2008bb48c1cdffd8bf146fd9897b8d18b8b8f7ec3d36a0a811a6fd38e21182ea0bb0b9da39bf622342d65dc9ea9
+  data.tar.gz: 54e786e415f0fc320a9f96b1e16f4a6ebb338ee3f3cdd40140553b949273a94c12ad136147833ff8e9368fca2235e32085b282bb8b9b13538edbfe9459abf51f

data/bin/tungsten_nagios_connector

@@ -74,7 +74,7 @@ class ContinuentNagiosMonitorConnector
     end
     
     unless TI.is_connector?()
-      unknown("This server is not a Tungsten Connector")
+      ok("This server is not a Tungsten Connector")
     end
     
     if opt(:defaults_file).to_s() == ""
@@ -96,4 +96,4 @@ class ContinuentNagiosMonitorConnector
   end
   
   self.new().run()
-end
+end

data/bin/tungsten_nagios_online

@@ -56,7 +56,7 @@ class ContinuentNagiosMonitorOnline
     
     not_online = []
     shunned = []
-    
+
     status = TI.status(opt(:service))
     if status.is_replication?()
       # Replication Only
@@ -73,13 +73,16 @@ class ContinuentNagiosMonitorOnline
       status.replicators().each{
         |name|
         ds_status = status.datasource_status(name)
+        ds_lastshunreason = status.datasource_value(name, 'lastShunReason')
         rep_status = status.replicator_status(name)
-
-        if opt(:skip_shunned) == true && ds_status == "SHUNNED"
-          shunned << name
-          next
-        end
         
+        if ds_status == "SHUNNED"
+          if opt(:skip_shunned) == true || (opt(:skip_manually_shunned) == true && ds_lastshunreason == "MANUALLY-SHUNNED")
+            shunned << name
+            next
+          end
+        end
+
         if ds_status != "ONLINE" || rep_status != "ONLINE"
           not_online << name
         end
@@ -89,12 +92,15 @@ class ContinuentNagiosMonitorOnline
       status.datasources().each{
         |name|
         ds_status = status.datasource_status(name)
-
-        if opt(:skip_shunned) == true && ds_status == "SHUNNED"
-          shunned << name
-          next
-        end
+        ds_lastshunreason = status.datasource_value(name, 'lastShunReason')
         
+        if ds_status == "SHUNNED"
+          if opt(:skip_shunned) == true || (opt(:skip_manually_shunned) == true && ds_lastshunreason == "MANUALLY-SHUNNED")
+            shunned << name
+            next
+          end
+        end
+
         if ds_status != "ONLINE"
           not_online << name
         end
@@ -117,12 +123,19 @@ class ContinuentNagiosMonitorOnline
       :on => "--service String",
       :help => "The replication service or cluster to check"
     })
-    
+
     add_option(:skip_shunned, {
       :on => "--skip-shunned String",
       :help => "Ignore Continuent Tungsten datasources that have been shunned.",
       :parse => method(:parse_boolean_option),
-      :default => "false",
+      :default => "false"
+    })
+
+    add_option(:skip_manually_shunned, {
+      :on => "--skip-manually-shunned String",
+      :help => "Ignore Continuent Tungsten datasources that have been shunned manually.",
+      :parse => method(:parse_boolean_option),
+      :default => "false"
     })
   end
   
@@ -131,4 +144,5 @@ class ContinuentNagiosMonitorOnline
   end
   
   self.new().run()
-end
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: continuent-monitors-nagios
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Continuent
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-10 00:00:00.000000000 Z
+date: 2014-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: continuent-tools-monitoring