fluent-plugin-loggly-anno 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: babb9e88dd84a549aac49454c9353d3d79e9f5a8
-  data.tar.gz: 8b9dcc3bb0b04eff3f31b1d1f27935ef80ffb256
+  metadata.gz: 73c7ef48b9797dd0749b0b6d07cb6c8cf0e4e61b
+  data.tar.gz: 96768b22283ea6fa8530decfca400da716969172
 SHA512:
-  metadata.gz: 30b17dfce5a55a443940adbecf5c7a413388879f4d257596e1381b2a8c5e98c69c2f4328ca4c6e31e0a620846ab851598e32e9bb5dac268a5057f994e9df699d
-  data.tar.gz: dff545814895749f8c17055c8b50d50296c7a2e681c0b386bc34052e27147ee5147ff9c0d3bcc7c00fecd4bf21414bb2f2741c156eb9f37457d318742221b45f
+  metadata.gz: 2d09e63a2b95de604d4094a84a3c3e43db80daa943879ac4ae915015c6d8962a45d0e192655e773f1bbb153d1e3656b9dd09ad390251c679172c421fe5b05d47
+  data.tar.gz: 83d12fc04ad22dfd963e38f01fefc73a7c0c595297ffd60ed9fe8289e805e90048f1cb7d1539c5a5e09e93ae9a8008081241abed6fc7f30059601d45d361e267

data/README.md

@@ -40,10 +40,22 @@ The `xxx-xxxx...` is your Loggly access token.
 
 ## Annotations
 
-If you're running on Kubernetes you can redirect your logs, to a separate loggly url, by simply adding the following annotation to your namespace or pod:
+If you're running on Kubernetes you can use annotations to redirect logs to alternate Loggly URLs.
+  
+Simply enable the [fluent-plugin-kubernetes_metadata_filter](https://github.com/fabric8io/fluent-plugin-kubernetes_metadata_filter) gem in your Fluentd setup and configure it to match annotations on the namespace and pod:
+
+```
+<filter kubernetes.**>
+  type kubernetes_metadata
+  include_namespace_metadata true
+  annotation_match ["solarwinds.io/*"]
+</filter>
+```
+  
+Then add the following annotation to each namespace or pod that you'd like to redirect logs for:
 
 ```
 solarwinds.io/loggly_url: 'https://logs-01.loggly.com/inputs/xxx-xxxx-xxxx-xxxxx-xxxxxxxxxx'
 ```
 
-If both the Pod and Namespace have annotations for any running Pod, the Pod's annotation takes precedence.
+If both a pod and the namespace it's in have this annotation, the pod's annotation takes precedence.

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-anno"
-  s.version     = "0.0.1"
+  s.version     = "0.0.2"
   s.authors     = ["Chris Rust"]
   s.email       = ["chris.rust@solarwinds.com"]
   s.homepage    = "https://github.com/cmrust/fluent-plugin-loggly"

data/lib/fluent/plugin/out_loggly_buffered.rb

@@ -33,17 +33,30 @@ class LogglyOutputBuffred < Fluent::BufferedOutput
 
   def configure(conf)
     super
-    $log.debug "Loggly url #{@loggly_url}"
+    $log.debug "Configured loggly url: #{@loggly_url}"
   end
 
   def start
     super
     require 'net/http/persistent'
-    @uri = URI @loggly_url
     @http = Net::HTTP::Persistent.new 'fluentd-plugin-loggly', :ENV
     @http.headers['Content-Type'] = 'text'
   end
 
+  def pick_uri(record)
+    # if kubernetes pod has loggly url as annotation, use it
+    if record.dig('kubernetes', 'annotations', 'solarwinds_io/loggly_url')
+      url = record['kubernetes']['annotations']['solarwinds_io/loggly_url']
+      # else if kubernetes namespace has papertrail destination as annotation, use it
+    elsif record.dig('kubernetes', 'namespace_annotations', 'solarwinds_io/loggly_url')
+      url = record['kubernetes']['namespace_annotations']['solarwinds_io/loggly_url']
+      # else use pre-configured destination
+    else
+      url = @loggly_url
+    end
+    URI url
+  end
+
   def shutdown
     super
   end
@@ -57,20 +70,24 @@ class LogglyOutputBuffred < Fluent::BufferedOutput
   end
 
   def write(chunk)
-    records = []
     chunk.msgpack_each {|tag,time,record|
+      records = []
       record['timestamp'] ||= Time.at(time).iso8601(@time_precision_digits) if @output_include_time
       records.push(Yajl::Encoder.encode(record))
+      uri = pick_uri(record)
+      $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}"
+        if response.code != '200'
+          $log.error "Received HTTP #{response.code} from #{uri}: #{response.body}"
+        end
+      rescue => e
+        $log.error "Error posting to #{uri}: #{e}"
+      end
     }
-    $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
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-loggly-anno
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Chris Rust
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-24 00:00:00.000000000 Z
+date: 2018-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-http-persistent