fluent-plugin-loggly 0.0.4 → 0.0.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: e69791c57bf0556adc54867ea0cdde7155e48b92
+  data.tar.gz: db45d8653e767dd2b6b6cac369b20c99c3ca1494
+SHA512:
+  metadata.gz: 1c16c260042e4cb97a051842661723619362e07b23feb31a89ceaf64e311254294d0bf7b033f0111da44df54092460f801178c46206bb606c1188c8731f7d2f9
+  data.tar.gz: eccdb87df2f3f7b89c92752ac8667b8e97ae6476ea1e575e9c3a417288443e93093ec36b15b8919918d44d5ec1de3a2877f8f5f4ec1b471c06a2534623099b9a

data/README.md

@@ -1,8 +1,35 @@
-Loggly plugin for [Fluentd](http://fluentd.org)
+Loggly plugin for [Fluentd](http://www.fluentd.org)
 =============
-With fluent-plugin-loggly you will be able to use the service loggly.com as output for you fluentd logs.
+With fluent-plugin-loggly you will be able to use [Loggly](http://loggly.com) as output the logs you collect with Fluentd.
+
+## Getting Started for Gen2 ([Read here for the difference between Gen1 and Gen2](https://www.loggly.com/docs/gen2-overview-for-gen1-users/))
+* Install [Fluentd](http://www.fluentd.org/download)
+* gem install fluent-plugin-loggly
+* Make sure you have an account with Loggly.
+* Configure Fluentd as below:
+~~~~~
+    <match your_match>
+      type loggly
+      loggly_url https://logs-01.loggly.com/inputs/xxx-xxxx-xxxx-xxxxx-xxxxxxxxxx
+    </match>
+~~~~~
+    or if you want to use buffered plugin:
+~~~~~
+    <match your_match>
+      type loggly_buffered
+      loggly_url https://logs-01.loggly.com/bulk/xxx-xxxx-xxxx-xxxxx-xxxxxxxxxx
+      output_include_time true  # add 'timestamp' record into log. (default: true)
+      buffer_type    file
+      buffer_path    /path/to/buffer/file
+      flush_interval 10s
+    </match>
+~~~~~
+    Note that buffered plugin uses bulk import to improve performance, so make sure to set Bulk endpoint to loggly_url.
+
+    The `xxx-xxxx...` is your Loggly access token.
+
+## Getting Started for Gen 1
 
-# Getting Started
 * Install fluentd http://fluentd.org
 * gem install fluent-plugin-loggly
 * Make sure you have an account at loggly.com.
@@ -12,17 +39,6 @@ With fluent-plugin-loggly you will be able to use the service loggly.com as outp
 * Get the url that could by used to do HTTPS POST (this will be used for configuration of the plugin).
   It should be something like https://logs.loggly.com/inputs/xxx-xxxx-xxxx-xxxxx-xxxxxxxxxx
 
-## Parameters
-**loggly_url** the url to your loggly input (string)  
-
-Setup the loggly output:
 
-~~~~~
-    <match your_match>
-      type loggly
-      loggly_url https://logs.loggly.com/inputs/xxx-xxxx-xxxx-xxxxx-xxxxxxxxxx
-    </match>
-~~~~~
-
-# TODO
-?
+## Parameters
+**loggly_url** the url to your loggly input (string).

data/fluent-plugin-loggly.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fluent-plugin-loggly"
-  s.version     = "0.0.4"
+  s.version     = "0.0.5"
   s.authors     = ["Patrik Antonsson"]
   s.email       = ["patant@gmail.com"]
   s.homepage    = "https://github.com/patant/fluent-plugin-loggly"
@@ -18,8 +18,4 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.required_ruby_version = Gem::Requirement.new(">= 1.9.3")
   s.add_dependency('net-http-persistent', '>= 2.7')
-
-  # specify any dependencies here; for example:
-  # s.add_development_dependency "rspec"
-  # s.add_runtime_dependency "rest-client"
 end

data/lib/fluent/plugin/out_loggly_buffered.rb

@@ -0,0 +1,71 @@
+=begin
+
+  Copyright (C) 2012 Patrik Antonsson
+
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+
+=end
+
+class LogglyOutputBuffred < Fluent::BufferedOutput
+  Fluent::Plugin.register_output('loggly_buffered', self)
+  config_param :loggly_url, :string, :default => nil
+  config_param :output_include_time, :bool, :default => true  # Recommended
+
+  unless method_defined?(:log)
+    define_method("log") { $log }
+  end
+
+  def configure(conf)
+    super
+    $log.debug "Loggly url #{@loggly_url}"
+  end
+
+  def start
+    super
+    require 'net/http/persistent'
+    @uri = URI @loggly_url
+    @http = Net::HTTP::Persistent.new 'fluentd-plugin-loggly'
+    @http.headers['Content-Type'] = 'text'
+  end
+
+  def shutdown
+    super
+  end
+
+  def format(tag, time, record)
+    [tag, time, record].to_msgpack
+  end
+
+  def write(chunk)
+    records = []
+    chunk.msgpack_each {|tag,time,record|
+      record['timestamp'] = Time.at(time).iso8601 if @output_include_time
+      records.push(record.to_json)
+    }
+    $log.debug "#{records.length} records sent"
+    post = Net::HTTP::Post.new @uri.path
+    post.body = records.join("\n")
+    begin
+      response = @http.request @uri, post
+      $log.debug "HTTP Response code #{response.code}"
+      $log.error response.body if response.code != "200"
+    rescue
+      $log.error "Error connecting to loggly verify the url #{@loggly_url}"
+    end
+  end
+end

data/lib/fluent-plugin-loggly/version.rb

@@ -1,7 +1,7 @@
 module Fluent
   module Plugin
     module Loggly
-      VERSION = "0.0.4"
+      VERSION = "0.0.5"
     end
   end
 end

metadata

@@ -1,30 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-loggly
 version: !ruby/object:Gem::Version
-  version: 0.0.4
-  prerelease: 
+  version: 0.0.5
 platform: ruby
 authors:
 - Patrik Antonsson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-25 00:00:00.000000000 Z
+date: 2015-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-http-persistent
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2.7'
 description: Fluentd pluging (fluentd.org) for output to loggly (loggly.com)
@@ -43,28 +40,28 @@ files:
 - lib/fluent-plugin-loggly.rb
 - lib/fluent-plugin-loggly/version.rb
 - lib/fluent/plugin/out_loggly.rb
+- lib/fluent/plugin/out_loggly_buffered.rb
 homepage: https://github.com/patant/fluent-plugin-loggly
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: fluent-plugin-loggly
-rubygems_version: 1.8.23
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Fluentd plugin for output to loggly
 test_files: []