logstash-output-logentries 0.1.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3071f23479728c44aebb9426d301150f352f183
-  data.tar.gz: 57fea8cda18e056dbfad29cecfbbbf99d230710a
+  metadata.gz: 435b907a2cf1a2a84b6c7144cde39dfc80834f89
+  data.tar.gz: 789d602830227fa6c89678e9606961f68b0fc8ed
 SHA512:
-  metadata.gz: 498b97cffe5f047666707a1a44c4e7d35483e509465dfda8684d0114a99bd510277167de3748342816388abe6203ad7f2b2b80e9b01551005ee7896bf7efea7d
-  data.tar.gz: 4f1e3bafb4ef7979a5c6bb5997825fecc6f9d9182b8e5c6e5f393a60419076d49f582f5f840daf8508678fc29eecb62a912d1778c2ccb4d5ac16830339b7dd3a
+  metadata.gz: 7f5836961c3ea81444f43f058a65cd05e995fc44b50c5d63168f8e0821a2a0b9f8268d60028435842c854056e47dfd7c73427f4350fd65fda83793d90d95c1c7
+  data.tar.gz: 49281deaf12cbaa0ac5402819081cdd58cbc93c394ab39dbd08a676136a8a1fa8395f878c45d65dbb580037a94e9f22ed8cfd6bb6c71f5139cfa63fa5bf167ea

data/Gemfile

@@ -1,2 +1,4 @@
 source 'https://rubygems.org'
-gemspec
+gemspec
+gem "logstash", :github => "elasticsearch/logstash", :branch => "1.5"
+

data/README.md

@@ -5,13 +5,21 @@ This is a plugin for [Logentries](https://www.logentries.com) and Logstash.
 # Send logs using token
 You can forward logs from Logstash to Logentries using unique token. To do this you have to configure the output sectin of your .conf file in your logstash main folder.
 
-output {
+```
+output{
     logentries{
     token => "LOGENTRIES_TOKEN"
-    }
-}
+    reconnect_interval => 10
+    ssl_enable => true
+    host => "data.logentries.com"
+    port => 443
+              }
+      }
+```
 
-Please refer to this [blog](link here) for more information and instruction on how to set up your .config file.
+Only `token => "LOGENTRIES_TOKEN"` is a required variable, the rest are optional. If you set `ssl_enable` to `false`, you must set the port to `80` or `514`
+
+Please refer to Logstash documentation for more information and instruction on how to set up your .config file.
 
 # Logentries Token
 

data/lib/logstash/outputs/logentries.rb

@@ -1,74 +1,88 @@
+# encoding: utf-8
 require "logstash/outputs/base"
 require "logstash/namespace"
-require "uri"
-require "net/http"
-require "net/https"
-
+require "logstash/codecs/plain"
+require "socket"
 
+# www.logentries.com
+#
+# Write events over TCP socket. Each event json is separated by a newline.
+#
+# You will read this token from your config file. Just put the following lines to your .config file:
+#
+# output{
+#     logentries{
+#     token => "LOGENTRIES_TOKEN"
+#     reconnect_interval => 10
+#     ssl_enable => true
+#     host => "data.logentries.com"
+#     port => 443
+#               }
+#       }
 
 class LogStash::Outputs::Logentries < LogStash::Outputs::Base
-    config_name "logentries"
-    milestone 2
-    
-    # www.logentries.com
-    #
-    # You will read this token from your config file. Just put the following lines to your .config file:
-    #
-    # output {
-    #     logentries{
-    #     token => "LOGENTRIES_TOKEN"
-    #               }
-    # }
-    
-    config :token, :validate => :string, :required => true
-    
-    public
-    def register
+  config_name "logentries"
+
+  config :token, :validate => :string, :required => true
+
+  config :reconnect_interval, :validate => :number, :default => 10
+  config :ssl_enable, :validate => :boolean, :default => true
+
+  config :host, :validate => :string, :default => "data.logentries.com"
+  config :port, :validate => :number, :default => 443
+
+  def register
+    @client_socket = nil
+
+    if ssl?
+      @ssl_context = setup_ssl
+    end
+  end
+
+  def receive(event)
+    message = event.to_json
+
+    begin
+      @client_socket ||= connect
+      @client_socket.puts("#{@token}" + message)
+    rescue => e
+      @logger.warn("Socket output exception: closing and resending event", :host => @host, :port => @port, :exception => e, :backtrace => e.backtrace, :event => event)
+      @client_socket.close rescue nil
+      @client_socket = nil
+      sleep(@reconnect_interval)
+      retry
     end
-    
-    def receive(event)
-        return unless output?(event)
-        
-        if event == LogStash::SHUTDOWN
-            finished
-            return
-        end
-        
-        # Send the event using token
-        url = URI.parse("https://js.logentries.com/v1/logs/#{event.sprintf(@token)}")
-        
-        # Debug the URL here
-        @logger.info("Sending using #{event.sprintf(@token)} Logentries Token")
-        
-        # Open HTTP connection
-        http = Net::HTTP.new(url.host, url.port)
-        
-        # Use secure SSL
-        if url.scheme == 'https'
-            http.use_ssl = true
-            http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-        end
-        
-        request = Net::HTTP::Post.new(url.path)
-        
-        #Prepend the message body with "event" to allow the js.logentries to pick it up
-        request.body = "{\"event\":" + event.to_json + "}"
-        begin
-            response = http.request(request)
-            if response.is_a?(Net::HTTPSuccess)
-                @logger.info("Event Sent!")
-                else
-                @logger.warn("HTTP error", :error => response.error!)
-            end            
-        rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e
-            @logger.warn("Error", e)
-        end 
-        
-        if response.is_a?(Net::HTTPSuccess)
-            @logger.info("Event Sent!")
-            else
-            @logger.warn("HTTP error", :error => response.error!)
-        end
-        
-    end # receive
+  end
+
+  private
+
+  def ssl?
+    @ssl_enable == true
+  end
+
+  def connect
+    socket = nil
+    socket = TCPSocket.new(@host, @port)
+    if ssl?
+      socket = OpenSSL::SSL::SSLSocket.new(socket, @ssl_context)
+      begin
+        socket.connect
+      rescue OpenSSL::SSL::SSLError => ssle
+        @logger.error("SSL Error", :exception => ssle, :backtrace => ssle.backtrace)
+        sleep(5)
+        raise
+      end
+    end
+    socket
+  end
+
+  def setup_ssl
+    require "openssl"
+    cert_store = OpenSSL::X509::Store.new
+    cert_store.set_default_paths
+    ssl_context = OpenSSL::SSL::SSLContext.new()
+    ssl_context.cert_store = cert_store
+    ssl_context.verify_mode = OpenSSL::SSL::VERIFY_PEER
+    ssl_context
+  end
 end #LogStash::Outputs::Logentries

data/logstash-output-logentries.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-output-logentries'
-  s.version         = '0.1.2'
+  s.version         = '1.0.0'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "You can forward logs from Logstash to Logentries using unique token."
   s.description     = "This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program"
@@ -20,7 +20,6 @@ Gem::Specification.new do |s|
   s.metadata = { "logstash_plugin" => "true", "logstash_group" => "output" }
 
   # Gem dependencies
-  s.add_runtime_dependency "logstash-core"
 
   s.add_development_dependency 'logstash-devutils'
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-logentries
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Logentries - Bart Siniarski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-07 00:00:00.000000000 Z
+date: 2016-11-09 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: logstash-core
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: logstash-devutils
   requirement: !ruby/object:Gem::Requirement
@@ -78,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: You can forward logs from Logstash to Logentries using unique token.