sensu-plugins-oracle 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d57f08c7f7aea95dc254abc505133c565e0209a
-  data.tar.gz: c1041f3deaafe38cbdda41398bedf3c7388851cd
+  metadata.gz: efab7ed4b1a29b124c150b526b3e6ba79f4da9ae
+  data.tar.gz: 199db9fcafb5e3bf3f8369aea3b33f0154063028
 SHA512:
-  metadata.gz: de6c9aa214636720c86169949da9ec4c3a48e18a61f6dd9232ad22cd1fd96a060d43614d22b1dd803620b5a890089c60182d3796306e7aff1363ae1760a0ce78
-  data.tar.gz: 059fd886f9a11e4794da82ba0feffffa454f8e6c66dcc4d5d1e5876746e7b93bc07dad97703ba9b6ca3115a191b244b1e21122ef5f832d08041ca056b0d8b75a
+  metadata.gz: 564b180f48f2d26c9e8fec326c55aa09ca1b3581ef49861a76fc7372c2fd858113e3632c76c0e0c0db0ef85c32184525f327a1fb29b1645ef717d843e3ee4124
+  data.tar.gz: 36b1a795d59dcddf89fb2593f2a429e2be6a51e904a7269e65c553f1b294c1615e7adadc94bd339dd5ad56ef5aa42555330a66a0253fb4c4a07bb66356f83c99

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.5.0 - 2017-07-27
+
+Major:
+- Parallel processing with threads and queues, allow to define number of threads
+- Refactored code to remove doublication
+- Verbose output for thread processing
+
 ## 0.4.2 - 2017-07-24
 
 Bug Fixes:

data/README.md

@@ -22,8 +22,8 @@ This sensu plugin provides native Oracle instrumentation.
   ```
 
   ```
-  -- check multiple connections as defined in a file
-  check-oracle-alive.rb -f connections.csv
+  -- check multiple connections as defined in a file, use 5 worker threads (-w 5) and verbose output (-v)
+  check-oracle-alive.rb -f connections.csv -w 5 -v
 
   > cat connections.csv
     # production connection

data/bin/check-oracle-alive.rb

@@ -60,6 +60,20 @@ class CheckOracleAlive < Sensu::Plugin::Check::CLI
          short: '-f FILE',
          long: '--file FILE'
 
+  option :worker,
+         description: 'Number of worker threads to check for alive connections',
+         short: '-w WORKER',
+         long: '--worker WORKER',
+         default: 1,
+         :proc => Proc.new { |v| v.to_i == 0 ? 1 : v.to_i }
+
+  option :verbose,
+         description: 'Shows console log messages',
+         short: '-v',
+         long: '--verbose',
+         boolean: true,
+         default: false
+
   def run
     # handle OCI8 properties
     ::SensuPluginsOracle::Session.set_timeout_properties(config[:timeout])
@@ -73,39 +87,6 @@ class CheckOracleAlive < Sensu::Plugin::Check::CLI
 
   private
 
