sensu-plugins-oracle 0.9.1 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39ff21ac10a90bc257db19f23da70c4ae46c8270
-  data.tar.gz: 02bd8c303182f001b28a26bdc10a2d49cab41fd8
+  metadata.gz: '0180eaaf08cd1d64683eb23774e8ada5d6231629'
+  data.tar.gz: 18227b2ec5d75b65a5965b2cc344359d9c661ec8
 SHA512:
-  metadata.gz: fcfdab4f0c1836c2b0cf0f18d17a3a1988e8fa54458b6557796f6dbe6fe5a3fe370fa25474c519a309448c4e9e55fe543d7d29a221764403b5efc620c22e1bfb
-  data.tar.gz: 1d5d34a7653e687b78fb7343e46c7ca1a26fbae1e294c98066067e1992ddea07d585926171fa5c9a455d687006e724aa6b9743e3f80dde624f1719265ca6f5d5
+  metadata.gz: 8e9e28139e1730f88d08874d961aadaa2241c4d009a472d77f7ac995b3b3b969730b60ab370a9591d8d29fa61d49efb83fe4c91074cff74d8380608135cad300
+  data.tar.gz: 292a529077cde00501c8b01aff396333159bb3a869ee0ea3529eb0fec229b0b85e411245d753085ebc60605c450bb033a41a85b133070eb0d5f1084d9885a50d

data/bin/check-oracle-query.rb

@@ -50,6 +50,11 @@ class CheckOracleQuery < Sensu::Plugin::Check::CLI
          short: '-d DATABASE',
          long: '--database DATABASE'
 
+  option :module,
+         description: 'Module that the oracle sessions will use',
+         short: '-m',
+         long: '--module MODULE'
+
   option :privilege,
          description: 'Connect to Oracle database by optional priviledge' \
                       ' (SYSDBA, SYSOPER, SYSASM,  , SYSDG or SYSKM)',
@@ -131,7 +136,7 @@ class CheckOracleQuery < Sensu::Plugin::Check::CLI
     ::SensuPluginsOracle::Session.timeout_properties(config[:timeout])
 
     if config[:version]
-      ok("Version #{SensuPluginsOracle::Version::VER_STRING}")
+      ok("Version #{SensuPluginsOracle::VERSION::VER_STRING}")
       return
     end
 
@@ -148,7 +153,8 @@ class CheckOracleQuery < Sensu::Plugin::Check::CLI
     session = SensuPluginsOracle::Session.new(username: config[:username],
                                               password: config[:password],
                                               database: config[:database],
-                                              privilege: config[:privilege])
+                                              privilege: config[:privilege],
+                                              module: config[:module])
 
     if session.query(config[:query].to_s)
       method, message = session.handle_query_result(config)
@@ -160,7 +166,8 @@ class CheckOracleQuery < Sensu::Plugin::Check::CLI
   end
 
   def handle_connections_from_file
-    sessions = ::SensuPluginsOracle::Session.parse_from_file(config[:file])
+    sessions = ::SensuPluginsOracle::Session.parse_from_file(config[:file],
+                                                             config[:module])
     ::SensuPluginsOracle::Session.handle_multiple(sessions: sessions,
                                                   method: :query,
                                                   config: config,
@@ -208,5 +215,4 @@ class CheckOracleQuery < Sensu::Plugin::Check::CLI
     return message if config[:limit].nil?
     message[0..config[:limit].to_i]
   end
-
 end

data/lib/sensu-plugins-oracle.rb

@@ -1,4 +1,6 @@
+require 'rubygems'
+require 'oci8'
+require 'dentaku'
+
 require 'sensu-plugins-oracle/version'
 require 'sensu-plugins-oracle/session'
-
-require 'oci8'

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

@@ -1,11 +1,9 @@
-require 'dentaku'
-
 module SensuPluginsOracle
   # Session to handle oracle checks
   class Session
     attr_reader :name, :error_message
     attr_reader :connect_string
-    attr_reader :username, :password, :database, :priviledge
+    attr_reader :username, :password, :database, :module, :priviledge
 
     attr_reader :server_version
 
@@ -34,10 +32,11 @@ module SensuPluginsOracle
       @password = args[:password]
       @database = args[:database]
       @priviledge = validate_priviledge(args[:priviledge])
+      @module = args[:module]
       @provide_name_in_result = args[:provide_name_in_result] || false
     end
 
-    def self.parse_from_file(file)
+    def self.parse_from_file(file, db_module)
       sessions = []
 
       File.read(file).each_line do |line|
@@ -46,7 +45,8 @@ module SensuPluginsOracle
         a = line.split(/:|,|;/)
         sessions << Session.new(name: a[0],
                                 connect_string: a[1],
-                                provide_name_in_result: true)
+                                provide_name_in_result: true,
+                                module: db_module)
       end
 
       sessions
@@ -175,6 +175,15 @@ module SensuPluginsOracle
       else
         @connection = OCI8.new(@connect_string.to_s)
       end
+
+      set_session_module
+    end
+
+    def set_session_module
+      return if !@module
+
+      @connection.exec("call DBMS_APPLICATION_INFO.SET_MODULE ('%s', null)" % @module.to_s)
+
     end
 
     def disconnect

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

@@ -1,3 +1,3 @@
 module SensuPluginsOracle
-  VERSION = '0.9.1'
+  VERSION = '0.10.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-oracle
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.10.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-25 00:00:00.000000000 Z
+date: 2019-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: ruby-oci8
   requirement: !ruby/object:Gem::Requirement
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -80,20 +80,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '12.3'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.12'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -108,20 +94,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.8'
-- !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 description: This plugin provides native Oracle instrumentation.
 email: "<thomas.steiner@ikey.ch>"
 executables:
@@ -156,7 +128,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="