sensu-plugins-oracle 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80bd1e06aff16e62bea837f8bb3a8e44672d1ddb
-  data.tar.gz: 4548f9762ff46236e75d199022210033026e069c
+  metadata.gz: d7338524ee2ae194aea43ef87ef3bbf1c53dc122
+  data.tar.gz: d514efcb96e4ea00bf62d06db8a9404be6d837b3
 SHA512:
-  metadata.gz: bd1042cb02c2138bab8e784aac2053cb396472cf8e33cfc9b76eeef294bed1a07506c7dd31d810a527e2c3b76ebb39b950c834bb3a70ff3ec60c05e3e73f71d4
-  data.tar.gz: 4e1023c1841f6709fdd1d4ad916c0c55e51729443ce8e69bf2c76b67a3580b02452739f5087042af0ca435c62c5b43dffa860d17e9aa7a8dadfc9a310efcd92e
+  metadata.gz: 75f3e2fe2b49b5fb13063d3dd24193f975862ab4b1c68b1488e3e5c44bf62dcc50fc35fdc10dbd0283285753f2b5fea3966cdf01b5b66af321c7058475b333a5
+  data.tar.gz: 3f6153e5a25035f301ca0a943ee0acfafc1a6542dc927f6bd9e724ab8513069da556c2d84ae9072f7b66bc3220daba2f2d538e98b203ea06ad26b93a6d5ee36d

data/bin/check-oracle-query.rb

@@ -126,7 +126,6 @@ class CheckOracleQuery < Sensu::Plugin::Check::CLI
   def handle_connections_from_file
     sessions = ::SensuPluginsOracle::Session.parse_from_file(config[:file])
 
-    sessions_total = sessions.size
     results = Hash.new { |h, key| h[key] = [] }
 
     thread_group = ThreadGroup.new
@@ -151,9 +150,6 @@ class CheckOracleQuery < Sensu::Plugin::Check::CLI
     thread_group.list.map(&:join)
 
     # return summary plus warning and critical messages
-    sessions_ok = results[:ok].size
-
-    # default values
     method = :ok
     header = ["Total: #{sessions.size}"]
     header << "Ok: #{results[:ok].size}" if results[:ok].size > 0
@@ -162,18 +158,12 @@ class CheckOracleQuery < Sensu::Plugin::Check::CLI
 
     messages = [header.join(', ')]
 
-    if results[:warning].size > 0
-      method = :warning
-      messages << nil
-      messages << 'WARNING'
-      messages << results[:warning].compact.sort.join("\n\n")
-    end
-
-    if results[:critical].size > 0
-      method = :critical
+    [:warning, :critical].each do |type|
+    if results[type].size > 0
+      method = type
       messages << nil
-      messages << 'CRITICAL'
-      messages << results[:critical].compact.sort.join("\n\n")
+      messages << type.to_s.capitalize
+      messages << results[type].compact.sort.join("\n\n")
     end
 
     send(method, messages.join("\n"))

data/lib/sensu-plugins-oracle/session.rb

@@ -61,7 +61,7 @@ module SensuPluginsOracle
       cursor = @connection.exec(query_string)
 
       @rows = []
-      while row = cursor.fetch
+      while (row = cursor.fetch)
         @rows << row
       end
       cursor.close
@@ -78,9 +78,12 @@ module SensuPluginsOracle
       value = @rows[0][0].to_f if @rows[0] && !config[:tuples]
 
       calc = Dentaku::Calculator.new
-      return :critical, show(config[:show]) if config[:critical] && calc.evaluate(config[:critical], value: value)
-      return :warning, show(config[:show]) if config[:warning] && calc.evaluate(config[:warning], value: value)
-      return :ok, show(config[:show])
+
+      method = :ok
+      method = :warning if config[:warning] && calc.evaluate(config[:warning], value: value)
+      method = :critical if config[:critical] && calc.evaluate(config[:critical], value: value)
+
+      return method, show(config[:show])
     end
 
     private

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-oracle
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Sensu-Plugins and contributors