logstash-input-beats 5.1.9-java → 6.0.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9a0e0074ea17e1cc3771b987e5adf153ac7bac0ed260be4fa32aebcaf864bb8
-  data.tar.gz: 2d3359740c3bc9cd0142120e0edbbb27e92ae92b982440f6eb9f6bc1228903c5
+  metadata.gz: 39c210ae258ed8bd369c6a346909174ed4e0d85693fdae014579528c00db2f1f
+  data.tar.gz: a25a9375c4017fc6adaf197a5da36b3735d29cac64530ee217195f53bc8775ee
 SHA512:
-  metadata.gz: 7d5c2934d262dba8b5dd23a35a190a255c870919ddbed710aa3db7a06be3a9fc99ccb28c16c54dbdf574c0a13d1867782dab4bdbd93459179098749a4a45d029
-  data.tar.gz: db8cf9e01ab5159a6e36211d2a19449f2da44f0ca9fed86fb838e9f3f2560dd16a3b235c7383643860a138d9d8fa91e9ec3f3cfde27b47eec876fd4a10ffa689
+  metadata.gz: 455af4f09ebb53a032cb2965400b999b9e80928c6e14f1e74a6ea3c7bedf57fbcc8e374136c9f18afaebfb3212ad5314218dafbbd4d772cc439d1075b99a58f7
+  data.tar.gz: 9c365edb5417a5f157db1cacd3993a1d9f038a939ad7d59e3927aa42dd537ddad5cdbc303b2ff5015e9db32e5b992076cb8983beaba01da2604abb53b3736f2d

data/CHANGELOG.md

@@ -1,5 +1,6 @@
-## 5.1.9
- - Backport [#366](https://github.com/logstash-plugins/logstash-input-beats/pull/366) and [#368](https://github.com/logstash-plugins/logstash-input-beats/pull/368) from 6.x
+## 6.0.0
+ - Removed obsolete setting congestion_threshold and target_field_for_codec
+ - Changed default value of `add_hostname` to false
 
 ## 5.1.8
  - Loosen jar-dependencies manager gem dependency to allow plugin to work with JRubies that include a later version.

data/VERSION

@@ -1 +1 @@
-5.1.9
+6.0.0

data/docs/index.asciidoc

@@ -116,11 +116,10 @@ input plugins.
 [id="plugins-{type}s-{plugin}-add_hostname"]
 ===== `add_hostname`
 
-  added[5.1.4, Field was added to allow users to control whether or not the `host` field is automatically added to events.]
-  deprecated[5.1.4, In future versions of this plugin, this setting will be removed, and the 'hosts' field will not be added to events.]
+  deprecated[6.0.0, The default value has been changed to `false`. In 7.0.0 this setting will be removed]
 
   * Value type is <<boolean,boolean>>
-  * Default value is `true`
+  * Default value is `false`
 
 Flag to determine whether to add `host` field to event using the value supplied by the beat in the `hostname` field.
 

data/lib/logstash-input-beats_jars.rb

@@ -4,9 +4,9 @@ require 'jar_dependencies'
 require_jar('io.netty', 'netty-all', '4.1.30.Final')
 require_jar('io.netty', 'netty-tcnative-boringssl-static', '2.0.12.Final')
 require_jar('org.javassist', 'javassist', '3.24.0-GA')
-require_jar('com.fasterxml.jackson.core', 'jackson-core', '2.9.9')
-require_jar('com.fasterxml.jackson.core', 'jackson-annotations', '2.9.9')
-require_jar('com.fasterxml.jackson.core', 'jackson-databind', '2.9.9.3')
-require_jar('com.fasterxml.jackson.module', 'jackson-module-afterburner', '2.9.9')
+require_jar('com.fasterxml.jackson.core', 'jackson-core', '2.9.7')
+require_jar('com.fasterxml.jackson.core', 'jackson-annotations', '2.9.7')
+require_jar('com.fasterxml.jackson.core', 'jackson-databind', '2.9.7')
+require_jar('com.fasterxml.jackson.module', 'jackson-module-afterburner', '2.9.7')
 require_jar('org.apache.logging.log4j', 'log4j-api', '2.11.1')
-require_jar('org.logstash.beats', 'logstash-input-beats', '5.1.9')
+require_jar('org.logstash.beats', 'logstash-input-beats', '6.0.0')

data/lib/logstash/inputs/beats.rb

@@ -83,8 +83,7 @@ class LogStash::Inputs::Beats < LogStash::Inputs::Base
   config :ssl_certificate_authorities, :validate => :array, :default => []
 
   # Flag to determine whether to add host information (provided by the beat in the 'hostname' field) to the event
-  config :add_hostname, :validate => :boolean, :default => true, :deprecated => 'Host field will not be automatically populated by future version of the Beats input'
-
+  config :add_hostname, :validate => :boolean, :default => false, :deprecated => 'This option will be removed in the future as beats determine the event schema'
 
   # By default the server doesn't do any client verification.
   # 
@@ -106,13 +105,6 @@ class LogStash::Inputs::Beats < LogStash::Inputs::Base
   # Time in milliseconds for an incomplete ssl handshake to timeout
   config :ssl_handshake_timeout, :validate => :number, :default => 10000
 
-  # The number of seconds before we raise a timeout. 
-  # This option is useful to control how much time to wait if something is blocking the pipeline.
-  config :congestion_threshold, :validate => :number, :obsolete => "This option is obsolete since congestion control is done automatically"
-
-  # This is the default field to which the specified codec will be applied.
-  config :target_field_for_codec, :validate => :string, :obsolete => "This option is obsolete"
-
   # The minimum TLS version allowed for the encrypted connections. The value must be one of the following:
   # 1.0 for TLS 1.0, 1.1 for TLS 1.1, 1.2 for TLS 1.2
   config :tls_min_version, :validate => :number, :default => TLS.min.version

data/lib/tasks/test.rake

@@ -4,9 +4,9 @@ VENDOR_PATH = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "ve
 
 #TODO: Figure out better means to keep this version in sync
 if OS_PLATFORM == "linux"
-  FILEBEAT_URL = "https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-6.0.0-alpha2-linux-x86_64.tar.gz"
+  FILEBEAT_URL = "https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-6.5.4-linux-x86_64.tar.gz"
 elsif OS_PLATFORM == "darwin"
-  FILEBEAT_URL = "https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-6.0.0-alpha2-darwin-x86_64.tar.gz"
+  FILEBEAT_URL = "https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-6.5.4-darwin-x86_64.tar.gz"
 end
 
 LSF_URL = "https://download.elastic.co/logstash-forwarder/binaries/logstash-forwarder_#{OS_PLATFORM}_amd64"

data/spec/integration/filebeat_spec.rb

@@ -37,14 +37,13 @@ describe "Filebeat", :integration => true do
   let(:filebeat_config) do
     {
       "filebeat" => {
-        "prospectors" => [{ "paths" => [log_file],  "input_type" => "log" }],
-        "scan_frequency" => "1s",
-        "idle_timeout" => "1s"
+        "prospectors" => [{ "paths" => [log_file],  "type" => "log" }],
+        "scan_frequency" => "1s"
       },
       "output" => {
         "logstash" => { "hosts" => ["#{host}:#{port}"] },
-        "logging" => { "level" => "debug" }
-      }
+      },
+      "logging" => { "level" => "debug" }
     }
   end
 
