logstash-output-amazon_es 0.1.3-java → 0.2.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9dba329461cb1625ce03537304d7a39f852d0663
-  data.tar.gz: afa9266d6f04f17fd3e20d0d27a2732660a6b575
+  metadata.gz: 3df0ec65d77ee353e6113f75df5a3ae5d7079950
+  data.tar.gz: 72cb46f25d232efda96d16dd3444f75f870bc19b
 SHA512:
-  metadata.gz: 4e1634fc23af60d315094d7c95e0e177c125329835afc5fd45a92d5395e567c66da6b48602eb9dee2483c5e666f30b36ed584cdb598a7c112b20e7745902b3fd
-  data.tar.gz: 732baf4a14a5d3fd5abb6a71c71033577f26793ab0ea58b5b5d99d57e98ad61879863069ff31a67c57e5d932f1515903e823b2c69e21aa7c824d4ee2c8cff34e
+  metadata.gz: e8acf5b88bc525f9ba772795ba5ac04af0a348cd825c9eb38657bc376081df715de7bdb76b9bb8fa8b248a86d2d8caf27cd501dc6ef051abcf549430e5effc44
+  data.tar.gz: 8f0fefd6be0034bb0a5c711965e6249377b5c696002593dfcbf6080db51f9b9dff0625042576dff131ae10831bfecf23821b1bed60e7eba0a2f08d5a2d69b746

data/README.md

@@ -10,12 +10,12 @@ It is fully free and fully open source. The license is Apache 2.0, meaning you a
 One command installation
 `bin/plugin install logstash-output-amazon_es`
 
-While we are in the process of getting this plugin fully integrated within logstash to make installation simpler, 
+While we are in the process of getting this plugin fully integrated within logstash to make installation simpler,
 if above does not work, or you would like to patch code here is a workaround to install this plugin within your logstash:
 
 1. Check out/clone this code from github
 2. Build plugin using - `gem build logstash-output-amazon_es.gemspec` ( this works with jruby and rubygem versions > 1.9)
-3. Install plugin using `<logstash-home>/bin/plugin install logstash-output-amazon_es-0.1.0-java.gem` (or the non java variant)
+3. Install plugin using `<logstash-home>/bin/plugin install logstash-output-amazon_es-0.2.0-java.gem` (or the non java variant)
 
 ## Configuration for Amazon Elasticsearch Output plugin
 
@@ -28,15 +28,15 @@ An example configuration:
 	        hosts => ["foo.us-east-1.es.amazonaws.com"]
 	        region => "us-east-1"
 			aws_access_key_id => 'ACCESS_KEY' (Will be made optional in next release to support instance profiles)
-			aws_secret_access_key => 'SECRET_KEY' 
+			aws_secret_access_key => 'SECRET_KEY'
 			index => "production-logs-%{+YYYY.MM.dd}"
 		}
 	}
-  
+
 * Required Parameters
 	* hosts (array of string) - Amazon Elasticsearch domain endpoint. eg ["foo.us-east-1.es.amazonaws.com"]
     * region (string, :default => "us-east-1") - region where the domain is located
-    
+
 * Optional Parameters
 	* Credential parameters
 		* aws_access_key_id, :validate => :string - Optional AWS Access key
@@ -62,7 +62,8 @@ An example configuration:
 		This helps keep both fast and slow log streams moving along in near-real-time.
 	* template (path) - You can set the path to your own template here, if you so desire. If not set, the included template will be used.
 	* template_name (string, default => "logstash") - defines how the template is named inside Elasticsearch
-	* port (string, default 80) - Amazon Elasticsearch Service listens on port 80, if you have a custom proxy fronting elasticsearch, this parameter may need tweaking.
+	* port (string, default 443) - Amazon Elasticsearch Service listens on port 443 - https (default) and 80 - http. Tweak this for custom proxy.
+	* protocol (string, default https) - The protocol used to connect to the Amazon Elasticsearch Service
 
 ## Documentation
 
@@ -108,7 +109,7 @@ bundle exec rspec
 Dependencies: [Docker](http://docker.com)
 
 Before the test suite is run, we will load and run an
-Elasticsearch instance within a docker container. This container 
+Elasticsearch instance within a docker container. This container
 will be cleaned up when suite has finished.
 
 ```sh

data/lib/logstash/outputs/amazon_es.rb

@@ -14,11 +14,11 @@ require "uri"
 #
 #
 # The configuration and experience is similar to logstash-output-elasticsearch plugin and we have added Signature V4 support for the same
-# Some of the default configurations like connection timeouts have been tuned for optimal performance with Amazon Elasticsearch 
+# Some of the default configurations like connection timeouts have been tuned for optimal performance with Amazon Elasticsearch
 #
 # ==== Retry Policy
 #
-# This plugin uses the same retry policy as logstash-output-elasticsearch, It uses bulk API to optimize its  
+# This plugin uses the same retry policy as logstash-output-elasticsearch, It uses bulk API to optimize its
 # imports into Elasticsearch.. These requests may experience either partial or total failures.
 # Events are retried if they fail due to either a network error or the status codes
 # 429 (the server is busy), 409 (Version Conflict), or 503 (temporary overloading/maintenance).
@@ -53,13 +53,13 @@ class LogStash::Outputs::AmazonES < LogStash::Outputs::Base
 
   # The index type to write events to. Generally you should try to write only
   # similar events to the same 'type'. String expansion `%{foo}` works here.
-  # 
+  #
   # Deprecated in favor of `document_type` field.
   config :index_type, :validate => :string, :deprecated => "Please use the 'document_type' setting instead. It has the same effect, but is more appropriately named."
 
   # The document type to write events to. Generally you should try to write only
   # similar events to the same 'type'. String expansion `%{foo}` works here.
-  # Unless you set 'document_type', the event 'type' will be used if it exists 
+  # Unless you set 'document_type', the event 'type' will be used if it exists
   # otherwise the document type will be assigned the value of 'logs'
   config :document_type, :validate => :string
 
@@ -100,28 +100,31 @@ class LogStash::Outputs::AmazonES < LogStash::Outputs::Base
   config :routing, :validate => :string
 
 
-# Set the endpoint of your Amazon Elasticsearch domain. This will always be array of size 1 
+# Set the endpoint of your Amazon Elasticsearch domain. This will always be array of size 1
 #     ["foo.us-east-1.es.amazonaws.com"]
   config :hosts, :validate => :array
 
   # You can set the remote port as part of the host, or explicitly here as well
-  config :port, :validate => :string, :default => 80
-  
+  config :port, :validate => :string, :default => 443
+
+  # Sets the protocol thats used to connect to elastisearch
+  config :protocol, :validate => :string, :default => "https"
+
   #Signing specific details
   config :region, :validate => :string, :default => "us-east-1"
-  
-  # aws_access_key_id and aws_secret_access_key are currently needed for this plugin to work right. 
+
+  # aws_access_key_id and aws_secret_access_key are currently needed for this plugin to work right.
   # Subsequent versions will have the credential resolution logic as follows:
   #
-  # - User passed aws_access_key_id and aws_secret_access_key in aes configuration 
-  # - Environment Variables - AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY 
-  #   (RECOMMENDED since they are recognized by all the AWS SDKs and CLI except for .NET), 
+  # - User passed aws_access_key_id and aws_secret_access_key in aes configuration
+  # - Environment Variables - AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY
+  #   (RECOMMENDED since they are recognized by all the AWS SDKs and CLI except for .NET),
   #   or AWS_ACCESS_KEY and AWS_SECRET_KEY (only recognized by Java SDK)
   # - Credential profiles file at the default location (~/.aws/credentials) shared by all AWS SDKs and the AWS CLI
   # - Instance profile credentials delivered through the Amazon EC2 metadata service
   config :aws_access_key_id, :validate => :string
   config :aws_secret_access_key, :validate => :string
-  
+
 
   # This plugin uses the bulk index api for improved indexing performance.
   # To make efficient bulk api calls, we will buffer a certain number of
@@ -224,7 +227,7 @@ class LogStash::Outputs::AmazonES < LogStash::Outputs::Base
     common_options.merge! update_options if @action == 'update'
 
     @client = LogStash::Outputs::AES::HttpClient.new(
-      common_options.merge(:hosts => @hosts, :port => @port, :region => @region, :aws_access_key_id => @aws_access_key_id, :aws_secret_access_key => @aws_secret_access_key)
+      common_options.merge(:hosts => @hosts, :port => @port, :region => @region, :aws_access_key_id => @aws_access_key_id, :aws_secret_access_key => @aws_secret_access_key,:protocol => @protocol)
     )
 
     if @manage_template
@@ -279,7 +282,7 @@ class LogStash::Outputs::AmazonES < LogStash::Outputs::Base
   def receive(event)
     return unless output?(event)
 
-    # block until we have not maxed out our 
+    # block until we have not maxed out our
     # retry queue. This is applying back-pressure
     # to slow down the receive-rate
     @retry_flush_mutex.synchronize {
@@ -303,7 +306,7 @@ class LogStash::Outputs::AmazonES < LogStash::Outputs::Base
       :_type => type,
       :_routing => @routing ? event.sprintf(@routing) : nil
     }
-    
+
     params[:_upsert] = LogStash::Json.load(event.sprintf(@upsert)) if @action == 'update' && @upsert != ""
 
     buffer_receive([event.sprintf(@action), params, event])
@@ -380,19 +383,19 @@ class LogStash::Outputs::AmazonES < LogStash::Outputs::Base
 
     @retry_teardown_requested.make_true
     # First, make sure retry_timer_thread is stopped
-    # to ensure we do not signal a retry based on 
+    # to ensure we do not signal a retry based on
     # the retry interval.
     Thread.kill(@retry_timer_thread)
     @retry_timer_thread.join
-    # Signal flushing in the case that #retry_flush is in 
+    # Signal flushing in the case that #retry_flush is in
     # the process of waiting for a signal.
     @retry_flush_mutex.synchronize { @retry_queue_needs_flushing.signal }
-    # Now, #retry_flush is ensured to not be in a state of 
+    # Now, #retry_flush is ensured to not be in a state of
     # waiting and can be safely joined into the main thread
     # for further final execution of an in-process remaining call.
     @retry_thread.join
 
-    # execute any final actions along with a proceeding retry for any 
+    # execute any final actions along with a proceeding retry for any
     # final actions that did not succeed.
     buffer_flush(:final => true)
     retry_flush
@@ -426,11 +429,11 @@ class LogStash::Outputs::AmazonES < LogStash::Outputs::Base
 
 
   private
-  # in charge of submitting any actions in @retry_queue that need to be 
+  # in charge of submitting any actions in @retry_queue that need to be
   # retried
   #
   # This method is not called concurrently. It is only called by @retry_thread
-  # and once that thread is ended during the teardown process, a final call 
+  # and once that thread is ended during the teardown process, a final call
   # to this method is done upon teardown in the main thread.
   def retry_flush()
     unless @retry_queue.empty?

data/lib/logstash/outputs/amazon_es/http_client.rb

@@ -59,10 +59,11 @@ module LogStash::Outputs::AES
     def build_client(options)
       hosts = options[:hosts]
       port = options[:port]
+      protocol = options[:protocol]
       client_settings = options[:client_settings] || {}
 
       uris = hosts.map do |host|
-        "http://#{host}:#{port}#{client_settings[:path]}".gsub(/[\/]+$/,'')
+        "#{protocol}://#{host}:#{port}#{client_settings[:path]}".gsub(/[\/]+$/,'')
       end
 
       @client_options = {
@@ -72,7 +73,7 @@ module LogStash::Outputs::AES
         :aws_secret_access_key => options[:aws_secret_access_key],
         :transport_options => {
           :request => {:open_timeout => 0, :timeout => 60},  # ELB timeouts are set at 60
-          :proxy => client_settings[:proxy],          
+          :proxy => client_settings[:proxy],
         },
         :transport_class => Elasticsearch::Transport::Transport::HTTP::AWS
       }

data/logstash-output-amazon_es.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-output-amazon_es'
-  s.version         = '0.1.3'
+  s.version         = '0.2.0'
   s.licenses        = ['apache-2.0']
   s.summary         = "Logstash Output to Amazon Elasticsearch Service"
   s.description     = "Output events to Amazon Elasticsearch Service with V4 signing"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-amazon_es
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: java
 authors:
 - Amazon
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-11-03 00:00:00.000000000 Z
+date: 2015-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby