Merge branch 'master' of https://github.com/logstash/logstash

# By Jordan Sissel (8) and tobyw4n (1) # Via Jordan Sissel * 'master' of https://github.com/logstash/logstash: version bump CHANGELOG Fix in-jar path make it a url in markdown Fix spacing (spaces not tabs) to make it show up in the docs Update changelog Update milestones for some plugins with good tests Set date digest/sha2 was required for sqs to connect successfully Conflicts: lib/logstash/inputs/collectd.rb lib/logstash/outputs/elasticsearch.rb lib/logstash/outputs/elasticsearch_http.rb
bernd · Dec 12, 2013 · e36757e · e36757e
2 parents b26d88b + e185df3
commit e36757e
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 18 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,4 +1,8 @@
-1.3.0 (???)
+1.3.1 (December 11, 2013)
+  # general
+  - Fix path to the built-in elasticsearch index template
+
+1.3.0 (December 11, 2013)
   # general
   - oops: The --help flag now reports help again, instead of barfing an "I need
     help" exception (LOGSTASH-1436, LOGSTASH-1392; Jordan Sissel)
@@ -22,8 +26,10 @@
     choosing the part that becomes the event message. (#784, Brad Fritz)
   - bugfix: zeromq: don't override the 'host' field if the event already
     has one. (Jordan Sissel)
-  - bugfix: ganglia: fix regressions; plugin should work again (LOGSTASH,1655,
+  - bugfix: ganglia: fix regressions; plugin should work again (LOGSTASH-1655,
     #818; Jordan Sissel)
+  - bugfix: Fix missing library in sqs input (#775, LOGSTASH-1294; Toby
+    Collier)
 
   ## filters
   - new: unique: removes duplicate values from a given field in an event.
@@ -79,6 +85,8 @@
     cluster node list. (LOGSTASH-102, #841; Jordan Sissel)
   - feature: elasticsearch: new 'bind_port setting for 'node' protocol which
     lets you chose the local port to bind on (#841, Jordan Sissel)
+  - bugfix: Fix missing library in sqs input (#775, LOGSTASH-1294; Toby
+    Collier)
 
 1.2.2 (October 22, 2013)
   # general

diff --git a/lib/logstash/codecs/graphite.rb b/lib/logstash/codecs/graphite.rb
@@ -7,7 +7,7 @@
 class LogStash::Codecs::Graphite < LogStash::Codecs::Base
   config_name "graphite"
 
-  milestone 1
+  milestone 2
 
   # The character encoding used in this codec. Examples include "UTF-8" and
   # "CP1252"

diff --git a/lib/logstash/codecs/json.rb b/lib/logstash/codecs/json.rb
@@ -10,7 +10,7 @@
 class LogStash::Codecs::JSON < LogStash::Codecs::Base
   config_name "json"
 
-  milestone 1
+  milestone 3
 
   # The character encoding used in this codec. Examples include "UTF-8" and
   # "CP1252"

diff --git a/lib/logstash/codecs/json_lines.rb b/lib/logstash/codecs/json_lines.rb
@@ -9,7 +9,7 @@
 class LogStash::Codecs::JSONLines < LogStash::Codecs::Base
   config_name "json_lines"
 
-  milestone 1
+  milestone 3
 
   # The character encoding used in this codec. Examples include "UTF-8" and
   # "CP1252"

diff --git a/lib/logstash/codecs/multiline.rb b/lib/logstash/codecs/multiline.rb
@@ -62,7 +62,7 @@
 # This is the base class for logstash codecs.
 class LogStash::Codecs::Multiline < LogStash::Codecs::Base
   config_name "multiline"
-  milestone 1
+  milestone 3
 
   # The regular expression to match
   config :pattern, :validate => :string, :required => true

diff --git a/lib/logstash/codecs/oldlogstashjson.rb b/lib/logstash/codecs/oldlogstashjson.rb
@@ -3,7 +3,7 @@
 
 class LogStash::Codecs::OldLogStashJSON < LogStash::Codecs::Base
   config_name "oldlogstashjson"
-  milestone 1
+  milestone 2
 
   # Map from v0 name to v1 name.
   # Note: @source is gone and has no similar field.

diff --git a/lib/logstash/inputs/collectd.rb b/lib/logstash/inputs/collectd.rb
@@ -22,12 +22,12 @@
 #     LoadPlugin memory
 #     LoadPlugin network
 #     <Plugin interface>
-#            Interface "eth0"
-#            IgnoreSelected false
+#         Interface "eth0"
+#         IgnoreSelected false
 #     </Plugin>
 #     <Plugin network>
-#            <Server "10.0.0.1" "25826">
-#            </Server>
+#         <Server "10.0.0.1" "25826">
+#         </Server>
 #     </Plugin>
 #
 # Be sure to replace "10.0.0.1" with the IP of your Logstash instance.

diff --git a/lib/logstash/inputs/sqs.rb b/lib/logstash/inputs/sqs.rb
@@ -2,6 +2,7 @@
 require "logstash/inputs/threadable"
 require "logstash/namespace"
 require "logstash/plugin_mixins/aws_config"
+require "digest/sha2"
 
 # Pull events from an Amazon Web Services Simple Queue Service (SQS) queue.
 #

diff --git a/lib/logstash/outputs/elasticsearch.rb b/lib/logstash/outputs/elasticsearch.rb
@@ -57,8 +57,8 @@ class LogStash::Outputs::ElasticSearch < LogStash::Outputs::Base
   # This configuration option defines how the template is named inside Elasticsearch
   # Note that if you have used the template management features and subsequently
   # change this you will need to prune the old template manually, e.g.
-  # curl -XDELETE <http://localhost:9200/_template/OLDtemplatename?pretty>
-  # where OLDtemplatename is whatever the former setting was.
+  # curl -XDELETE <http://localhost:9200/_template/OLD_template_name?pretty>
+  # where OLD_template_name is whatever the former setting was.
   config :template_name, :validate => :string, :default => "logstash"
 
   # You can set the path to your own template here, if you so desire.  
@@ -254,7 +254,7 @@ def get_template_json
       if __FILE__ =~ /^(jar:)?file:\/.+!.+/
         begin
           # Running from a jar, assume types.db is at the root.
-          jar_path = [__FILE__.split("!").first, "elasticsearch-template.json"].join("!")
+          jar_path = [__FILE__.split("!").first, "/elasticsearch-template.json"].join("!")
           @template = jar_path
         rescue => ex
           raise "Failed to cache, due to: #{ex}\n#{ex.backtrace}"

diff --git a/lib/logstash/outputs/elasticsearch_http.rb b/lib/logstash/outputs/elasticsearch_http.rb
@@ -39,8 +39,8 @@ class LogStash::Outputs::ElasticSearchHTTP < LogStash::Outputs::Base
   # This configuration option defines how the template is named inside Elasticsearch
   # Note that if you have used the template management features and subsequently
   # change this you will need to prune the old template manually, e.g.
-  # curl -XDELETE <http://localhost:9200/_template/OLDtemplatename?pretty>
-  # where OLDtemplatename is whatever the former setting was.
+  # curl -XDELETE <http://localhost:9200/_template/OLD_template_name?pretty>
+  # where OLD_template_name is whatever the former setting was.
   config :template_name, :validate => :string, :default => "logstash"
 
   # You can set the path to your own template here, if you so desire.  
@@ -176,7 +176,7 @@ def get_template_json
       if __FILE__ =~ /^(jar:)?file:\/.+!.+/
         begin
           # Running from a jar, assume types.db is at the root.
-          jar_path = [__FILE__.split("!").first, "elasticsearch-template.json"].join("!")
+          jar_path = [__FILE__.split("!").first, "/elasticsearch-template.json"].join("!")
           @template = jar_path
         rescue => ex
           raise "Failed to cache, due to: #{ex}\n#{ex.backtrace}"

diff --git a/lib/logstash/outputs/sqs.rb b/lib/logstash/outputs/sqs.rb
@@ -3,6 +3,7 @@
 require "logstash/namespace"
 require "logstash/plugin_mixins/aws_config"
 require "stud/buffer"
+require "digest/sha2"
 
 # Push events to an Amazon Web Services Simple Queue Service (SQS) queue.
 #

diff --git a/lib/logstash/version.rb b/lib/logstash/version.rb
@@ -1,6 +1,6 @@
 # encoding: utf-8
 # The version of logstash.
-LOGSTASH_VERSION = "1.3.0"
+LOGSTASH_VERSION = "1.3.1"
 
 # Note to authors: this should not include dashes because 'gem' barfs if
 # you include a dash in the version string.