@@ -90,9 +89,10 @@ describe "Filebeat", :integration => true do
             "logstash" => {
               "hosts" => ["#{host}:#{port}"],
               "ssl" => { "certificate_authorities" => certificate_authorities }
-            },
-            "logging" => { "level" => "debug" }
-          }})
+            }
+          },
+          "logging" => { "level" => "debug" }
+          })
       end
 
       let(:input_config) do
@@ -123,9 +123,10 @@ describe "Filebeat", :integration => true do
                     "versions" => ["TLSv1.2"],
                     "cipher_suites" => [beats_cipher]
                   }
-                },
-                "logging" => { "level" => "debug" }
-              }})
+                }
+              },
+              "logging" => { "level" => "debug" }
+              })
           end
 
           let(:input_config) {
@@ -222,9 +223,10 @@ describe "Filebeat", :integration => true do
                   "certificate" => certificate_file,
                   "key" => certificate_key_file
                 }
-              },
-              "logging" => { "level" => "debug" }
-            }})
+              }
+            },
+            "logging" => { "level" => "debug" }
+            })
         end
 
         let(:input_config) do
@@ -319,9 +321,10 @@ describe "Filebeat", :integration => true do
                           "certificate" => secondary_client_certificate_file,
                           "key" => secondary_client_certificate_key_file
                         }
-                      },
-                      "logging" => { "level" => "debug" }
-                    }})
+                      }
+                    },
+                    "logging" => { "level" => "debug" }
+                    })
                 end
 
                 include_examples "send events"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-beats
 version: !ruby/object:Gem::Version
-  version: 5.1.9
+  version: 6.0.0
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-10-02 00:00:00.000000000 Z
+date: 2019-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -264,15 +264,15 @@ files:
 - spec/support/integration_shared_context.rb
 - spec/support/logstash_test.rb
 - spec/support/shared_examples.rb
-- vendor/jar-dependencies/com/fasterxml/jackson/core/jackson-annotations/2.9.9/jackson-annotations-2.9.9.jar
-- vendor/jar-dependencies/com/fasterxml/jackson/core/jackson-core/2.9.9/jackson-core-2.9.9.jar
-- vendor/jar-dependencies/com/fasterxml/jackson/core/jackson-databind/2.9.9.3/jackson-databind-2.9.9.3.jar
-- vendor/jar-dependencies/com/fasterxml/jackson/module/jackson-module-afterburner/2.9.9/jackson-module-afterburner-2.9.9.jar
+- vendor/jar-dependencies/com/fasterxml/jackson/core/jackson-annotations/2.9.7/jackson-annotations-2.9.7.jar
+- vendor/jar-dependencies/com/fasterxml/jackson/core/jackson-core/2.9.7/jackson-core-2.9.7.jar
+- vendor/jar-dependencies/com/fasterxml/jackson/core/jackson-databind/2.9.7/jackson-databind-2.9.7.jar
+- vendor/jar-dependencies/com/fasterxml/jackson/module/jackson-module-afterburner/2.9.7/jackson-module-afterburner-2.9.7.jar
 - vendor/jar-dependencies/io/netty/netty-all/4.1.30.Final/netty-all-4.1.30.Final.jar
 - vendor/jar-dependencies/io/netty/netty-tcnative-boringssl-static/2.0.12.Final/netty-tcnative-boringssl-static-2.0.12.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/5.1.9/logstash-input-beats-5.1.9.jar
+- vendor/jar-dependencies/org/logstash/beats/logstash-input-beats/6.0.0/logstash-input-beats-6.0.0.jar
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
 - Apache License (2.0)