logstash-input-snmp 1.1.0 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 213be86518d3d8a674d4227ff23cad9fac2be281fe2d79e9cd6a2e3bc1415b62
-  data.tar.gz: 1334457e8ebfcd7c979fa5bd53870af0205df9fe0842dd1f7e7d4598b653961b
+  metadata.gz: cb5609c18eaaec9aeef2b6061112def84acb1f2057d90bd507a785dcf452ccd4
+  data.tar.gz: 60bc0983f862f184d6b17b6e64c31c333998468d54610397b3ce4f1ed64e8163
 SHA512:
-  metadata.gz: 5630fc5e10d784ba79700e2f11216b660194e36317e06ba6060f1459f3825719b28514324e212378a69dcc5b257c8efdaba889c6f65093560a2ae7d51f124314
-  data.tar.gz: 0a888058d97613735f4eb4188963a73e907fa354a7799529153d00c51e58d15a6a232bcc7c0d22eaa8065a3798d3bb48d1f1b5535057e08b4b521647590bac91
+  metadata.gz: 0d34c2e4575a756c34dfa4680bfed5f003787aeaee5cd5a73d8408eb76dce677c540e8437d778b0875ec5c1f75677322d3dfb6d2a10f85572479c1da28e8e8a7
+  data.tar.gz: f53c711c10cc10d51b4a9919e9b0c3624176df89bc79116cb394ee10ab15266e8a61f8907346c670e9d959f2cce1c387586850dd98c9b3135d1b20a434863131

data/CHANGELOG.md

