logstash-codec-sflow 0.11.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d0ad6c9ef2cf42d5f3cd57608c6cd98390026ae
-  data.tar.gz: a8a12e30f58dc856041faa94e8a11ce4217d90aa
+  metadata.gz: 5074ee2cb3fc307fe88e094cec33ae46d17ba96b
+  data.tar.gz: f22772698c0de3757d7428d954effedc9cd21d1e
 SHA512:
-  metadata.gz: 7bb344ce75c3436645c45ac3bc365172ee58c319e5f1509c650d4fecf84824084804d22866ca91ab67915a56b32e9ecc154d0a22d2f51003907526f5ffc95498
-  data.tar.gz: e6b3b1e3a29bdb6f34b8cf49dd2933df8c3d013232ad88ea642f3d3cc61e890cd60cccb7c3928903124d95fc140fad8e061c005c41433ef3f5e8ed0b905f95b3
+  metadata.gz: a028d13f047b1d5c4a92a0b2507e07e2c064ee408577d86a9eb219595e48ad8b51c4111568af5918a0dc1f6c6e9a6f4736333e214c7407d159775ea0855a7a9f
+  data.tar.gz: 8d811f0bfbff45fae54c52dbb3384789207145e6b4bbb2288ecc02dd61f0e2bc95c88934ba6e500ba92d8635e6394cd62307504d0e73e126e99c4ac688abea41

data/lib/logstash/codecs/sflow.rb

@@ -61,17 +61,19 @@ class LogStash::Codecs::Sflow < LogStash::Codecs::Base
 
   def snmp_call(event)
     if @snmp_interface
-      if event.include?('source_id_index')
-        event["source_id_index_descr"] = @snmp.get_interface(event["agent_ip"], event["source_id_index"])
-      end
-      if event.include?('input_interface')
-        event["input_interface_descr"] = @snmp.get_interface(event["agent_ip"], event["input_interface"])
-      end
-      if event.include?('output_interface')
-        event["output_interface_descr"] = @snmp.get_interface(event["agent_ip"], event["output_interface"])
-      end
-      if event.include?('interface_index')
-        event["interface_index_descr"] = @snmp.get_interface(event["agent_ip"], event["interface_index"])
+      if event.include?('source_id_type') and event['source_id_type'].to_s == '0'
+        if event.include?('source_id_index')
+          event["source_id_index_descr"] = @snmp.get_interface(event["agent_ip"], event["source_id_index"])
+        end
+        if event.include?('input_interface')
+          event["input_interface_descr"] = @snmp.get_interface(event["agent_ip"], event["input_interface"])
+        end
+        if event.include?('output_interface')
+          event["output_interface_descr"] = @snmp.get_interface(event["agent_ip"], event["output_interface"])
+        end
+        if event.include?('interface_index')
+          event["interface_index_descr"] = @snmp.get_interface(event["agent_ip"], event["interface_index"])
+        end
       end
     end
   end
@@ -86,7 +88,7 @@ class LogStash::Codecs::Sflow < LogStash::Codecs::Base
  sample_length sample_count sample_header data storage) | @optional_removed_field
 
     if @snmp_interface
-      @snmp = SNMPInterfaceResolver.new(@snmp_community, @interface_cache_size, @interface_cache_ttl)
+      @snmp = SNMPInterfaceResolver.new(@snmp_community, @interface_cache_size, @interface_cache_ttl, @logger)
     end
   end
 

data/lib/logstash/codecs/snmp/interface_resolver.rb

