logstash-input-beats 6.0.11-java → 6.1.1-java

data/spec/integration/logstash_forwarder_spec.rb

@@ -74,7 +74,7 @@ describe "Logstash-Forwarder", :integration => true do
   context "TLS" do
     context "Server Verification" do
       let(:input_config) do
-        super.merge({
+        super().merge({
           "ssl" => true,
           "ssl_certificate" => certificate_file,
           "ssl_key" => certificate_key_file,

data/spec/support/logstash_test.rb

@@ -13,6 +13,13 @@ module BeatsInputTest
 
       system("openssl req -x509  -batch -nodes -newkey rsa:2048 -keyout #{ssl_key} -out #{ssl_cert} -subj /CN=localhost > /dev/null 2>&1")
     end
+
+    def p12_key
+      p12_key = Stud::Temporary.pathname("p12_key")
+      system "openssl pkcs12 -export -passout pass:123 -inkey #{ssl_key} -in #{ssl_cert} -out #{p12_key}"
+      p12_key
+    end
+
   end
 
   class << self

data/spec/support/shared_examples.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-shared_examples "Common Event Transformation" do
+shared_examples "Common Event Transformation" do |ecs_compatibility, host_field_name|
   let(:tag) { "140-rpm-beats" }
   let(:config) do
     {
@@ -21,17 +21,23 @@ shared_examples "Common Event Transformation" do
     }
   end
 
+  def key_as_nested_maps(key, value)
+    evt = LogStash::Event.new
+    evt.set(key, value)
+    evt.to_hash_with_metadata
+  end
+
   it "adds configured tags to the event" do
     expect(subject.get("tags")).to include(tag)
   end
 
   context 'when add_hostname is true' do
-    let(:config) { super.merge({'add_hostname' => true})}
+    let(:config) { super().merge({'add_hostname' => true, 'ecs_compatibility' => ecs_compatibility})}
 
     context 'when a host is provided in beat.host.name' do
       let(:already_exist) { "already_exist" }
       let(:producer_host) { "newhost01" }
-      let(:event_map) { super.merge({ "beat" => { "host" => {"name" => producer_host }}}) }
+      let(:event_map) { super().merge({ "beat" => { "host" => {"name" => producer_host }}}) }
 
       context "when no `host` key already exists on the event" do
         it "does not set the host value" do
@@ -41,7 +47,7 @@ shared_examples "Common Event Transformation" do
 
       context "when `host` key exists on the event" do
         let(:already_exist) { "already_exist" }
-        let(:event_map) { super.merge({ "host" => already_exist }) }
+        let(:event_map) { super().merge({ "host" => already_exist }) }
 
         it "doesn't override it" do
           expect(subject.get("host")).to eq(already_exist)
@@ -51,99 +57,99 @@ shared_examples "Common Event Transformation" do
 
     context "when a host is set in `beat.hostname`" do
       let(:producer_host) { "newhost01" }
-      let(:event_map) { super.merge({ "beat" => { "hostname" => producer_host }}) }
+      let(:event_map) { super().merge({ "beat" => { "hostname" => producer_host }}) }
 
-      context "when no `host` key already exists on the event" do
-        it "copies the value in `beat.hostname` to `host`" do
-          expect(subject.get("host")).to eq(producer_host)
+      context "when no `#{host_field_name}` key already exists on the event" do
+        it "copies the value in `beat.hostname` to `#{host_field_name}`" do
+          expect(subject.get(host_field_name)).to eq(producer_host)
         end
       end
 
-      context "when `host` key exists on the event" do
+      context "when `#{host_field_name}` key exists on the event" do
         let(:already_exist) { "already_exist" }
-        let(:event_map) { super.merge({ "host" => already_exist }) }
+        let(:event_map) { super().merge(key_as_nested_maps(host_field_name, already_exist)) }
 
         it "doesn't override it" do
-          expect(subject.get("host")).to eq(already_exist)
+          expect(subject.get(host_field_name)).to eq(already_exist)
         end
       end
     end
 
     context "when no host is provided in beat" do
-      context "when no `host` key already exists on the event" do
+      context "when no `#{host_field_name}` key already exists on the event" do
         it "does not set the host" do
-          expect(subject.get("host")).to be_nil
+          expect(subject.get(host_field_name)).to be_nil
         end
       end
 
-      context "when `host` key already exists on the event" do
+      context "when `#{host_field_name}` key already exists on the event" do
         let(:already_exist) { "already_exist" }
-        let(:event_map) { super.merge({ "host" => already_exist }) }
+        let(:event_map) { super().merge(key_as_nested_maps(host_field_name, already_exist)) }
 
         it "doesn't override it" do
-          expect(subject.get("host")).to eq(already_exist)
+          expect(subject.get(host_field_name)).to eq(already_exist)
         end
       end
     end
   end
 
   context 'when add hostname is false' do
-    let(:config) { super.merge({'add_hostname' => false})}
+    let(:config) { super().merge({'add_hostname' => false})}
 
     context 'when a host is provided in beat.host.name' do
       let(:already_exist) { "already_exist" }
       let(:producer_host) { "newhost01" }
-      let(:event_map) { super.merge({ "beat" => { "host" => {"name" => producer_host }}}) }
+      let(:event_map) { super().merge({ "beat" => { "host" => {"name" => producer_host }}}) }
 
-      context "when no `host` key already exists on the event" do
+      context "when no `#{host_field_name}` key already exists on the event" do
         it "does not set the host" do
-          expect(subject.get("host")).to be_nil
+          expect(subject.get(host_field_name)).to be_nil
         end
       end
 
-      context "when `host` key already exists on the event" do
+      context "when `#{host_field_name}` key already exists on the event" do
         let(:already_exist) { "already_exist" }
-        let(:event_map) { super.merge({ "host" => already_exist }) }
+        let(:event_map) { super().merge(key_as_nested_maps(host_field_name, already_exist)) }
 
         it "doesn't override it" do
-          expect(subject.get("host")).to eq(already_exist)
+          expect(subject.get(host_field_name)).to eq(already_exist)
         end
       end
     end
 
     context "when a host is provided in `beat.hostname`" do
       let(:producer_host) { "newhost01" }
-      let(:event_map) { super.merge({ "beat" => { "hostname" => producer_host }}) }
+      let(:event_map) { super().merge({ "beat" => { "hostname" => producer_host }}) }
 
-      context "when no `host` key already exists on the event" do
+      context "when no `#{host_field_name}` key already exists on the event" do
         it "does not set the host" do
-          expect(subject.get("host")).to be_nil
+          expect(subject.get(host_field_name)).to be_nil
         end
       end
 
       context "when `host` key already exists on the event" do
         let(:already_exist) { "already_exist" }
-        let(:event_map) { super.merge({ "host" => already_exist }) }
+        let(:event_map) { super().merge(key_as_nested_maps(host_field_name, already_exist)) }
 
         it "doesn't override it" do
-          expect(subject.get("host")).to eq(already_exist)
+          expect(subject.get(host_field_name)).to eq(already_exist)
         end
       end
     end
 
     context "when no host is provided in beat" do
-      context "when no `host` key already exists on the event" do
+      context "when no `#{host_field_name}` key already exists on the event" do
         it "does not set the host" do
-          expect(subject.get("host")).to be_nil
+          expect(subject.get(host_field_name)).to be_nil
         end
       end
 
-      context "when `host` key already exists on the event" do
+      context "when `#{host_field_name}` key already exists on the event" do
         let(:already_exist) { "already_exist" }
-        let(:event_map) { super.merge({ "host" => already_exist }) }
+        let(:event_map) { super().merge(key_as_nested_maps(host_field_name, already_exist)) }
 
         it "doesn't override it" do
-          expect(subject.get("host")).to eq(already_exist)
+          expect(subject.get(host_field_name)).to eq(already_exist)
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-beats
 version: !ruby/object:Gem::Version
-  version: 6.0.11
+  version: 6.1.1
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-03 00:00:00.000000000 Z
+date: 2021-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -106,6 +106,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.4
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  name: logstash-mixin-ecs_compatibility_support
+  prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -234,6 +248,7 @@ files:
 - PROTOCOL.md
 - README.md
 - VERSION
+- docs/agent.asciidoc
 - docs/index.asciidoc
 - lib/logstash-input-beats_jars.rb
 - lib/logstash/inputs/beats.rb
@@ -271,7 +286,7 @@ files:
 - vendor/jar-dependencies/io/netty/netty-all/4.1.49.Final/netty-all-4.1.49.Final.jar
 - vendor/jar-dependencies/org/apache/logging/log4j/log4j-api/2.11.1/log4j-api-2.11.1.jar
 - vendor/jar-dependencies/org/javassist/javassist/3.24.0-GA/javassist-3.24.0-GA.jar
-- vendor/jar-dependencies/org/logstash/beats/logstash-input-beats/6.0.11/logstash-input-beats-6.0.11.jar
+- vendor/jar-dependencies/org/logstash/beats/logstash-input-beats/6.1.1/logstash-input-beats-6.1.1.jar
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
 - Apache License (2.0)