remove obsolete options and flip add_hostname value (#356)

Author: jsvd

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 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.
 

VERSION

@@ -1 +1 @@
-5.1.8
+6.0.0

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.
 

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

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"

spec/integration/filebeat_spec.rb

@@ -37,14 +37,13 @@
   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 @@
             "logstash" => {
               "hosts" => ["#{host}:#{port}"],
               "ssl" => { "certificate_authorities" => certificate_authorities }
-            },
-            "logging" => { "level" => "debug" }
-          }})
+            }
+          },
+          "logging" => { "level" => "debug" }
+          })
       end
 
       let(:input_config) do
@@ -123,9 +123,10 @@
                     "versions" => ["TLSv1.2"],
                     "cipher_suites" => [beats_cipher]
                   }
-                },
-                "logging" => { "level" => "debug" }
-              }})
+                }
+              },
+              "logging" => { "level" => "debug" }
+              })
           end
 
           let(:input_config) {
@@ -222,9 +223,10 @@
                   "certificate" => certificate_file,
                   "key" => certificate_key_file
                 }
-              },
-              "logging" => { "level" => "debug" }
-            }})
+              }
+            },
+            "logging" => { "level" => "debug" }
+            })
         end
 
         let(:input_config) do
@@ -319,9 +321,10 @@
                           "certificate" => secondary_client_certificate_file,
                           "key" => secondary_client_certificate_key_file
                         }
-                      },
-                      "logging" => { "level" => "debug" }
-                    }})
+                      }
+                    },
+                    "logging" => { "level" => "debug" }
+                    })
                 end
 
                 include_examples "send events"