@@ -1,21 +1,28 @@
-require 'snmp'
-require 'lru_redux'
-
-class SNMPInterfaceResolver
-  def initialize(community, cache_size, cache_ttl)
-    @community = community
-    @cacheSnmpInterface = LruRedux::TTL::Cache.new(cache_size, cache_ttl)
-  end
-
-  def get_interface(host, ifIndex)
-    unless @cacheSnmpInterface.key?("#{host}-#{ifIndex}")
-      SNMP::Manager.open(:host => host, :community => @community, :version => :SNMPv2c) do |manager|
-        response = manager.get("ifDescr.#{ifIndex}")
-        response.each_varbind do |vb|
-          @cacheSnmpInterface["#{host}-#{ifIndex}"] = vb.value.to_s
-        end
-      end
-    end
-    return @cacheSnmpInterface["#{host}-#{ifIndex}"]
-  end
+require 'snmp'
+require 'lru_redux'
+
+class SNMPInterfaceResolver
+  def initialize(community, cache_size, cache_ttl, logger)
+    @community = community
+    @cacheSnmpInterface = LruRedux::TTL::Cache.new(cache_size, cache_ttl)
+    @logger = logger
+  end
+
+  def get_interface(host, ifIndex)
+    unless @cacheSnmpInterface.key?("#{host}-#{ifIndex}")
+      begin
+        SNMP::Manager.open(:host => host, :community => @community, :version => :SNMPv2c) do |manager|
+          @cacheSnmpInterface["#{host}-#{ifIndex}"] = manager.get_value("ifDescr.#{ifIndex}").to_s
+        end
+      rescue SNMP::RequestTimeout => e
+        # This is not the best but it avoids loosing lots of events when facing
+        # request timeout exception with input thread restarting.
+        # Then we can easily detect this on the log or on elasticsearch
+        # searching for SnmpRequestTimeout descr fields
+        @logger.error("Timeout requesting description on #{host} of index #{ifIndex}: #{e.message}")
+        return "SnmpRequestTimeout"
+      end
+    end
+    return @cacheSnmpInterface["#{host}-#{ifIndex}"]
+  end
 end

data/logstash-codec-sflow.gemspec

@@ -1,14 +1,14 @@
 Gem::Specification.new do |s|
 
   s.name = 'logstash-codec-sflow'
-  s.version = '0.11.0'
+  s.version = '1.0.0'
   s.licenses = ['Apache License (2.0)']
-  s.summary = "The sflow codec is for decoding SFlow v5 flows."
-  s.description = "This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program"
-  s.authors = ["Nicolas Fraison"]
+  s.summary = 'The sflow codec is for decoding SFlow v5 flows.'
+  s.description = 'This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program'
+  s.authors = ['Nicolas Fraison']
   s.email = ''
-  s.homepage = ""
-  s.require_paths = ["lib"]
+  s.homepage = ''
+  s.require_paths = ['lib']
 
   # Files
   s.files = Dir['lib/**/*', 'spec/**/*', 'vendor/**/*', '*.gemspec', '*.md', 'CONTRIBUTORS', 'Gemfile', 'LICENSE', 'NOTICE.TXT']
@@ -17,10 +17,10 @@ Gem::Specification.new do |s|
   s.test_files = s.files.grep(%r{^(test|spec|features)/})
 
   # Special flag to let us know this is actually a logstash plugin
-  s.metadata = {"logstash_plugin" => "true", "logstash_group" => "codec"}
+  s.metadata = {'logstash_plugin' => 'true', 'logstash_group' => 'codec'}
 
   # Gem dependencies
-  s.add_runtime_dependency "logstash-core", ">= 1.4.0", "< 3.0.0"
+  s.add_runtime_dependency 'logstash-core', '>= 1.4.0', '< 3.0.0'
   s.add_runtime_dependency 'bindata', ['>= 2.1.0']
   s.add_runtime_dependency 'lru_redux', ['>= 1.1.0']
   s.add_runtime_dependency 'snmp', ['>= 1.2.0']

metadata

@@ -1,22 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: logstash-codec-sflow
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Nicolas Fraison
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-01-03 00:00:00.000000000 Z
+date: 2016-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.4.0
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: 3.0.0
   name: logstash-core
@@ -24,16 +24,16 @@ dependencies:
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.4.0
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.1.0
   name: bindata
@@ -41,13 +41,13 @@ dependencies:
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.1.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.1.0
   name: lru_redux
@@ -55,13 +55,13 @@ dependencies:
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.2.0
   name: snmp
@@ -69,13 +69,13 @@ dependencies:
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.2.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   name: logstash-devutils
@@ -83,7 +83,7 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program
@@ -130,17 +130,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5
 signing_key:
 specification_version: 4
 summary: The sflow codec is for decoding SFlow v5 flows.