fluent-plugin-kubernetes_tagged_remote_syslog 0.3.6 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 601c5afbbc0db25d4e4f755e3271f474e15705e6
-  data.tar.gz: 02bf9e9589975c2755d5d2fe6aa74c2cc7af2b6d
+  metadata.gz: 76332363b3bb391b7ef10c1d22322ccd9c5f5dde
+  data.tar.gz: 6b580a9a7db8649d807ab5995ba2f4e149eaed9c
 SHA512:
-  metadata.gz: 0f4d666b250c8286321f4685d18176f2ad959adebad8bd371940f2279086a7031142c69c10262b66185860093fec711d60cd1591324d2d8ce5f84c4f870abca1
-  data.tar.gz: cda027c1edfbcdd0bfeb5740cd79c24f5bfe691f97f42dc30c305ca9fa4284f13afa1954f3f756869f46d6a5f4737f23c317e22d8f1ff3909734f53b727dd489
+  metadata.gz: aa408fcfa941a8f84fed0086a7b45fbc87756fe622261f6d278ae61810a3f2844cdd76ebe1ceb5f9ed3543355f23bd7b5aa465c864d123c6357a22c422c291c1
+  data.tar.gz: 170c7f8a21e9a57948765977c582b6f0eb485df763cafce1eb1bd332ef9f14a1b4ea3496d506ba2c325bd69abba3c5fb485f600980f1013566ddb171036ac0d2

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.4.0
+
+* Better name shortening.
+
 ## 0.3.6
 
 * Rewritten, failure preventions.

data/README.md

@@ -1,7 +1,7 @@
-# fluent-plugin-kubernetes_tagged_remote_syslog
-
 <!-- [![Build Status](https://travis-ci.org/kvitajakub/fluent-plugin-kubernetes_tagged_remote_syslog.svg?branch=master)](https://travis-ci.org/kvitajakub/fluent-plugin-kubernetes_tagged_remote_syslog) -->
 
+# fluent-plugin-kubernetes_tagged_remote_syslog
+
 [Fluentd](http://fluentd.org) plugin for output to remote syslog service (e.g. [Papertrail](http://papertrailapp.com/)). It is meant to use in Kubernetes environment with [kubernetes_metadata_filter](https://github.com/fabric8io/fluent-plugin-kubernetes_metadata_filter) plugin annotating the messages.
 
 This plugin was created because regular remote syslog Fluentd plugins doesn't work well with kubernetes annotated messages. `hostname`/`program` fields have not helpful values `localhost`/`fluentd` and actual message is unreadable compact JSON.
@@ -16,7 +16,8 @@ This plugin was created because regular remote syslog Fluentd plugins doesn't wo
 Default input should be JSON message annotated with kubernetes info:
 ```
 {
-  "log": "2015/05/05 19:54:41 log me\n",
+  "log": "log me\n",
+  "time": "2015-05-05T19:54:41.248307+00:00",
   "stream": "stderr",
   "docker": {
     "id": "df14e0d5ae4c07284fa636d739c8fc2e6b52bc344658de7d3f08c36a2e804115",
@@ -36,12 +37,12 @@ Default input should be JSON message annotated with kubernetes info:
 ```
 This will become:
 ```
-default fabric8-console-controller-98rqc: 2015/05/05 19:54:41 \n
+default fabric8-console-controller-98rqc: log me\n
 ```
 
 And at the message receive Papertrail will add a timestamp in front of the message:
 ```
-May 05 19:54:45 default fabric8-console-controller-98rqc: 2015/05/05 19:54:41 log me\n
+May 05 19:54:45 default fabric8-console-controller-98rqc: log me\n
 ```
 
 ## Usage

data/VERSION

@@ -1 +1 @@
-0.3.6
+0.4.0

data/lib/fluent/plugin/out_kubernetes_tagged_remote_syslog.rb

@@ -22,6 +22,14 @@ module Fluent
       super
     end
 
+    def shorten_name(str)
+      if str.length > 31
+        return str.sub(str[24...-5],"..")
+      else
+        return str
+      end
+    end
+
     def emit(tag, es, chain)
       es.each do |_time, record|
         record.each_pair do |_k, v|
@@ -37,8 +45,8 @@ module Fluent
           @port,
           facility: record['facility'] || @facility,
           severity: record['severity'] || @severity,
-          program: (record.dig('kubernetes', @program) || @program)[0...31],
-          local_hostname: (record.dig('kubernetes', @hostname) || @hostname)[0...31])
+          program: shorten_name(record.dig('kubernetes', @program) || @program),
+          local_hostname: shorten_name(record.dig('kubernetes', @hostname) || @hostname))
 
         @loggers[tag].transmit((if record.key?('log') then record['log'] else record end).to_s)
       end

data/test/plugin/out_kubernetes_tagged_remote_syslog.rb

@@ -1,13 +1,14 @@
-require "test_helper"
-require "fluent/plugin/out_kubernetes_tagged_remote_syslog"
+require 'test_helper'
+require 'json'
+require 'fluent/plugin/out_kubernetes_tagged_remote_syslog'
 
 class KubernetesTaggedRemoteSyslogOutputTest < MiniTest::Unit::TestCase
   def setup
     Fluent::Test.setup
   end
 
-  def create_driver(conf = CONFIG, tag = "test.kubernetes_tagged_remote_syslog")
-    Fluent::Test::OutputTestDriver.new(Fluent::KubernetesTaggedRemoteSyslogOutput, tag) {}.configure(conf)
+  def create_driver(conf = CONFIG, program = "test.kubernetes_tagged_remote_syslog")
+    Fluent::Test::OutputTestDriver.new(Fluent::KubernetesTaggedRemoteSyslogOutput, program) {}.configure(conf)
   end
 
   def test_configure
@@ -45,7 +46,7 @@ class KubernetesTaggedRemoteSyslogOutputTest < MiniTest::Unit::TestCase
       host example.com
       port 5566
       severity debug
-      tag rewrited.${tag_parts[1]}
+      program rewrited.${tag_parts[1]}
     ]
 
     d.run do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-kubernetes_tagged_remote_syslog
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.4.0
 platform: ruby
 authors:
 - Richard Lee, Jakub Kvita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-12 00:00:00.000000000 Z
+date: 2017-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -119,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Fluentd output plugin for remote syslog. This is meant for processing kubernetes