logstash-input-snmp 1.2.1 → 1.2.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (9) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +7 -5
  3. data/lib/logstash/inputs/snmp/base_client.rb +12 -20
  4. data/lib/logstash/inputs/snmp/client.rb +10 -19
  5. data/lib/logstash/inputs/snmp/clientv3.rb +30 -35
  6. data/logstash-input-snmp.gemspec +1 -1
  7. data/spec/inputs/snmp/base_client_spec.rb +7 -6
  8. data/spec/inputs/snmp_spec.rb +1 -0
  9. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 7c3a74f2f8ec14f17acc8f04cfcc23b6ee05fdcd24a54a29423d804744c7f5c4
4
- data.tar.gz: b5fa48b8bff526d82887ed05c0c4495f61ce9db518e4d07bd384b4705455b550
3
+ metadata.gz: fd8a28a27d093bbc5502b4475514220ae85d3f4a33c851db6cd0934b19ea830a
4
+ data.tar.gz: 86504f9ffcffa46a208ba8198409959de6515a4e1bef0efb021caee93b139c33
5
5
  SHA512:
6
- metadata.gz: 416b0328c5e6494f14f5412b70a4207a166cd11b9170b5b97c31b1e00144ea7f44f541d932c20a8361c6cb97c352ac16d6c0d926625b36d8b9b1406af6afd864
7
- data.tar.gz: 6eb1ac2dcce5741a3a8e734bf8eb6e15130e0dce5d10f29d15983eb886d73d6d4621a35b392fb9ea54cb483407561bde955eca89e549a3de08d3948e13e92cbc
6
+ metadata.gz: b9ba8535100826e6c8ba053c6189a7d96e2b385de5430c9fbd295489d47324783d3cf23e50d32386819c3d993e625095c859cc672a3af3bb760df4c1e024fb55
7
+ data.tar.gz: 6254f5b522aeadf2720d13ef0191f492882da868588d1c46d1f717fbdf2b6b20c85c394a557175b8a2fc38e4a0133bfc37905f0ee7f137ad85abd18dfcfd9c07
data/CHANGELOG.md CHANGED
@@ -1,15 +1,18 @@
1
+ ## 1.2.2
2
+ - Refactor: scope and review java_imports [#72](https://github.com/logstash-plugins/logstash-input-snmp/pull/72)
3
+
1
4
  ## 1.2.1
2
- - Fixed GAUGE32 integer overflow [#65] (https://github.com/logstash-plugins/logstash-input-snmp/pull/65)
5
+ - Fixed GAUGE32 integer overflow [#65](https://github.com/logstash-plugins/logstash-input-snmp/pull/65)
3
6
 
4
7
  ## 1.2.0
5
- - Adding oid_path_length config option [#59] (https://github.com/logstash-plugins/logstash-input-snmp/pull/59)
6
- - Fixing bug with table support removing index value from OIDs [#60] )https://github.com/logstash-plugins/logstash-input-snmp/issues/60)
8
+ - Adding oid_path_length config option [#59](https://github.com/logstash-plugins/logstash-input-snmp/pull/59)
9
+ - Fixing bug with table support removing index value from OIDs [#60])https://github.com/logstash-plugins/logstash-input-snmp/issues/60)
7
10
 
8
11
  ## 1.1.1
9
12
  - Added information and other improvements to documentation [#57](https://github.com/logstash-plugins/logstash-input-snmp/pull/57)
10
13
 
11
14
  ## 1.1.0
12
- - Added support for querying SNMP tables [#49] (https://github.com/logstash-plugins/logstash-input-snmp/pull/49)
15
+ - Added support for querying SNMP tables [#49](https://github.com/logstash-plugins/logstash-input-snmp/pull/49)
13
16
  - Changed three error messages in the base_client to include the target address for clarity in the logs.
14
17
 
15
18
  ## 1.0.1
@@ -36,4 +39,3 @@
36
39
 
37
40
  ## 0.1.0.beta1
38
41
  - First beta version
39
-
data/lib/logstash/inputs/snmp/base_client.rb CHANGED
@@ -3,31 +3,23 @@ require "logstash-input-snmp_jars.rb"
3
3
 
4
4
  require "logstash/util/loggable"
5
5
 
6
- java_import "org.snmp4j.CommunityTarget"
7
- java_import "org.snmp4j.PDU"
8
- java_import "org.snmp4j.ScopedPDU"
9
- java_import "org.snmp4j.Snmp"
10
- java_import "org.snmp4j.Target"
11
- java_import "org.snmp4j.TransportMapping"
12
- java_import "org.snmp4j.event.ResponseEvent"
13
- java_import "org.snmp4j.mp.SnmpConstants"
14
- java_import "org.snmp4j.smi.Address"
15
- java_import "org.snmp4j.smi.GenericAddress"
16
- java_import "org.snmp4j.smi.OID"
17
- java_import "org.snmp4j.smi.OctetString"
18
- java_import "org.snmp4j.smi.VariableBinding"
19
- java_import "org.snmp4j.transport.DefaultUdpTransportMapping"
20
- java_import "org.snmp4j.transport.DefaultTcpTransportMapping"
21
- java_import "org.snmp4j.util.TableUtils"
22
- java_import "org.snmp4j.util.TreeUtils"
23
- java_import "org.snmp4j.util.DefaultPDUFactory"
24
- java_import "org.snmp4j.asn1.BER"
25
-
26
6
  module LogStash
27
7
  class SnmpClientError < StandardError
28
8
  end
29
9
 
30
10
  class BaseSnmpClient
11
+
12
+ java_import "org.snmp4j.Snmp"
13
+ java_import "org.snmp4j.TransportMapping"
14
+ java_import "org.snmp4j.mp.SnmpConstants"
15
+ java_import "org.snmp4j.smi.OID"
16
+ java_import "org.snmp4j.smi.VariableBinding"
17
+ java_import "org.snmp4j.transport.DefaultUdpTransportMapping"
18
+ java_import "org.snmp4j.transport.DefaultTcpTransportMapping"
19
+ java_import "org.snmp4j.util.TableUtils"
20
+ java_import "org.snmp4j.util.TreeUtils"
21
+ java_import "org.snmp4j.asn1.BER"
22
+
31
23
  include LogStash::Util::Loggable
32
24
 
33
25
  def initialize(protocol, address, port, retries, timeout, mib)
data/lib/logstash/inputs/snmp/client.rb CHANGED
@@ -2,28 +2,19 @@ require "java"
2
2
  require "logstash-input-snmp_jars.rb"
3
3
  require_relative "base_client"
4
4
 
5
- java_import "org.snmp4j.CommunityTarget"
6
- java_import "org.snmp4j.PDU"
7
- java_import "org.snmp4j.ScopedPDU"
8
- java_import "org.snmp4j.Snmp"
9
- java_import "org.snmp4j.Target"
10
- java_import "org.snmp4j.TransportMapping"
11
- java_import "org.snmp4j.event.ResponseEvent"
12
- java_import "org.snmp4j.mp.SnmpConstants"
13
- java_import "org.snmp4j.smi.Address"
14
- java_import "org.snmp4j.smi.GenericAddress"
15
- java_import "org.snmp4j.smi.OID"
16
- java_import "org.snmp4j.smi.OctetString"
17
- java_import "org.snmp4j.smi.VariableBinding"
18
- java_import "org.snmp4j.transport.DefaultUdpTransportMapping"
19
- java_import "org.snmp4j.transport.DefaultTcpTransportMapping"
20
- java_import "org.snmp4j.util.TreeUtils"
21
- java_import "org.snmp4j.util.DefaultPDUFactory"
22
- java_import "org.snmp4j.asn1.BER"
23
-
24
5
  module LogStash
25
6
  class SnmpClient < BaseSnmpClient
26
7
 
8
+ java_import "org.snmp4j.CommunityTarget"
9
+ java_import "org.snmp4j.PDU"
10
+ java_import "org.snmp4j.ScopedPDU"
11
+ java_import "org.snmp4j.Snmp"
12
+ java_import "org.snmp4j.Target"
13
+ java_import "org.snmp4j.smi.Address"
14
+ java_import "org.snmp4j.smi.GenericAddress"
15
+ java_import "org.snmp4j.smi.OctetString"
16
+ java_import "org.snmp4j.util.DefaultPDUFactory"
17
+
27
18
  def initialize(protocol, address, port, community, version, retries, timeout, mib)
28
19
  super(protocol, address, port, retries, timeout, mib)
29
20
  raise(SnmpClientError, "SnmpClient is expecting verison '1' or '2c'") unless ["1", "2c"].include?(version.to_s)
data/lib/logstash/inputs/snmp/clientv3.rb CHANGED
@@ -1,44 +1,39 @@
1
1
  require 'java'
2
2
  require 'logstash-input-snmp_jars.rb'
3
3
 
4
-
5
- java_import 'org.snmp4j.PDU'
6
- java_import 'org.snmp4j.ScopedPDU'
7
- java_import 'org.snmp4j.Snmp'
8
- java_import 'org.snmp4j.Target'
9
- java_import 'org.snmp4j.TransportMapping'
10
- java_import 'org.snmp4j.event.ResponseEvent'
11
- java_import 'org.snmp4j.mp.MPv3'
12
- java_import 'org.snmp4j.mp.SnmpConstants'
13
- java_import 'org.snmp4j.security.AuthMD5'
14
- java_import 'org.snmp4j.security.AuthSHA'
15
- java_import 'org.snmp4j.security.AuthSHA2'
16
- java_import 'org.snmp4j.security.AuthHMAC128SHA224'
17
- java_import 'org.snmp4j.security.AuthHMAC192SHA256'
18
- java_import 'org.snmp4j.security.AuthHMAC256SHA384'
19
- java_import 'org.snmp4j.security.AuthHMAC384SHA512'
20
- java_import 'org.snmp4j.security.Priv3DES'
21
- java_import 'org.snmp4j.security.PrivDES'
22
- java_import 'org.snmp4j.security.PrivAES128'
23
- java_import 'org.snmp4j.security.PrivAES192'
24
- java_import 'org.snmp4j.security.PrivAES256'
25
- java_import 'org.snmp4j.security.SecurityModels'
26
- java_import 'org.snmp4j.security.SecurityProtocols'
27
- java_import 'org.snmp4j.security.USM'
28
- java_import 'org.snmp4j.security.UsmUser'
29
- java_import 'org.snmp4j.security.SecurityLevel'
30
- java_import 'org.snmp4j.smi.Address'
31
- java_import 'org.snmp4j.smi.GenericAddress'
32
- java_import 'org.snmp4j.smi.OID'
33
- java_import 'org.snmp4j.smi.OctetString'
34
- java_import 'org.snmp4j.transport.DefaultUdpTransportMapping'
35
- java_import 'org.snmp4j.transport.DefaultTcpTransportMapping'
36
- java_import 'org.snmp4j.UserTarget'
37
- java_import 'org.snmp4j.util.DefaultPDUFactory'
38
-
39
4
  module LogStash
40
5
  class SnmpClientV3 < BaseSnmpClient
41
6
 
7
+ java_import 'org.snmp4j.PDU'
8
+ java_import 'org.snmp4j.ScopedPDU'
9
+ java_import 'org.snmp4j.Snmp'
10
+ java_import 'org.snmp4j.Target'
11
+ java_import 'org.snmp4j.event.ResponseEvent'
12
+ java_import 'org.snmp4j.mp.MPv3'
13
+ java_import 'org.snmp4j.mp.SnmpConstants'
14
+ java_import 'org.snmp4j.security.AuthMD5'
15
+ java_import 'org.snmp4j.security.AuthSHA'
16
+ java_import 'org.snmp4j.security.AuthSHA2'
17
+ java_import 'org.snmp4j.security.AuthHMAC128SHA224'
18
+ java_import 'org.snmp4j.security.AuthHMAC192SHA256'
19
+ java_import 'org.snmp4j.security.AuthHMAC256SHA384'
20
+ java_import 'org.snmp4j.security.AuthHMAC384SHA512'
21
+ java_import 'org.snmp4j.security.Priv3DES'
22
+ java_import 'org.snmp4j.security.PrivDES'
23
+ java_import 'org.snmp4j.security.PrivAES128'
24
+ java_import 'org.snmp4j.security.PrivAES192'
25
+ java_import 'org.snmp4j.security.PrivAES256'
26
+ java_import 'org.snmp4j.security.SecurityModels'
27
+ java_import 'org.snmp4j.security.SecurityProtocols'
28
+ java_import 'org.snmp4j.security.USM'
29
+ java_import 'org.snmp4j.security.UsmUser'
30
+ java_import 'org.snmp4j.security.SecurityLevel'
31
+ java_import 'org.snmp4j.smi.Address'
32
+ java_import 'org.snmp4j.smi.GenericAddress'
33
+ java_import 'org.snmp4j.smi.OctetString'
34
+ java_import 'org.snmp4j.UserTarget'
35
+ java_import 'org.snmp4j.util.DefaultPDUFactory'
36
+
42
37
  def initialize(protocol, address, port, retries, timeout, mib, security_name, auth_protocol, auth_pass, priv_protocol, priv_pass, security_level)
43
38
  super(protocol, address, port, retries, timeout, mib)
44
39
 
data/logstash-input-snmp.gemspec CHANGED
@@ -1,6 +1,6 @@
1
1
  Gem::Specification.new do |s|
2
2
  s.name = 'logstash-input-snmp'
3
- s.version = '1.2.1'
3
+ s.version = '1.2.2'
4
4
  s.licenses = ['Apache-2.0']
5
5
  s.summary = "SNMP input plugin"
6
6
  s.description = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"
data/spec/inputs/snmp/base_client_spec.rb CHANGED
@@ -2,13 +2,14 @@
2
2
  require "logstash/devutils/rspec/spec_helper"
3
3
  require "logstash/inputs/snmp/base_client"
4
4
 
5
- java_import "org.snmp4j.smi.AbstractVariable"
6
- java_import "org.snmp4j.smi.SMIConstants"
7
- java_import "org.snmp4j.smi.Gauge32"
8
- java_import "org.snmp4j.smi.Integer32"
9
-
10
5
  module LogStash
11
6
 
7
+ java_import "org.snmp4j.asn1.BER"
8
+ java_import "org.snmp4j.smi.AbstractVariable"
9
+ java_import "org.snmp4j.smi.SMIConstants"
10
+ java_import "org.snmp4j.smi.Gauge32"
11
+ java_import "org.snmp4j.smi.Integer32"
12
+
12
13
  class TestableBaseSnmpClient < BaseSnmpClient
13
14
  def coerce(*args)
14
15
  super(*args)
@@ -35,7 +36,7 @@ module LogStash
35
36
  expect(subject).to receive(:logger).exactly(1).times.and_call_original
36
37
  expect(subject.coerce(v)).to eq("error: unknown variable syntax 130, EndOfMibView")
37
38
  end
38
-
39
+
39
40
  it "should handle max unsigned 32 bits integer GAUGE32" do
40
41
  MAX_UNSIGNED_INT_32 = 4294967295
41
42
  v = Gauge32.new(MAX_UNSIGNED_INT_32)
data/spec/inputs/snmp_spec.rb CHANGED
@@ -1,5 +1,6 @@
1
1
  # encoding: utf-8
2
2
  require "logstash/devutils/rspec/spec_helper"
3
+ require "logstash/devutils/rspec/shared_examples"
3
4
  require "logstash/inputs/snmp"
4
5
 
5
6
  describe LogStash::Inputs::Snmp do
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: logstash-input-snmp
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.1
4
+ version: 1.2.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Elasticsearch
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2019-08-02 00:00:00.000000000 Z
11
+ date: 2020-03-16 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  requirement: !ruby/object:Gem::Requirement