sensu-plugins-oracle 0.9.1 → 0.10.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/bin/check-oracle-query.rb +10 -4
- data/lib/sensu-plugins-oracle.rb +4 -2
- data/lib/sensu-plugins-oracle/session.rb +14 -5
- data/lib/sensu-plugins-oracle/version.rb +1 -1
- metadata +9 -37
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: '0180eaaf08cd1d64683eb23774e8ada5d6231629'
|
4
|
+
data.tar.gz: 18227b2ec5d75b65a5965b2cc344359d9c661ec8
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 8e9e28139e1730f88d08874d961aadaa2241c4d009a472d77f7ac995b3b3b969730b60ab370a9591d8d29fa61d49efb83fe4c91074cff74d8380608135cad300
|
7
|
+
data.tar.gz: 292a529077cde00501c8b01aff396333159bb3a869ee0ea3529eb0fec229b0b85e411245d753085ebc60605c450bb033a41a85b133070eb0d5f1084d9885a50d
|
data/bin/check-oracle-query.rb
CHANGED
@@ -50,6 +50,11 @@ class CheckOracleQuery < Sensu::Plugin::Check::CLI
|
|
50
50
|
short: '-d DATABASE',
|
51
51
|
long: '--database DATABASE'
|
52
52
|
|
53
|
+
option :module,
|
54
|
+
description: 'Module that the oracle sessions will use',
|
55
|
+
short: '-m',
|
56
|
+
long: '--module MODULE'
|
57
|
+
|
53
58
|
option :privilege,
|
54
59
|
description: 'Connect to Oracle database by optional priviledge' \
|
55
60
|
' (SYSDBA, SYSOPER, SYSASM, , SYSDG or SYSKM)',
|
@@ -131,7 +136,7 @@ class CheckOracleQuery < Sensu::Plugin::Check::CLI
|
|
131
136
|
::SensuPluginsOracle::Session.timeout_properties(config[:timeout])
|
132
137
|
|
133
138
|
if config[:version]
|
134
|
-
ok("Version #{SensuPluginsOracle::
|
139
|
+
ok("Version #{SensuPluginsOracle::VERSION::VER_STRING}")
|
135
140
|
return
|
136
141
|
end
|
137
142
|
|
@@ -148,7 +153,8 @@ class CheckOracleQuery < Sensu::Plugin::Check::CLI
|
|
148
153
|
session = SensuPluginsOracle::Session.new(username: config[:username],
|
149
154
|
password: config[:password],
|
150
155
|
database: config[:database],
|
151
|
-
privilege: config[:privilege]
|
156
|
+
privilege: config[:privilege],
|
157
|
+
module: config[:module])
|
152
158
|
|
153
159
|
if session.query(config[:query].to_s)
|
154
160
|
method, message = session.handle_query_result(config)
|
@@ -160,7 +166,8 @@ class CheckOracleQuery < Sensu::Plugin::Check::CLI
|
|
160
166
|
end
|
161
167
|
|
162
168
|
def handle_connections_from_file
|
163
|
-
sessions = ::SensuPluginsOracle::Session.parse_from_file(config[:file]
|
169
|
+
sessions = ::SensuPluginsOracle::Session.parse_from_file(config[:file],
|
170
|
+
config[:module])
|
164
171
|
::SensuPluginsOracle::Session.handle_multiple(sessions: sessions,
|
165
172
|
method: :query,
|
166
173
|
config: config,
|
@@ -208,5 +215,4 @@ class CheckOracleQuery < Sensu::Plugin::Check::CLI
|
|
208
215
|
return message if config[:limit].nil?
|
209
216
|
message[0..config[:limit].to_i]
|
210
217
|
end
|
211
|
-
|
212
218
|
end
|
data/lib/sensu-plugins-oracle.rb
CHANGED
@@ -1,11 +1,9 @@
|
|
1
|
-
require 'dentaku'
|
2
|
-
|
3
1
|
module SensuPluginsOracle
|
4
2
|
# Session to handle oracle checks
|
5
3
|
class Session
|
6
4
|
attr_reader :name, :error_message
|
7
5
|
attr_reader :connect_string
|
8
|
-
attr_reader :username, :password, :database, :priviledge
|
6
|
+
attr_reader :username, :password, :database, :module, :priviledge
|
9
7
|
|
10
8
|
attr_reader :server_version
|
11
9
|
|
@@ -34,10 +32,11 @@ module SensuPluginsOracle
|
|
34
32
|
@password = args[:password]
|
35
33
|
@database = args[:database]
|
36
34
|
@priviledge = validate_priviledge(args[:priviledge])
|
35
|
+
@module = args[:module]
|
37
36
|
@provide_name_in_result = args[:provide_name_in_result] || false
|
38
37
|
end
|
39
38
|
|
40
|
-
def self.parse_from_file(file)
|
39
|
+
def self.parse_from_file(file, db_module)
|
41
40
|
sessions = []
|
42
41
|
|
43
42
|
File.read(file).each_line do |line|
|
@@ -46,7 +45,8 @@ module SensuPluginsOracle
|
|
46
45
|
a = line.split(/:|,|;/)
|
47
46
|
sessions << Session.new(name: a[0],
|
48
47
|
connect_string: a[1],
|
49
|
-
provide_name_in_result: true
|
48
|
+
provide_name_in_result: true,
|
49
|
+
module: db_module)
|
50
50
|
end
|
51
51
|
|
52
52
|
sessions
|
@@ -175,6 +175,15 @@ module SensuPluginsOracle
|
|
175
175
|
else
|
176
176
|
@connection = OCI8.new(@connect_string.to_s)
|
177
177
|
end
|
178
|
+
|
179
|
+
set_session_module
|
180
|
+
end
|
181
|
+
|
182
|
+
def set_session_module
|
183
|
+
return if !@module
|
184
|
+
|
185
|
+
@connection.exec("call DBMS_APPLICATION_INFO.SET_MODULE ('%s', null)" % @module.to_s)
|
186
|
+
|
178
187
|
end
|
179
188
|
|
180
189
|
def disconnect
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: sensu-plugins-oracle
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.10.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Sensu-Plugins and contributors
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2019-05-12 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: sensu-plugin
|
@@ -16,14 +16,14 @@ dependencies:
|
|
16
16
|
requirements:
|
17
17
|
- - "~>"
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: '
|
19
|
+
version: '4.0'
|
20
20
|
type: :runtime
|
21
21
|
prerelease: false
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
24
|
- - "~>"
|
25
25
|
- !ruby/object:Gem::Version
|
26
|
-
version: '
|
26
|
+
version: '4.0'
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: ruby-oci8
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
@@ -44,28 +44,28 @@ dependencies:
|
|
44
44
|
requirements:
|
45
45
|
- - "~>"
|
46
46
|
- !ruby/object:Gem::Version
|
47
|
-
version: '3.
|
47
|
+
version: '3.3'
|
48
48
|
type: :runtime
|
49
49
|
prerelease: false
|
50
50
|
version_requirements: !ruby/object:Gem::Requirement
|
51
51
|
requirements:
|
52
52
|
- - "~>"
|
53
53
|
- !ruby/object:Gem::Version
|
54
|
-
version: '3.
|
54
|
+
version: '3.3'
|
55
55
|
- !ruby/object:Gem::Dependency
|
56
56
|
name: bundler
|
57
57
|
requirement: !ruby/object:Gem::Requirement
|
58
58
|
requirements:
|
59
59
|
- - "~>"
|
60
60
|
- !ruby/object:Gem::Version
|
61
|
-
version: '
|
61
|
+
version: '2.0'
|
62
62
|
type: :development
|
63
63
|
prerelease: false
|
64
64
|
version_requirements: !ruby/object:Gem::Requirement
|
65
65
|
requirements:
|
66
66
|
- - "~>"
|
67
67
|
- !ruby/object:Gem::Version
|
68
|
-
version: '
|
68
|
+
version: '2.0'
|
69
69
|
- !ruby/object:Gem::Dependency
|
70
70
|
name: rake
|
71
71
|
requirement: !ruby/object:Gem::Requirement
|
@@ -80,20 +80,6 @@ dependencies:
|
|
80
80
|
- - "~>"
|
81
81
|
- !ruby/object:Gem::Version
|
82
82
|
version: '12.3'
|
83
|
-
- !ruby/object:Gem::Dependency
|
84
|
-
name: pry
|
85
|
-
requirement: !ruby/object:Gem::Requirement
|
86
|
-
requirements:
|
87
|
-
- - "~>"
|
88
|
-
- !ruby/object:Gem::Version
|
89
|
-
version: '0.12'
|
90
|
-
type: :development
|
91
|
-
prerelease: false
|
92
|
-
version_requirements: !ruby/object:Gem::Requirement
|
93
|
-
requirements:
|
94
|
-
- - "~>"
|
95
|
-
- !ruby/object:Gem::Version
|
96
|
-
version: '0.12'
|
97
83
|
- !ruby/object:Gem::Dependency
|
98
84
|
name: rspec
|
99
85
|
requirement: !ruby/object:Gem::Requirement
|
@@ -108,20 +94,6 @@ dependencies:
|
|
108
94
|
- - "~>"
|
109
95
|
- !ruby/object:Gem::Version
|
110
96
|
version: '3.8'
|
111
|
-
- !ruby/object:Gem::Dependency
|
112
|
-
name: codeclimate-test-reporter
|
113
|
-
requirement: !ruby/object:Gem::Requirement
|
114
|
-
requirements:
|
115
|
-
- - "~>"
|
116
|
-
- !ruby/object:Gem::Version
|
117
|
-
version: '1.0'
|
118
|
-
type: :development
|
119
|
-
prerelease: false
|
120
|
-
version_requirements: !ruby/object:Gem::Requirement
|
121
|
-
requirements:
|
122
|
-
- - "~>"
|
123
|
-
- !ruby/object:Gem::Version
|
124
|
-
version: '1.0'
|
125
97
|
description: This plugin provides native Oracle instrumentation.
|
126
98
|
email: "<thomas.steiner@ikey.ch>"
|
127
99
|
executables:
|
@@ -156,7 +128,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
156
128
|
requirements:
|
157
129
|
- - ">="
|
158
130
|
- !ruby/object:Gem::Version
|
159
|
-
version:
|
131
|
+
version: '2.3'
|
160
132
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
161
133
|
requirements:
|
162
134
|
- - ">="
|