-  def handle_connections_from_file
-    sessions = ::SensuPluginsOracle::Session.parse_from_file(config[:file])
-
-    sessions_total = sessions.size
-    sessions_alive = 0
-
-    thread_group = ThreadGroup.new
-    queue = Queue.new
-    mutex = Mutex.new
-
-    sessions.each do |session|
-      thread_group.add Thread.new {
-        if session.alive?
-          mutex.synchronize do
-            sessions_alive += 1
-          end
-        else
-          queue << session.error_message
-        end
-      }
-    end
-    thread_group.list.map(&:join)
-    sessions_critical = queue.size.times.map { queue.pop }
-
-    if sessions_total == sessions_alive
-      ok "All are alive (#{sessions_alive}/#{sessions_total})"
-    else
-      critical ["#{sessions_alive}/#{sessions_total} are alive", sessions_critical].flatten.join("\n - ")
-    end
-  rescue => e
-    unknown e.to_s
-  end
-
   def handle_connection
     session = SensuPluginsOracle::Session.new(
       username: config[:username],
@@ -119,4 +100,32 @@ class CheckOracleAlive < Sensu::Plugin::Check::CLI
       critical session.error_message
     end
   end
+
+  def handle_connections_from_file
+    sessions = ::SensuPluginsOracle::Session.parse_from_file(config[:file])
+    ::SensuPluginsOracle::Session.handle_multiple(
+      sessions: sessions,
+      method: :alive?,
+      config: config
+    )
+
+    errors = []
+    sessions.each do |session|
+      errors << session.error_message if session.error_message
+    end
+
+    sessions_total = sessions.size
+    errors_total = errors.size
+
+    if errors_total == 0
+      ok "All are alive (#{sessions_total}/#{sessions_total})"
+    else
+      critical ["#{sessions_total - errors_total}/#{sessions_total} are alive", errors].flatten.join("\n - ")
+    end
+
+  rescue => e
+    unknown e.to_s
+  end
+
+
 end

data/bin/check-oracle-query.rb

@@ -1,9 +1,9 @@
 #! /usr/bin/env ruby
 #
-#   check-oracle-alive
+#   check-oracle-query
 #
 # DESCRIPTION:
-#   This plugin attempts to login to oracle with provided credentials.
+#   This plugin attempts to execute defined query against provided connection credential(s).
 #
 # OUTPUT:
 #   plain text
@@ -16,7 +16,7 @@
 #   gem: ruby-oci8
 #
 # USAGE:
-#   ./check-oracle-alive.rb -u USERNAME -p PASSWORD -d DATABASE -P PRIVILEGE -T TIMEOUT -f FILE -q 'select foo from bar' -w 'value > 5' -c 'value > 10'
+#   ./check-oracle-query.rb -u USERNAME -p PASSWORD -d DATABASE -P PRIVILEGE -T TIMEOUT -f FILE -q 'select foo from bar' -w 'value > 5' -c 'value > 10'
 #
 # NOTES:
 #
@@ -93,6 +93,20 @@ class CheckOracleQuery < Sensu::Plugin::Check::CLI
          boolean: true,
          default: false
 
+  option :worker,
+         description: 'Number of worker threads to execute query against provided connections',
+         short: '-w WORKER',
+         long: '--worker WORKER',
+         default: 1,
+         :proc => Proc.new { |v| v.to_i == 0 ? 1 : v.to_i }
+
+  option :verbose,
+         description: 'Shows console log messages',
+         short: '-v',
+         long: '--verbose',
+         boolean: true,
+         default: false
+
   def run
     # handle OCI8 properties
     ::SensuPluginsOracle::Session.set_timeout_properties(config[:timeout])
@@ -124,29 +138,22 @@ class CheckOracleQuery < Sensu::Plugin::Check::CLI
 
   def handle_connections_from_file
     sessions = ::SensuPluginsOracle::Session.parse_from_file(config[:file])
+    ::SensuPluginsOracle::Session.handle_multiple(
+      sessions: sessions,
+      method: :query,
+      method_arguments: config[:query].to_s,
+      config: config
+    )
 
     results = Hash.new { |h, key| h[key] = [] }
-
-    thread_group = ThreadGroup.new
-    mutex = Mutex.new
-
     sessions.each do |session|
-      thread_group.add Thread.new {
-
-        if session.query(config[:query].to_s)
-          method, message = session.handle_query_result(config)
-          mutex.synchronize do
-            results[method] << message
-          end
-        else
-          mutex.synchronize do
-            results[:critical] << session.error_message
-          end
-        end
-
-      }
+      if session.error_message
+        results[:critical] << session.error_message
+      else
+        method, message = session.handle_query_result(config)
+        results[method] << message
+      end
     end
-    thread_group.list.map(&:join)
 
     # return summary plus warning and critical messages
     method = :ok

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

@@ -95,6 +95,33 @@ module SensuPluginsOracle
       OCI8.properties[:recv_timeout] = timeout
     end
 
+    def self.handle_multiple(args={})
+      queue_sessions = Queue.new
+
+      # feed the queue with sessions
+      args[:sessions].map{ |session| queue_sessions.push(session) }
+
+      # start worker threads and handle requested sessions
+      worker = (1..args[:config][:worker]).map do
+        Thread.new do
+          begin
+            while session = queue_sessions.pop(true)
+              start = Time.now
+              puts "Processing #{session.name} - Method: #{args[:method]}" if args[:config][:verbose]
+              if args[:method_arguments]
+                session.send(args[:method], args[:method_arguments])
+              else
+                session.send(args[:method])
+              end
+              puts "Done       #{session.name}, took #{ '%0.1f' % ((Time.now - start)*1000)} ms" if args[:config][:verbose]
+            end
+          rescue ThreadError
+          end
+        end
+      end
+      worker.map(&:join)
+    end
+
     private
 
     def show(show_records=true)

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-oracle
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-24 00:00:00.000000000 Z
+date: 2017-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin