fluent-plugin-gelf 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70a3623ed2adde0ca73a4f9b406657a50ba9cbb33ffbe5512fad9c9fb76591db
-  data.tar.gz: 6a7acdaa55e1088efbce002224c88c8795a84b5d1ac634f48dd2c5e063c3f4ad
+  metadata.gz: 9b95b9d630db3296ea2d920c10b1a5cb05b6f3cbcc86de82795a5c238328083d
+  data.tar.gz: 25016aaaec6a129f4719fae348af1474f8a170849bc658afe81d4a7035b3dde2
 SHA512:
-  metadata.gz: 76b60605cf69b29427372dedf3792132a761410e23f7bf7f918290694e1eb06225f90f5263a6a54c08ca7bc52ab44a8cdbb0baa4cf34d31d685bb4ffc75f2e7f
-  data.tar.gz: 73742730f414d4643e12914c15cbdd61a4900ee50219b74538afe312ca74243a3a249cd77c26c63b2ec20aa1260e3297ca0f60b29e6cb873bddc0cede6ef8492
+  metadata.gz: ee1b9173784a298b8a5ec79444381d3af7dc6f29aa5a44575d8b956666240785f8cb6169544ef66249c2a41641f247f0f39bbfae5a79c820534f2f48dd7939a4
+  data.tar.gz: 20d84f40b14342d4d884cf5cd28bde66ccc13610dea51565a865bd6f77cd92680b6f7f264c641ba6f6d9e9bd0abf6c59b2ccef2375a38d4c74adc6706cae2313

data/.circleci/config.yml

@@ -30,12 +30,9 @@ jobs:
             mkdir -p ~/.gem
             echo ":rubygems_api_key: $RUBYGEMS_API_KEY" >  ~/.gem/credentials
             chmod 0600 ~/.gem/credentials
-      - run:
-          name: Build gem
-          command: bundle exec rake build --trace
       - run:
           name: Release gem
-          command: bundle exec rake release:rubygem_push --trace
+          command: bundle exec rake build release:rubygem_push --trace
   rubocop:
     executor: ruby
     steps:

data/README.md

@@ -43,7 +43,7 @@ This `gelf` plugin is for fluentd v1.0 or later.
 
 The hostname of your Graylog cluster.
 
-####o port (integer) (optional)
+#### port (integer) (optional)
 
 The TCP port of your Graylog cluster. Default value: `12201`.
 

data/fluent-plugin-gelf.gemspec

@@ -5,7 +5,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name    = "fluent-plugin-gelf"
-  spec.version = "0.2.4"
+  spec.version = "0.2.5"
   spec.authors = ["Funding Circle"]
   spec.email   = ["engineering+fluent-plugin-gelf@fundingcircle.com"]
 
@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "oj", "~> 3.3.10"
-  spec.add_development_dependency "bundler", "~> 2.1.4"
+  spec.add_development_dependency "bundler", "~> 2.2.32"
   spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "test-unit", "~> 3.0"
   spec.add_development_dependency "test-unit-rr", "~> 1.0.5"

data/lib/fluent/plugin/gelf_plugin_util.rb

@@ -41,7 +41,7 @@ module Fluent
       json["host"] = record["host"] # preserve host
       record.delete(key)
       record.merge(json)
-    rescue Oj::ParseError
+    rescue Oj::ParseError, EncodingError, IndexError
       record
     end
 

data/test/fixtures/quoted_string.json

@@ -0,0 +1,31 @@
+{
+  "event": {
+    "tag": "docker.9ee424d12013",
+    "time": "2022-02-03 16:17:23.034547719",
+    "record": {
+      "container_id": "9ee424d120137232b53bbaa678097b71e50e69de148e2ee4b77a94795e561862",
+      "container_name": "/mesos-b3e48670-9810-4c80-93dc-e45ffd485a00",
+      "source": "stdout",
+      "log": "    \"${catalina.home}/lib/*.jar\"",
+      "mesos_framework": "marathon",
+      "app": "jira",
+      "mesos_task_id": "jira.instance-ab27d9c9-850c-11ec-a8d1-024295fdd3e6._app.1",
+      "host": "mesosslave-private-04610d00f6a6254ec",
+      "msec": "512"
+    }
+  },
+  "expected": {
+    "timestamp": 1643905043.035,
+    "_fluentd_tag": "docker.9ee424d12013",
+    "_container_id": "9ee424d120137232b53bbaa678097b71e50e69de148e2ee4b77a94795e561862",
+    "_container_name": "/mesos-b3e48670-9810-4c80-93dc-e45ffd485a00",
+    "_source": "stdout",
+    "_mesos_framework": "marathon",
+    "_app": "jira",
+    "_mesos_task_id": "jira.instance-ab27d9c9-850c-11ec-a8d1-024295fdd3e6._app.1",
+    "host": "mesosslave-private-04610d00f6a6254ec",
+    "_msec": "512",
+    "short_message": "    \"${catalina.home}/lib/*.jar\"",
+    "level": 6
+  }
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-gelf
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Funding Circle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-13 00:00:00.000000000 Z
+date: 2022-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: 2.2.32
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: 2.2.32
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -141,6 +141,7 @@ files:
 - test/fixtures/docker_unformatted.json
 - test/fixtures/level_from_tag.json
 - test/fixtures/message_json_parsable_to_nil.json
+- test/fixtures/quoted_string.json
 - test/fixtures/systemd.json
 - test/fixtures/systemd_inner_json.json
 - test/fixtures/systemd_with_real_timestamp.json
@@ -166,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: Graylog output plugin for fluentd
@@ -179,6 +180,7 @@ test_files:
 - test/fixtures/docker_unformatted.json
 - test/fixtures/level_from_tag.json
 - test/fixtures/message_json_parsable_to_nil.json
+- test/fixtures/quoted_string.json
 - test/fixtures/systemd.json
 - test/fixtures/systemd_inner_json.json
 - test/fixtures/systemd_with_real_timestamp.json