@@ -1,5 +1,24 @@
+## 1.2.4
+  -  Fixed: support SNMPv3 multiple identical security name with different credentials [#84](https://github.com/logstash-plugins/logstash-input-snmp/pull/84)
+
+## 1.2.3
+  -  Fixed: multithreading problem when using multiple snmp inputs with multiple v3 credentials [#80](https://github.com/logstash-plugins/logstash-input-snmp/pull/80)
+
+## 1.2.2
+  -  Refactor: scope and review java_imports [#72](https://github.com/logstash-plugins/logstash-input-snmp/pull/72)
+
+## 1.2.1
+  - Fixed GAUGE32 integer overflow [#65](https://github.com/logstash-plugins/logstash-input-snmp/pull/65)
+
+## 1.2.0
+  - Adding oid_path_length config option [#59](https://github.com/logstash-plugins/logstash-input-snmp/pull/59)
+  - Fixing bug with table support removing index value from OIDs [#60])https://github.com/logstash-plugins/logstash-input-snmp/issues/60)
+
+## 1.1.1
+  - Added information and other improvements to documentation [#57](https://github.com/logstash-plugins/logstash-input-snmp/pull/57)
+
 ## 1.1.0
-  - Added support for querying SNMP tables
+  - Added support for querying SNMP tables [#49](https://github.com/logstash-plugins/logstash-input-snmp/pull/49)
   - Changed three error messages in the base_client to include the target address for clarity in the logs.
 
 ## 1.0.1
@@ -26,4 +45,3 @@
 
 ## 0.1.0.beta1
   - First beta version
-

data/LICENSE

@@ -1,11 +1,202 @@
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
 
-    http://www.apache.org/licenses/LICENSE-2.0
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
 
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2020 Elastic and contributors
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

data/docs/index.asciidoc

@@ -59,8 +59,10 @@ This plugin supports the following configuration options plus the <<plugins-{typ
 | <<plugins-{type}s-{plugin}-hosts>> |<<array,array>>|No
 | <<plugins-{type}s-{plugin}-interval>> |<<number,number>>|No
 | <<plugins-{type}s-{plugin}-mib_paths>> |<<path,path>>|No
-| <<plugins-{type}s-{plugin}-oid_root_skip>> |<<boolean,boolean>>|No
+| <<plugins-{type}s-{plugin}-oid_root_skip>> |<<number,number>>|No
+| <<plugins-{type}s-{plugin}-oid_path_length>> |<<number,number>>|No
 | <<plugins-{type}s-{plugin}-walk>> |<<array,array>>|No
+| <<plugins-{type}s-{plugin}-tables>> |<<array,array>>|No
 |=======================================================================
 
 ==== SNMPv3 Authentication Options
@@ -168,7 +170,7 @@ If you require other MIBs, you need to import them. See <<plugins-{type}s-{plugi
 [id="plugins-{type}s-{plugin}-oid_root_skip"]
 ===== `oid_root_skip` 
 
-The `oid_root_skip` option specifies the  number of OID root digits to ignore in event field name.
+The `oid_root_skip` option specifies the number of OID root digits to ignore in the event field name.
 For example, in a numeric OID like "1.3.6.1.2.1.1.1.0" the first 5 digits could be ignored by setting `oid_root_skip => 5`
 which would result in a field name "1.1.1.0". Similarly when a MIB is used an OID such
 "1.3.6.1.2.mib-2.system.sysDescr.0" would become "mib-2.system.sysDescr.0"
@@ -176,6 +178,17 @@ which would result in a field name "1.1.1.0". Similarly when a MIB is used an OI
 * Value type is <<number,number>>
 * Default value is `0`
 
+[id="plugins-{type}s-{plugin}-oid_path_length"]
+===== `oid_path_length`
+
+The `oid_path_length` option specifies the number of OID root digits to retain in the event field name.
+For example, in a numeric OID like "1.3.6.1.2.1.1.1.0" the last 2 digits could be retained by setting `oid_path_length => 2`
+which would result in a field name "1.0". Similarly when a MIB is used an OID such
+"1.3.6.1.2.mib-2.system.sysDescr.0" would become "sysDescr.0"
+
+* Value type is <<number,number>>
+* Default value is `0`
+
 [id="plugins-{type}s-{plugin}-walk"]
 ===== `walk`
 
@@ -197,6 +210,41 @@ Example
 }
 -----
 
+[id="plugins-{type}s-{plugin}-tables"]
+===== `tables`
+
+The `tables` option is used to query for tabular values for the given column OID(s).
+
+Each table definition is a hash and must define the name key and value and the columns to return.
+
+* Value type is <<array,array>>
+* There is no default value for this setting
+* Results are returned under a field using the table name
+
+*Specifying a single table*
+
+[source,ruby]
+-----
+input {
+  snmp {
+    hosts => [{host => "udp:127.0.0.1/161" community => "public" version => "2c"  retries => 2  timeout => 1000}]
+    tables => [ {"name" => "interfaces" "columns" => ["1.3.6.1.2.1.2.2.1.1", "1.3.6.1.2.1.2.2.1.2", "1.3.6.1.2.1.2.2.1.5"]} ]
+  }
+}
+-----
+
+*Specifying multiple tables*
+
+[source,ruby]
+-----
+input {
+  snmp {
+    get => ["1.3.6.1.2.1.1.1.0"]
+    tables => [ {"name" => "interfaces" "columns" => ["1.3.6.1.2.1.2.2.1.1", "1.3.6.1.2.1.2.2.1.2", "1.3.6.1.2.1.2.2.1.5"]}, {"name" => "ltmPoolStatTable" "columns" => ["1.3.6.1.4.1.3375.2.2.5.2.3.1.1", "1.3.6.1.4.1.3375.2.2.5.2.3.1.6"]} ]
+  }
+}
+-----
+
 ==== SNMPv3 Authentication Options
 
 A **single user** can be configured and will be used for all defined SNMPv3 hosts.
@@ -252,6 +300,25 @@ The `security_level` option specifies the SNMPv3 security level between Authenti
 * Value can be any of: `noAuthNoPriv`, `authNoPriv`, `authPriv`
 * There is no default value for this setting
 
+*Specifying SNMPv3 settings*
+
+[source,ruby]
+-----
+input {
+  snmp {
+    hosts => [{host => "udp:127.0.0.1/161" version => "3"}]
+    get => ["1.3.6.1.2.1.1.1.0"]
+    security_name => "mySecurityName"
+    auth_protocol => "sha"
+    auth_pass => "ShaPassword"
+    priv_protocol => "aes"
+    priv_pass => "AesPasword"
+    security_level => "authPriv"
+  }
+}
+
+-----
+
 ==== More configuration examples
 
 *Using both `get` and `walk` in the same poll cycle for each host(s)*

data/lib/logstash/inputs/snmp.rb

@@ -56,6 +56,12 @@ class LogStash::Inputs::Snmp < LogStash::Inputs::Base
   # as "1.3.6.1.2.mib-2.system.sysDescr.0" would become "mib-2.system.sysDescr.0"
   config :oid_root_skip, :validate => :number, :default => 0
 
+  # number of OID tail digits to retain in event field name. For example, in a numeric OID
+  # like 1.3.6.1.2.1.1.1.0" the last 2 digits could be retained by setting oid_path_length => 2
+  # which would result in a field name "1.0". Similarly, when a MIB is used an OID such as
+  # "1.3.6.1.2.mib-2.system.sysDescr.0" would become "sysDescr.0"
+  config :oid_path_length, :validate => :number, :default => 0
+
   # Set polling interval in seconds
   #
   # The default, `30`, means poll each host every 30 seconds.
@@ -95,6 +101,7 @@ class LogStash::Inputs::Snmp < LogStash::Inputs::Base
     validate_oids!
     validate_hosts!
     validate_tables!
+    validate_strip!
 
     mib = LogStash::SnmpMib.new
 
@@ -161,7 +168,7 @@ class LogStash::Inputs::Snmp < LogStash::Inputs::Base
         result = {}
         if !definition[:get].empty?
           begin
-            result = result.merge(definition[:client].get(definition[:get], @oid_root_skip))
+            result = result.merge(definition[:client].get(definition[:get], @oid_root_skip, @oid_path_length))
           rescue => e
             logger.error("error invoking get operation on #{definition[:host_address]} for OIDs: #{definition[:get]}, ignoring", :exception => e, :backtrace => e.backtrace)
           end
@@ -169,7 +176,7 @@ class LogStash::Inputs::Snmp < LogStash::Inputs::Base
         if  !definition[:walk].empty?
           definition[:walk].each do |oid|
             begin
-              result = result.merge(definition[:client].walk(oid, @oid_root_skip))
+              result = result.merge(definition[:client].walk(oid, @oid_root_skip, @oid_path_length))
             rescue => e
               logger.error("error invoking walk operation on OID: #{oid}, ignoring", :exception => e, :backtrace => e.backtrace)
             end
@@ -179,7 +186,7 @@ class LogStash::Inputs::Snmp < LogStash::Inputs::Base
         if  !Array(@tables).empty?
           @tables.each do |table_entry|
             begin
-              result = result.merge(definition[:client].table(table_entry, @oid_root_skip))
+              result = result.merge(definition[:client].table(table_entry, @oid_root_skip, @oid_path_length))
             rescue => e
               logger.error("error invoking table operation on OID: #{table_entry['name']}, ignoring", :exception => e, :backtrace => e.backtrace)
             end
@@ -205,7 +212,14 @@ class LogStash::Inputs::Snmp < LogStash::Inputs::Base
     end
   end
 
-  def stop
+  def close
+    @client_definitions.each do |definition|
+      begin
+        definition[:client].close
+      rescue => e
+        logger.warn("error closing client on #{definition[:host_address]}, ignoring", :exception => e)
+      end
+    end
   end
 
   private
@@ -277,4 +291,8 @@ class LogStash::Inputs::Snmp < LogStash::Inputs::Base
       end
     end
   end
+
+  def validate_strip!
+    raise(LogStash::ConfigurationError, "you can not specify both oid_root_skip and oid_path_length") if @oid_root_skip > 0 and @oid_path_length > 0
+  end
 end

data/lib/logstash/inputs/snmp/base_client.rb

@@ -3,49 +3,28 @@ require "logstash-input-snmp_jars.rb"
 
 require "logstash/util/loggable"
 
-java_import "org.snmp4j.CommunityTarget"
-java_import "org.snmp4j.PDU"
-java_import "org.snmp4j.ScopedPDU"
-java_import "org.snmp4j.Snmp"
-java_import "org.snmp4j.Target"
-java_import "org.snmp4j.TransportMapping"
-java_import "org.snmp4j.event.ResponseEvent"
-java_import "org.snmp4j.mp.SnmpConstants"
-java_import "org.snmp4j.smi.Address"
-java_import "org.snmp4j.smi.GenericAddress"
-java_import "org.snmp4j.smi.OID"
-java_import "org.snmp4j.smi.OctetString"
-java_import "org.snmp4j.smi.VariableBinding"
-java_import "org.snmp4j.transport.DefaultUdpTransportMapping"
-java_import "org.snmp4j.transport.DefaultTcpTransportMapping"
-java_import "org.snmp4j.util.TableUtils"
-java_import "org.snmp4j.util.TreeUtils"
-java_import "org.snmp4j.util.DefaultPDUFactory"
-java_import "org.snmp4j.asn1.BER"
-
 module LogStash
   class SnmpClientError < StandardError
   end
 
   class BaseSnmpClient
+    java_import "org.snmp4j.TransportMapping"
+    java_import "org.snmp4j.mp.SnmpConstants"
+    java_import "org.snmp4j.smi.OID"
+    java_import "org.snmp4j.smi.VariableBinding"
+    java_import "org.snmp4j.util.TableUtils"
+    java_import "org.snmp4j.util.TreeUtils"
+    java_import "org.snmp4j.asn1.BER"
+    java_import "org.snmp4j.transport.DefaultUdpTransportMapping"
+    java_import "org.snmp4j.transport.DefaultTcpTransportMapping"
+
     include LogStash::Util::Loggable
 
     def initialize(protocol, address, port, retries, timeout, mib)
-      transport = case protocol.to_s
-        when "udp"
-          DefaultUdpTransportMapping.new
-        when "tcp"
-          DefaultTcpTransportMapping.new
-        else
-          raise(SnmpClientError, "invalid transport protocol specified '#{protocol.to_s}', expecting 'udp' or 'tcp'")
-        end
-
       @mib = mib
-      @snmp = Snmp.new(transport)
-      transport.listen()
     end
 
-    def get(oids, strip_root = 0)
+    def get(oids, strip_root = 0, path_length = 0)
       pdu = get_pdu
       Array(oids).each { |oid| pdu.add(VariableBinding.new(OID.new(oid))) }
 
@@ -66,14 +45,13 @@ module LogStash
         variable = variable_binding.getVariable
         value = coerce(variable)
 
-        result[@mib.map_oid(oid, strip_root)] = value
+        result[@mib.map_oid(oid, strip_root, path_length)] = value
       end
 
       result
     end
 
-
-    def walk(oid, strip_root = 0)
+    def walk(oid, strip_root = 0, path_length = 0)
       result = {}
 
       pdufactory = get_pdu_factory
@@ -99,14 +77,14 @@ module LogStash
           variable = var_binding.getVariable
           value = coerce(variable)
 
-          result[@mib.map_oid(oid, strip_root)] = value
+          result[@mib.map_oid(oid, strip_root, path_length)] = value
         end
       end
 
       result
     end
 
-    def table(table, strip_root = 0)
+    def table(table, strip_root = 0, path_length = 0)
       result = {}
       rows = []
       pdufactory = get_pdu_factory
@@ -140,7 +118,7 @@ module LogStash
           oid = var_binding.getOid.toString
           variable = var_binding.getVariable
           value = coerce(variable)
-          mapped_oid = @mib.map_oid(oid, strip_root).sub('.'+idx_val, '')
+          mapped_oid = @mib.map_oid(oid, strip_root, path_length).chomp('.'+idx_val)
           row[mapped_oid] = value
         end
         rows << row
@@ -159,9 +137,9 @@ module LogStash
       case variable_syntax
         when BER::OCTETSTRING, BER::BITSTRING
           variable.toString
-        when BER::TIMETICKS, BER::COUNTER, BER::COUNTER32, BER::COUNTER64
+        when BER::TIMETICKS, BER::COUNTER, BER::COUNTER32, BER::COUNTER64, BER::GAUGE, BER::GAUGE32
           variable.toLong
-        when BER::INTEGER, BER::INTEGER32, BER::GAUGE, BER::GAUGE32
+        when BER::INTEGER, BER::INTEGER32
           variable.toInt
         when BER::IPADDRESS
           variable.toString
@@ -180,7 +158,6 @@ module LogStash
       end
     end
 
-
     def parse_version(version)
       case version.to_s
         when "3"
@@ -196,6 +173,17 @@ module LogStash
 
     private
 
+    def create_transport(protocol)
+      case protocol.to_s
+        when "udp"
+          DefaultUdpTransportMapping.new
+        when "tcp"
+          DefaultTcpTransportMapping.new
+        else
+          raise(SnmpClientError, "invalid transport protocol specified '#{protocol.to_s}', expecting 'udp' or 'tcp'")
+      end
+    end
+
     def get_pdu
       raise("abstract method")
     end

data/lib/logstash/inputs/snmp/client.rb

@@ -2,34 +2,33 @@ require "java"
 require "logstash-input-snmp_jars.rb"
 require_relative "base_client"
 
-java_import "org.snmp4j.CommunityTarget"
-java_import "org.snmp4j.PDU"
-java_import "org.snmp4j.ScopedPDU"
-java_import "org.snmp4j.Snmp"
-java_import "org.snmp4j.Target"
-java_import "org.snmp4j.TransportMapping"
-java_import "org.snmp4j.event.ResponseEvent"
-java_import "org.snmp4j.mp.SnmpConstants"
-java_import "org.snmp4j.smi.Address"
-java_import "org.snmp4j.smi.GenericAddress"
-java_import "org.snmp4j.smi.OID"
-java_import "org.snmp4j.smi.OctetString"
-java_import "org.snmp4j.smi.VariableBinding"
-java_import "org.snmp4j.transport.DefaultUdpTransportMapping"
-java_import "org.snmp4j.transport.DefaultTcpTransportMapping"
-java_import "org.snmp4j.util.TreeUtils"
-java_import "org.snmp4j.util.DefaultPDUFactory"
-java_import "org.snmp4j.asn1.BER"
-
 module LogStash
   class SnmpClient < BaseSnmpClient
 
+    java_import "org.snmp4j.CommunityTarget"
+    java_import "org.snmp4j.PDU"
+    java_import "org.snmp4j.ScopedPDU"
+    java_import "org.snmp4j.Snmp"
+    java_import "org.snmp4j.Target"
+    java_import "org.snmp4j.smi.Address"
+    java_import "org.snmp4j.smi.GenericAddress"
+    java_import "org.snmp4j.smi.OctetString"
+    java_import "org.snmp4j.util.DefaultPDUFactory"
+
     def initialize(protocol, address, port, community, version, retries, timeout, mib)
       super(protocol, address, port, retries, timeout, mib)
       raise(SnmpClientError, "SnmpClient is expecting verison '1' or '2c'") unless ["1", "2c"].include?(version.to_s)
+
+      @snmp = Snmp.new(create_transport(protocol))
+      @snmp.listen
+
       @target = build_target("#{protocol}:#{address}/#{port}", community, version, retries, timeout)
     end
 
+    def close
+      @snmp.close
+    end
+
     private
 
     def get_pdu

data/lib/logstash/inputs/snmp/clientv3.rb

@@ -1,43 +1,39 @@
 require 'java'
 require 'logstash-input-snmp_jars.rb'
 
-
-java_import 'org.snmp4j.PDU'
-java_import 'org.snmp4j.ScopedPDU'
-java_import 'org.snmp4j.Snmp'
-java_import 'org.snmp4j.Target'
-java_import 'org.snmp4j.TransportMapping'
-java_import 'org.snmp4j.event.ResponseEvent'
-java_import 'org.snmp4j.mp.MPv3'
-java_import 'org.snmp4j.mp.SnmpConstants'
-java_import 'org.snmp4j.security.AuthMD5'
-java_import 'org.snmp4j.security.AuthSHA'
-java_import 'org.snmp4j.security.AuthSHA2'
-java_import 'org.snmp4j.security.AuthHMAC128SHA224'
-java_import 'org.snmp4j.security.AuthHMAC192SHA256'
-java_import 'org.snmp4j.security.AuthHMAC256SHA384'
-java_import 'org.snmp4j.security.AuthHMAC384SHA512'
-java_import 'org.snmp4j.security.Priv3DES'
-java_import 'org.snmp4j.security.PrivDES'
-java_import 'org.snmp4j.security.PrivAES128'
-java_import 'org.snmp4j.security.PrivAES192'
-java_import 'org.snmp4j.security.PrivAES256'
-java_import 'org.snmp4j.security.SecurityModels'
-java_import 'org.snmp4j.security.SecurityProtocols'
-java_import 'org.snmp4j.security.USM'
-java_import 'org.snmp4j.security.UsmUser'
-java_import 'org.snmp4j.security.SecurityLevel'
-java_import 'org.snmp4j.smi.Address'
-java_import 'org.snmp4j.smi.GenericAddress'
-java_import 'org.snmp4j.smi.OID'
-java_import 'org.snmp4j.smi.OctetString'
-java_import 'org.snmp4j.transport.DefaultUdpTransportMapping'
-java_import 'org.snmp4j.transport.DefaultTcpTransportMapping'
-java_import 'org.snmp4j.UserTarget'
-java_import 'org.snmp4j.util.DefaultPDUFactory'
-
 module LogStash
+
   class SnmpClientV3 < BaseSnmpClient
+    java_import 'org.snmp4j.PDU'
+    java_import 'org.snmp4j.ScopedPDU'
+    java_import 'org.snmp4j.Snmp'
+    java_import 'org.snmp4j.Target'
+    java_import 'org.snmp4j.event.ResponseEvent'
+    java_import 'org.snmp4j.mp.SnmpConstants'
+    java_import 'org.snmp4j.security.AuthMD5'
+    java_import 'org.snmp4j.security.AuthSHA'
+    java_import 'org.snmp4j.security.AuthSHA2'
+    java_import 'org.snmp4j.security.AuthHMAC128SHA224'
+    java_import 'org.snmp4j.security.AuthHMAC192SHA256'
+    java_import 'org.snmp4j.security.AuthHMAC256SHA384'
+    java_import 'org.snmp4j.security.AuthHMAC384SHA512'
+    java_import 'org.snmp4j.security.Priv3DES'
+    java_import 'org.snmp4j.security.PrivDES'
+    java_import 'org.snmp4j.security.PrivAES128'
+    java_import 'org.snmp4j.security.PrivAES192'
+    java_import 'org.snmp4j.security.PrivAES256'
+    java_import 'org.snmp4j.security.UsmUser'
+    java_import 'org.snmp4j.security.SecurityLevel'
+    java_import 'org.snmp4j.security.SecurityModels'
+    java_import 'org.snmp4j.security.SecurityProtocols'
+    java_import 'org.snmp4j.security.USM'
+    java_import 'org.snmp4j.smi.Address'
+    java_import 'org.snmp4j.smi.GenericAddress'
+    java_import 'org.snmp4j.smi.OctetString'
+    java_import 'org.snmp4j.UserTarget'
+    java_import 'org.snmp4j.util.DefaultPDUFactory'
+    java_import 'org.snmp4j.mp.MPv3'
+    java_import "org.snmp4j.MessageDispatcherImpl"
 
     def initialize(protocol, address, port, retries, timeout, mib, security_name, auth_protocol, auth_pass, priv_protocol, priv_pass, security_level)
       super(protocol, address, port, retries, timeout, mib)
@@ -49,13 +45,29 @@ module LogStash
       auth_pass = auth_pass.nil? ? nil : OctetString.new(auth_pass)
       priv_pass = priv_pass.nil? ? nil : OctetString.new(priv_pass)
 
-      usm = USM.new(SecurityProtocols.getInstance, OctetString.new(MPv3.createLocalEngineID), 0)
+      engine_id = OctetString.new(MPv3.createLocalEngineID)
+
+      security_protocols = SecurityProtocols.getInstance
+      security_protocols.addDefaultProtocols
+
+      usm = USM.new(security_protocols, engine_id, 0)
+      usm.addUser(UsmUser.new(security_name, auth_protocol, auth_pass, priv_protocol, priv_pass))
+
       SecurityModels.getInstance.addSecurityModel(usm)
 
-      @snmp.getUSM.addUser(UsmUser.new(security_name, auth_protocol, auth_pass, priv_protocol, priv_pass))
+      dispatcher = MessageDispatcherImpl.new
+      dispatcher.addMessageProcessingModel(MPv3.new(usm))
+
+      @snmp =  Snmp.new(dispatcher, create_transport(protocol))
+      @snmp.listen
+
       @target = build_target("#{protocol}:#{address}/#{port}", security_name, security_level, retries, timeout)
     end
 
+    def close
+      @snmp.close
+    end
+
     private
 
     def build_target(address, name, seclevel, retries, timeout)

data/lib/logstash/inputs/snmp/mib.rb

@@ -69,7 +69,7 @@ module LogStash
         current.childs[last_node] = node
       end
 
-      def map_oid(oid, strip_root = 0)
+      def map_oid(oid, strip_root = 0, path_length = 0)
         path = Oid.parse(oid)
 
         result = []
@@ -88,7 +88,13 @@ module LogStash
           result << node.name
         end
 
-        result.drop(strip_root).join(".")
+	if strip_root > 0
+	  result.drop(strip_root).join(".")
+	elsif path_length > 0
+	  result.pop(path_length).join(".")
+	else
+	  result.join(".")
+	end
       end
     end
 
@@ -136,8 +142,8 @@ module LogStash
       [module_name, nodes]
     end
 
-    def map_oid(oid, strip_root = 0)
-      @tree.map_oid(oid, strip_root)
+    def map_oid(oid, strip_root = 0, path_length = 0)
+      @tree.map_oid(oid, strip_root, path_length)
     end
 
     private

data/logstash-input-snmp.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'logstash-input-snmp'
-  s.version       = '1.1.0'
+  s.version       = '1.2.4'
   s.licenses      = ['Apache-2.0']
   s.summary       = "SNMP input plugin"
   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

@@ -2,11 +2,14 @@
 require "logstash/devutils/rspec/spec_helper"
 require "logstash/inputs/snmp/base_client"
 
-java_import "org.snmp4j.smi.AbstractVariable"
-java_import "org.snmp4j.smi.SMIConstants"
-
 module LogStash
 
+  java_import "org.snmp4j.asn1.BER"
+  java_import "org.snmp4j.smi.AbstractVariable"
+  java_import "org.snmp4j.smi.SMIConstants"
+  java_import "org.snmp4j.smi.Gauge32"
+  java_import "org.snmp4j.smi.Integer32"
+
   class TestableBaseSnmpClient < BaseSnmpClient
     def coerce(*args)
       super(*args)
@@ -33,6 +36,18 @@ module LogStash
         expect(subject).to receive(:logger).exactly(1).times.and_call_original
         expect(subject.coerce(v)).to eq("error: unknown variable syntax 130, EndOfMibView")
       end
+
+      it "should handle max unsigned 32 bits integer GAUGE32" do
+        MAX_UNSIGNED_INT_32 = 4294967295
+        v = Gauge32.new(MAX_UNSIGNED_INT_32)
+        expect(subject.coerce(v)).to eq(MAX_UNSIGNED_INT_32)
+      end
+
+      it "should handle max signed 32 bits integer INTEGER32" do
+        MAX_SIGNED_INT_32 = 2147483647
+        v = Integer32.new(MAX_SIGNED_INT_32)
+        expect(subject.coerce(v)).to eq(MAX_SIGNED_INT_32)
+      end
     end
   end
-end
+end

data/spec/inputs/snmp_spec.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 require "logstash/devutils/rspec/spec_helper"
+require "logstash/devutils/rspec/shared_examples"
 require "logstash/inputs/snmp"
 
 describe LogStash::Inputs::Snmp do
@@ -14,6 +15,8 @@ describe LogStash::Inputs::Snmp do
     before do
       expect(LogStash::SnmpClient).to receive(:new).and_return(mock_client)
       expect(mock_client).to receive(:get).and_return({})
+      # devutils in v6 calls close on the test pipelines while it does not in v7+
+      expect(mock_client).to receive(:close).at_most(:once)
     end
   end
 
@@ -22,6 +25,8 @@ describe LogStash::Inputs::Snmp do
         [
             {"get" => ["1.3.6.1.2.1.1.1.0"], "hosts" => [{"host" => "udp:127.0.0.1/161"}]},
             {"get" => [".1.3.6.1.2.1.1.1.0"], "hosts" => [{"host" => "udp:127.0.0.1/161"}]},
+            {"get" => [".1.3.6.1.2.1.1.1.0"], "hosts" => [{"host" => "udp:127.0.0.1/161"}], "oid_root_skip" => 2},
+            {"get" => [".1.3.6.1.2.1.1.1.0"], "hosts" => [{"host" => "udp:127.0.0.1/161"}], "oid_path_length" => 2},
             {"get" => ["1.3.6.1.2.1.1.1.0", "1.3.6.1.2.1.1"], "hosts" => [{"host" => "udp:127.0.0.1/161"}]},
             {"get" => ["1.3.6.1.2.1.1.1.0", ".1.3.6.1.2.1.1"], "hosts" => [{"host" => "udp:127.0.0.1/161"}]},
             {"walk" => ["1.3.6.1.2.1.1.1"], "hosts" => [{"host" => "udp:127.0.0.1/161"}]},
@@ -35,6 +40,8 @@ describe LogStash::Inputs::Snmp do
           {"get" => ["test"], "hosts" => [{"host" => "udp:127.0.0.1/161"}]},
           {"get" => [], "hosts" => [{"host" => "udp:127.0.0.1/161"}]},
           {"get" => "foo", "hosts" => [{"host" => "udp:127.0.0.1/161"}]},
+          {"get" => [".1.3.6.1.2.1.1.1.0"], "hosts" => [{"host" => "udp:127.0.0.1/161"}], "oid_path_length" => "a" },
+          {"get" => [".1.3.6.1.2.1.1.1.0"], "hosts" => [{"host" => "udp:127.0.0.1/161"}], "oid_path_length" => 2, "oid_root_skip" => 2 },
           {"walk" => "foo", "hosts" => [{"host" => "udp:127.0.0.1/161"}]},
           {"tables" => [{"columns" => ["1.2.3.4", "4.3.2.1"]}], "hosts" => [{"host" => "udp:127.0.0.1/161"}]},
       ]
@@ -123,6 +130,8 @@ describe LogStash::Inputs::Snmp do
     before do
       expect(LogStash::SnmpClient).to receive(:new).and_return(mock_client)
       expect(mock_client).to receive(:get).and_return({"foo" => "bar"})
+      # devutils in v6 calls close on the test pipelines while it does not in v7+
+      expect(mock_client).to receive(:close).at_most(:once)
     end
 
     it "shoud add @metadata fields and add default host field" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-snmp
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.4
 platform: ruby
 authors:
 - Elasticsearch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-03-28 00:00:00.000000000 Z
+date: 2020-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement