sensu-plugins-oracle 0.10.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: '0180eaaf08cd1d64683eb23774e8ada5d6231629'
-  data.tar.gz: 18227b2ec5d75b65a5965b2cc344359d9c661ec8
+SHA256:
+  metadata.gz: 2449def8656fa0006f9625ad7d1a1490bba103bf5d928ac738201edb4f7c0786
+  data.tar.gz: b92d09b28e2a215267d7dd50a31586aad6ff2ab83f82fb72ba3806a9d48dec7d
 SHA512:
-  metadata.gz: 8e9e28139e1730f88d08874d961aadaa2241c4d009a472d77f7ac995b3b3b969730b60ab370a9591d8d29fa61d49efb83fe4c91074cff74d8380608135cad300
-  data.tar.gz: 292a529077cde00501c8b01aff396333159bb3a869ee0ea3529eb0fec229b0b85e411245d753085ebc60605c450bb033a41a85b133070eb0d5f1084d9885a50d
+  metadata.gz: 9599b9353f48c85b80c7164e9d249b994b4faa90ac51648ba3fb467fc739b2fb93737091a380456ecb77cb8cb0cba1a86ca3047f35b3087736e754ddde13e06a
+  data.tar.gz: b16eecf662ea7ef0752ac3c33a78a5850c0bff104077165ba784162a194719c458fbd55fa0a5ed491d90e06a5f22f58be5635a9a702b2b690fb8e6169b59ad65

data/CHANGELOG.md

@@ -1,3 +1,25 @@
+## 0.12.0 - 2022-08-19
+
+Changed:
+- Adapt CI/CD to actual ruby versions
+- Update Dependencies
+
+## 0.11.0 - 2022-07-27
+
+Added:
+- Use of Depandabot
+- Use of GitHub actions
+- Use of Ruby style guide and linter
+- Use of Code Climate test coverage
+
+## 0.10.0 - 2019-05-12
+
+Added:
+- Option to define module that the oracle sessions will use (thanks to [@zalum](https://github.com/zalum))
+
+Bug Fixes:
+- Fix use of wrong version constant (thanks to [@aurelije](https://github.com/aurelije))
+
 ## 0.9.1 - 2018-11-25
 
 Major:
@@ -17,7 +39,7 @@ Major:
 - Update to sensu-plugin 2.3
 
 Bug Fixes:
-- Fix colliding -w short option. Worker count short option is now -W (Thanks to https://github.com/aurelije)
+- Fix colliding -w short option. Worker count short option is now -W (Thanks to [@aurelije](https://github.com/aurelije))
 
 ## 0.5.0 - 2017-07-27
 

data/README.md

@@ -1,7 +1,8 @@
 
 [![Gem Version](https://badge.fury.io/rb/sensu-plugins-oracle.svg)](https://badge.fury.io/rb/sensu-plugins-oracle)
 [![Maintainability](https://api.codeclimate.com/v1/badges/a96aadf931c023673c49/maintainability)](https://codeclimate.com/github/thomis/sensu-plugins-oracle/maintainability)
-[![Build Status](https://travis-ci.org/thomis/sensu-plugins-oracle.svg?branch=master)](https://travis-ci.org/thomis/sensu-plugins-oracle)
+[![Test Coverage](https://api.codeclimate.com/v1/badges/a96aadf931c023673c49/test_coverage)](https://codeclimate.com/github/thomis/sensu-plugins-oracle/test_coverage)
+[![ci](https://github.com/thomis/sensu-plugins-oracle/actions/workflows/ci.yml/badge.svg)](https://github.com/thomis/sensu-plugins-oracle/actions/workflows/ci.yml)
 
 # sensu-plugins-oracle
 
@@ -44,4 +45,13 @@ This sensu plugin provides native Oracle instrumentation.
 
 ## Installation
 
-[Installation and Setup](http://sensu-plugins.io/docs/installation_instructions.html)
+[Installation and Setup](https://docs.sensu.io/sensu-core/latest/installation/installing-plugins/)
+
+## Supported Ruby Versions
+
+Currently supported and tested ruby versions are:
+
+- 3.1
+- 3.0
+- 2.7
+- 2.6 (EOL 31 Mar 2022)

data/bin/check-oracle-alive.rb

@@ -96,7 +96,7 @@ class CheckOracleAlive < Sensu::Plugin::Check::CLI
     ::SensuPluginsOracle::Session.timeout_properties(config[:timeout])
 
     if config[:version]
-      ok("Version #{SensuPluginsOracle::Version::VER_STRING}")
+      ok("Version #{SensuPluginsOracle::VERSION}")
       return
     end
 

data/bin/check-oracle-query.rb

@@ -74,8 +74,8 @@ class CheckOracleQuery < Sensu::Plugin::Check::CLI
   option :query,
          description: 'Database query to execute',
          short: '-q QUERY',
-         long: '--query QUERY',
-         required: true
+         long: '--query QUERY'
+         # required: true
 
   option :warning,
          description: 'Warning threshold expression',
@@ -136,7 +136,12 @@ 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}")
+      return
+    end
+
+    if config[:query].nil?
+      warning("You must supply: -q QUERY")
       return
     end
 

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

@@ -36,7 +36,7 @@ module SensuPluginsOracle
       @provide_name_in_result = args[:provide_name_in_result] || false
     end
 
-    def self.parse_from_file(file, db_module)
+    def self.parse_from_file(file, db_module = nil)
       sessions = []
 
       File.read(file).each_line do |line|
@@ -44,9 +44,9 @@ module SensuPluginsOracle
         next if line.size.zero? || line =~ /^#/
         a = line.split(/:|,|;/)
         sessions << Session.new(name: a[0],
-                                connect_string: a[1],
-                                provide_name_in_result: true,
-                                module: db_module)
+          connect_string: a[1],
+          provide_name_in_result: true,
+          module: db_module)
       end
 
       sessions
@@ -57,7 +57,7 @@ module SensuPluginsOracle
       @server_version = @connection.oracle_server_version
       true
     rescue StandardError, OCIError => e
-      @error_message = [@name, e.message.split("\n").first].compact.join(': ')
+      @error_message = [@name, e.message.split("\n").first].compact.join(": ")
       false
     ensure
       disconnect
@@ -75,10 +75,10 @@ module SensuPluginsOracle
       end
       cursor.close
 
-      return true
+      true
     rescue StandardError, OCIError => e
-      @error_message = [@name, e.message.split("\n").first].compact.join(': ')
-      return false
+      @error_message = [@name, e.message.split("\n").first].compact.join(": ")
+      false
     end
 
     def handle_query_result(config = {})
@@ -124,9 +124,9 @@ module SensuPluginsOracle
             else
               session.send(args[:method])
             end
-            message_done = format('Done       %s, took %0.1f ms',
-                                  session.name,
-                                  (Time.now - start) * 1000)
+            message_done = format("Done       %s, took %0.1f ms",
+              session.name,
+              (Time.now - start) * 1000)
             puts message_done if args[:config][:verbose]
           end
         end
@@ -147,7 +147,7 @@ module SensuPluginsOracle
       return nil unless show_records
       buffer = []
       buffer << "#{@name} (#{@rows.size})" if @provide_name_in_result
-      buffer += @rows.map { |row| '- ' + row.join(', ') }
+      buffer += @rows.map { |row| "- " + row.join(", ") }
       buffer.join("\n")
     end
 
@@ -170,10 +170,10 @@ module SensuPluginsOracle
     def connect
       return if @connection
 
-      if @username
-        @connection = OCI8.new(@username.to_s, @password.to_s, @database.to_s)
+      @connection = if @username
+        OCI8.new(@username.to_s, @password.to_s, @database.to_s)
       else
-        @connection = OCI8.new(@connect_string.to_s)
+        OCI8.new(@connect_string.to_s)
       end
 
       set_session_module
@@ -183,11 +183,10 @@ module SensuPluginsOracle
       return if !@module
 
       @connection.exec("call DBMS_APPLICATION_INFO.SET_MODULE ('%s', null)" % @module.to_s)
-
     end
 
     def disconnect
-      @connection.logoff if @connection
+      @connection&.logoff
       @connection = nil
     end
   end

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

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

data/lib/sensu-plugins-oracle.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-oracle
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-12 00:00:00.000000000 Z
+date: 2023-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.8'
+- !ruby/object:Gem::Dependency
+  name: standard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.23'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.23'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.21'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.21'
 description: This plugin provides native Oracle instrumentation.
 email: "<thomas.steiner@ikey.ch>"
 executables:
@@ -128,15 +156,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for oracle