logstash-codec-sflow 1.2.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 307b3bbb49f77d52cbb9023618a96380643e2f63
-  data.tar.gz: d67f56b26b6536e8753ccef03dfd4d916e5744a5
+  metadata.gz: 1b9707ef71fadbd7c248df7191a55ed18255b5b5
+  data.tar.gz: 9845de886391e418641adb414ffccdb6623ff541
 SHA512:
-  metadata.gz: 859b926b3d5ab6e1d4235b50181d0e7cc33f41da28043812b4e836df0efaadbf762032723d11016669ea941605475a4c46367f734b91e17adc51e7a2ec29521e
-  data.tar.gz: 5ab9bc2e21c51911cb0558cdd6520152ee53aeec58d3b20bd53396937fa6a83a180fd16fabdf7e5fb53a8ca1980855662e1ddf753339c66de6ddfef0c8f8d33c
+  metadata.gz: 0332a09122db2a8a7d630f5caf3b74c1be36b3a27b8d1d06f7e4435645444ea6e14e01f8c78d0e35297d36b3ab1d819011438be8e9f82fdb15f694f237156662
+  data.tar.gz: d06f4c2537313dcb09594e98fb27fd5ff95c6aae14cbdf8ce8e9e6cdf6f57dda22121a559b8904637994978c1f538bf62c8d6c7518a68c9163cf8b507da9c66f

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # logstash-codec-sflow Changelog
 
+## Version 2.0.0 (2016-11-02)
+
+* Update for LS 5.0
+
 ## Version 1.2.1 (2016-11-02)
 
 * Add management of LAG counters: http://www.sflow.org/sflow_lag.txt

data/lib/logstash/codecs/sflow.rb

@@ -42,7 +42,7 @@ class LogStash::Codecs::Sflow < LogStash::Codecs::Base
           assign_key_value(event, bindata_kv[k])
         else
           unless @removed_field.include? k.to_s or v.is_a?(BinData::Array)
-            event["#{k.to_s}"] = v.to_s
+            event.set("#{k.to_s}", v.to_s)
           end
         end
       end
@@ -54,7 +54,7 @@ class LogStash::Codecs::Sflow < LogStash::Codecs::Base
   # @param [Object] sample
   # @param [Object] record
   def common_sflow(event, decoded, sample)
-    event['agent_ip'] = decoded['agent_ip'].to_s
+    event.set('agent_ip', decoded['agent_ip'].to_s)
     assign_key_value(event, decoded)
     assign_key_value(event, sample)
   end
@@ -63,16 +63,16 @@ class LogStash::Codecs::Sflow < LogStash::Codecs::Base
     if @snmp_interface
       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"])
+          event.set('source_id_index_descr', @snmp.get_interface(event.get('agent_ip'), event.get('source_id_index')))
         end
         if event.include?('input_interface')
-          event["input_interface_descr"] = @snmp.get_interface(event["agent_ip"], event["input_interface"])
+          event.set('input_interface_descr', @snmp.get_interface(event.get('agent_ip'), event.get('input_interface')))
         end
         if event.include?('output_interface')
-          event["output_interface_descr"] = @snmp.get_interface(event["agent_ip"], event["output_interface"])
+          event.set('output_interface_descr', @snmp.get_interface(event.get('agent_ip'), event.get('output_interface')))
         end
         if event.include?('interface_index')
-          event["interface_index_descr"] = @snmp.get_interface(event["agent_ip"], event["interface_index"])
+          event.set('interface_index_descr', @snmp.get_interface(event.get('agent_ip'), event.get('interface_index')))
         end
       end
     end
@@ -133,13 +133,13 @@ class LogStash::Codecs::Sflow < LogStash::Codecs::Base
         end
         #compute frame_length_times_sampling_rate
         if event.include?('frame_length') and event.include?('sampling_rate')
-          event["frame_length_times_sampling_rate"] = event['frame_length'].to_i * event['sampling_rate'].to_i
+          event.set('frame_length_times_sampling_rate', event.get('frame_length').to_i * event.get('sampling_rate').to_i)
         end
 
         if sample['sample_format'] == 1
-          event["sflow_type"] = 'flow_sample'
+          event.set('sflow_type', 'flow_sample')
         else
-          event["sflow_type"] = 'expanded_flow_sample'
+          event.set('sflow_type', 'expanded_flow_sample')
         end
 
         #Get interface dfescr if snmp_interface true
@@ -163,9 +163,9 @@ class LogStash::Codecs::Sflow < LogStash::Codecs::Base
           assign_key_value(event, record)
 
           if sample['sample_format'] == 2
-            event["sflow_type"] = 'counter_sample'
+            event.set('sflow_type', 'counter_sample')
           else
-            event["sflow_type"] = 'expanded_counter_sample'
+            event.set('sflow_type', 'expanded_counter_sample')
           end
 
 

data/logstash-codec-sflow.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name = 'logstash-codec-sflow'
-  s.version = '1.2.1'
+  s.version = '2.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'
@@ -20,10 +20,10 @@ Gem::Specification.new do |s|
   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 'bindata', ['>= 2.3.0']
-  s.add_runtime_dependency 'lru_redux', ['>= 1.1.0']
-  s.add_runtime_dependency 'snmp', ['>= 1.2.0']
+  s.add_runtime_dependency 'logstash-core-plugin-api', '>= 1.60', '<= 2.99'
+  s.add_runtime_dependency 'bindata', ['~> 2.3']
+  s.add_runtime_dependency 'lru_redux', ['~> 1.1']
+  s.add_runtime_dependency 'snmp', ['~> 1.2']
   s.add_development_dependency 'logstash-devutils'
 end
 

data/spec/codecs/sflow/packet_header_spec.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require "logstash/devutils/rspec/spec_helper"
+#require "logstash/devutils/rspec/spec_helper"
 require "logstash/codecs/sflow/packet_header"
 
 describe UdpHeader do

data/spec/codecs/sflow_spec.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require "logstash/devutils/rspec/spec_helper"
+#require "logstash/devutils/rspec/spec_helper"
 require "logstash/codecs/sflow"
 require "logstash/codecs/sflow/datagram"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-codec-sflow
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Nicolas Fraison
@@ -15,63 +15,63 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
-    - - "<"
+        version: '1.60'
+    - - "<="
       - !ruby/object:Gem::Version
-        version: 3.0.0
-  name: logstash-core
+        version: '2.99'
+  name: logstash-core-plugin-api
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
-    - - "<"
+        version: '1.60'
+    - - "<="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '2.99'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '2.3'
   name: bindata
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.1'
   name: lru_redux
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.2'
   name: snmp
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -141,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.8
+rubygems_version: 2.6.6
 signing_key:
 specification_version: 4
 summary: The sflow codec is for decoding SFlow v5 flows.