fluent-plugin-newrelic 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6eda7bbd72805879aaa17fca2b3cf43592742d51eae4ed16c96340b6f7c4e466
-  data.tar.gz: 4f690f5faebe17f8bc63f5e69987ee58dbc45db50671a1afc8fa4fa2a57146d7
+  metadata.gz: cd81b1178e9c16c6d1a9814e456b13936132c96a70c32248f7da5947255875e0
+  data.tar.gz: ebc969b9fbb9bc02f8053e7e039f9d748dba44ab7c29fc4d4b9d96dba378a19d
 SHA512:
-  metadata.gz: de56af89cd2c94df00f4ac4c4f66f143a574dc56eaad6339ef873146085c1039ab8ffe3f752087663fb1728736bc2f155bb0e9133b389da266f226f21ac2b52a
-  data.tar.gz: '087805f75ce8784e6af381b3b48217ee36b380dd662a73d5321ef04f32f04da22118e9bbc68bc508d99414722af5a0683b6f659b4a73c4644040c0e1dd9affa5'
+  metadata.gz: '0498345d651300e2e75bf44fe0c183fc6b861d29688125aa97d1129a1ae4f1798a1bcac00bd29278e163f7c3d46771fa547ee14768bad0e6f3a39ecc0f9fe23d'
+  data.tar.gz: 8d9830136f2bd34c54820a07ab86bfc7fb40150357501e1ad4854bf037e206fbacee8aff7401cddcd451b3fdcf809ff0fb690dac5d91e43e5d2d7f71fa002c24

data/README.md

@@ -37,6 +37,12 @@ For more info, review [Fluentd's official documentation](https://docs.fluentd.or
 | max_delay | The maximum delay between retries, in seconds | 30 |
 | base_uri | New Relic ingestion endpoint | 'https://log-api.newrelic.com/log/v1' |
 
+### Fields
+
+* To make Kubernetes log forwarding easier, any `log` field in a log event will be
+renamed to `message`, overwriting any `message` field. Kubernetes logs have their messages
+in a `log` field, while we want messages in a `message` field.
+
 ### Example
 
 Add the following block to your Fluentd config file (with your specific New Relic Insights Insert key), then restart Fluentd.

data/lib/fluent/plugin/out_newrelic.rb

@@ -73,6 +73,14 @@ module Fluent
           packaged['message'] = record['message']
           packaged['attributes'].delete('message')
         end
+
+        # Kubernetes logging puts the message field in the 'log' attribute, we'll use that
+        # as the 'message' field if it exists. We do the same in the Fluent Bit output plugin.
+        # See https://docs.docker.com/config/containers/logging/fluentd/
+        if record.has_key?('log')
+          packaged['message'] = record['log']
+          packaged['attributes'].delete('log')
+        end
         
         packaged
       end

data/lib/newrelic-fluentd-output/version.rb

@@ -1,3 +1,3 @@
 module NewrelicFluentdOutput
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-newrelic
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - New Relic Logging Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-28 00:00:00.000000000 Z
+date: 2019-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd