logstash-codec-nmap 0.0.11 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebf05a1ad0bf425d2a15b825abf327e0a1a77647
-  data.tar.gz: 45f9bd20918f3650de8ba7b6f3cd443bc7bf32ab
+  metadata.gz: c4283b1e2e5d98d0059a583a7ce15da6556c3863
+  data.tar.gz: ae28a0e2d6175d454aaf4b0d865d262599479359
 SHA512:
-  metadata.gz: c4a1b180f4390fc46f9e8b16d67df42c8ec0bb38297701a03c8ca3ca5fc434eb36f535286f7c4b77e269631d5a64dded66bec6f618ecc5a205ac7a3ce56f7e2d
-  data.tar.gz: 7d87b7c877292beffc5aa60f649a96dcaee8302ed0a22c01d7aaeb539b598c0934e2e258361d9d981c48d10f6e2cf85c1caf214914cf1fec797c18bc0a5d5a36
+  metadata.gz: 50a779318b18519ec4d2260635420e05678318b859be479e0f3b1b0d8993dcce69aa193299fd7a01f442f881eb6c8c7961576f7bcd5dee346713d9f67f817bda
+  data.tar.gz: f30d57dc4a61e340c24262842bdc424baefc84e4f54badb87089a68aa1c02eda626b62ff727b8a75ba93bdb432fe5c77a4a13835ba92fb495ad245f225069dcd

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+# 0.0.15
+  - Depend on logstash-core-plugin-api instead of logstash-core, removing the need to mass update plugins on major releases of logstash
+# 0.0.14
+  - New dependency requirements for logstash-core for the 5.0 release
+## 0.0.13
+  - Actually include 'times' element
+## 0.0.12
+  - Improve mapping examples
+  - Fix IDs for nmap_scan_metadata
 ## 0.0.11
   - Add start/end times for nmap_scan_metadata documents
 ## 0.0.10

data/lib/logstash/codecs/nmap.rb

@@ -53,11 +53,12 @@ class LogStash::Codecs::Nmap < LogStash::Codecs::Base
 
     if @emit_scan_metadata
         yield LogStash::Event.new(base.merge({
+          'id' => scan_id,
           'type' => 'nmap_scan_metadata',
           'host_stats' => scan_host_stats,
-          'run_stats' =>  run_stats,
           'start_time' => timeify(xml.scanner.start_time),
-          'end_time' => run_stats["finished"]["time"]
+          'end_time' => run_stats["finished"]["time"],
+          'run_stats' =>  hashify_run_stats(xml.run_stats.first)
         }))
     end
 
@@ -122,6 +123,10 @@ class LogStash::Codecs::Nmap < LogStash::Codecs::Base
     h['start_time'] = timeify(host.start_time, scan_start)
     h['end_time'] = timeify(host.end_time, scan_start)
 
+    # Needs to be pached in ruby-nmap
+    times = host.instance_variable_get(:@node).xpath("times").first
+    h['times'] = Hash[times.first.map {|k,v| [k,v.to_i]}] if times
+
     # These two are actually different.
     # Address may contain a MAC, addresses will not AFAICT
     h['addresses'] = hashify_structs(host.addresses)
@@ -139,6 +144,12 @@ class LogStash::Codecs::Nmap < LogStash::Codecs::Base
     h
   end
 
+  def hashify_run_stats(run_stats)
+    h = hashify_struct(run_stats)
+    h["elapsed"] = h["elapsed"].to_f
+    h
+  end
+
   def hashify_status(status)
     return unless status
 
@@ -246,7 +257,7 @@ class LogStash::Codecs::Nmap < LogStash::Codecs::Base
   end
 
   def hashify_struct(struct)
-    Hash[struct.each_pair.map {|k,v| [k, de_keyword(v)]}]
+    Hash[struct.each_pair.map {|k,v| [de_keyword(k), de_keyword(v)]}]
   end
 
   def de_keyword(value)

data/logstash-codec-nmap.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-codec-nmap'
-  s.version         = '0.0.11'
+  s.version         = '0.0.15'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "This codec may be used to decode Nmap XML"
   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,7 +20,7 @@ Gem::Specification.new do |s|
   s.metadata = { "logstash_plugin" => "true", "logstash_group" => "codec" }
 
   # Gem dependencies
-  s.add_runtime_dependency "logstash-core", ">= 2.0.0", "< 3.0.0"
+  s.add_runtime_dependency "logstash-core-plugin-api", "~> 1.0"
   s.add_runtime_dependency 'ruby-nmap'
 
   s.add_development_dependency 'logstash-devutils'

data/spec/codecs/nmap_spec.rb

@@ -27,6 +27,15 @@ describe LogStash::Codecs::Nmap do
           expect(event).to be_a(LogStash::Event)
         end
       end
+
+      let(:ids) { subject.map {|e| e["id"] } }
+      it "should add a unique id field to all events" do
+        expect(ids).to eql(ids.uniq)
+      end
+
+      it "should not have any null id fields" do
+        expect(ids.include?(nil)).to be_falsey
+      end
     end
 
     describe "parsing traceroutes" do

metadata

@@ -1,63 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: logstash-codec-nmap
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.15
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-01-27 00:00:00.000000000 Z
+date: 2016-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: logstash-core
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: 3.0.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-    - - <
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '1.0'
+  name: logstash-core-plugin-api
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: ruby-nmap
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: ruby-nmap
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: logstash-devutils
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: logstash-devutils
   prerelease: false
   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
 email: info@elastic.co
 executables: []
@@ -94,12 +88,12 @@ 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: []