fluent-plugin-containiq 0.0.8 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f1bfb41895707c4472efd77b9053fbc54770e8b6f3d48eac6dfd70033bc6b11
-  data.tar.gz: 38faddbbe69df44185ec418fac379e2ed925f4ba8fd5151bd2d5bd111aaacf87
+  metadata.gz: 9eb2580e1dbbf929f72140634b9608e27f9de36e865bbff1187c441900b7c248
+  data.tar.gz: '0973ed78eb6d706c8f027b1f5cb6e78433132f6c953df689c450c2a81056cd66'
 SHA512:
-  metadata.gz: f575d8675ad207f1de9a02ff17d16d59ec9bb42451c9f05bce347e5f34ee1d626a48e415e9dabc624e7bb7984d0292cc27a9e128da53d598d8cde26acb13247e
-  data.tar.gz: f690e9bf77f9f7b6fd6a3656ed9c5d957d5e720ecf195e1f7c3e29d581489511b776edd0d58102335396fc57d77dbb3eaeb7f08e65e537094e0ca7ba946f1a6e
+  metadata.gz: f51bbd0f492685931ac2ccd0e3411c5197cf587688ed0b42b57bb3238fe44ff02211fbb1299f893d4154cc5f2014d9bd51eadadaca145db4efa71e2d343a452a
+  data.tar.gz: d5bf4349adcdfc72e5735e86f92587dc0246e6e11ba2df10ac770e75ecd03bf929b9ea2d947c181d7e22b730b9f40b9edb15e9b92c2dc4c495aefd961d8677a9

data/fluent-plugin-containiq.gemspec

@@ -3,13 +3,13 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name    = "fluent-plugin-containiq"
-  spec.version = "0.0.8"
+  spec.version = "1.0.3"
   spec.authors = ["ContainIQ"]
   spec.email   = ["matt@containiq.com"]
 
   spec.summary       = "Fluentd output plugin that pushes logs to ContainIQ"
   spec.description   = "Fluentd output plugin that pushes logs to ContainIQ"
-  spec.homepage      = "https://github.com/containiq/fluent-plugin-containiq"
+  spec.homepage      = "https://www.containiq.com/"
   spec.license       = "Apache-2.0"
 
   test_files, files  = `git ls-files -z`.split("\x0").partition do |f|
@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'net-http-persistent', '~> 4.0.1'
-  spec.add_development_dependency "bundler", "~> 2.2.27"
+  spec.add_development_dependency "bundler", "~> 2.3.7"
   spec.add_development_dependency "rake", "~> 13.0.6"
   spec.add_development_dependency "test-unit", "~> 3.4.7"
   spec.add_development_dependency "webmock", "~> 3.14.0"

data/k8s/Gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "fluentd", "1.14.0"
+gem "fluentd", ">= 1.14.2"
 gem "oj", "3.11.0"
 gem "fluent-plugin-multi-format-parser", "~> 1.0.0"
 gem "fluent-plugin-concat", "~> 2.5.0"

data/k8s/fluentd-daemonset.yaml

@@ -4,6 +4,14 @@ metadata:
   name: containiq
 ---
 apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: cluster-config
+  namespace: containiq
+data:
+  cluster-name: your-cluster-name
+---
+apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: fluentd
@@ -82,6 +90,15 @@ spec:
               value: 'true'
             - name: FLUENT_KUBERNETES_METADATA_SKIP_MASTER_URL
               value: 'true'
+            - name: FLUENT_CONTAINER_TAIL_EXCLUDE_PATH
+              value: /var/log/containers/fluent*
+            - name: FLUENT_CONTAINER_TAIL_PARSER_TYPE
+              value: /^(?<time>.+) (?<stream>stdout|stderr)( (?<logtag>.))? (?<log>.*)$/
+            - name: CLUSTER_NAME
+              valueFrom:
+                configMapKeyRef:
+                  name: cluster-config
+                  key: cluster-name
           resources:
             limits:
               memory: 200Mi

data/lib/fluent/plugin/out_containiq.rb

@@ -71,8 +71,13 @@ module Fluent::Plugin
     def encode_chunk(chunk)
       records = []
       bulk_size = 0
+      cluster_name = ENV["CLUSTER_NAME"]
+      if cluster_name.nil?
+        cluster_name = "default"
+      end
       chunk.each { |tag, time, record|
         record['timestamp'] ||= Time.at(time).iso8601(3)
+        record['cluster'] ||= cluster_name
 
         begin
           json_record = Yajl.dump(record)

data/pull_request_template.md

@@ -0,0 +1,31 @@
+## Change description
+
+> Description here
+
+## Type of change
+- [ ] Bug fix (fixes an issue)
+- [ ] New feature (adds functionality)
+- [ ] Other (repo management, deps, refactor, etc)
+
+## Related issues
+
+> Fix [#1]()
+
+## Checklists
+
+### Development
+
+- [ ] Lint rules pass locally
+- [ ] Application changes have been tested thoroughly
+
+### Security
+
+- [ ] Security impact of change has been considered
+- [ ] Code follows company security practices and guidelines
+
+### Code review 
+
+- [ ] Pull request has a descriptive title and context useful to a reviewer. Screenshots or screencasts are attached as necessary
+- [ ] "Ready for review" label attached and reviewers assigned when applicable
+- [ ] Changes have been reviewed by at least one other contributor when applicable
+- [ ] Pull request linked to task tracker where applicable

data/test/plugin/test_out_containiq.rb

@@ -12,6 +12,7 @@ class ContainiqOutputTest < Test::Unit::TestCase
   end
 
   @@ENDPOINT_URL = "https://mock-endpoint"
+  @@CLUSTER_NAME = "default"
   @@API_KEY = 1234
 
   sub_test_case "configuration" do
@@ -87,10 +88,9 @@ class ContainiqOutputTest < Test::Unit::TestCase
       driver.run do
         driver.feed('output.test', time.to_i, {'message' => 'Test message'})
       end
-
       assert_requested(
         :post, @@ENDPOINT_URL, times: 1,
-        body: "[{\"message\":\"Test message\",\"timestamp\":\"#{time.strftime('%Y-%m-%dT%H:%M:%S.000%:z')}\"}]"
+        body: "[{\"message\":\"Test message\",\"timestamp\":\"#{time.strftime('%Y-%m-%dT%H:%M:%S.000%:z' )}\",\"cluster\":\"default\"}]"
       )
       assert_equal(1, driver.formatted.size)
     end
@@ -116,9 +116,9 @@ class ContainiqOutputTest < Test::Unit::TestCase
       assert_requested(
         :post, @@ENDPOINT_URL, times: 1,
         body: "[\
-{\"message\":\"Test message 1\",\"timestamp\":\"#{time_isoformat}\"},\
-{\"message\":\"Test message 2\",\"timestamp\":\"#{time_isoformat}\"},\
-{\"message\":\"Test message 3\",\"timestamp\":\"#{time_isoformat}\"}]"
+{\"message\":\"Test message 1\",\"timestamp\":\"#{time_isoformat}\",\"cluster\":\"default\"},\
+{\"message\":\"Test message 2\",\"timestamp\":\"#{time_isoformat}\",\"cluster\":\"default\"},\
+{\"message\":\"Test message 3\",\"timestamp\":\"#{time_isoformat}\",\"cluster\":\"default\"}]"
       )
       assert_equal(3, driver.formatted.size)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-containiq
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 1.0.3
 platform: ruby
 authors:
 - ContainIQ
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-07 00:00:00.000000000 Z
+date: 2022-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-http-persistent
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.27
+        version: 2.3.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.27
+        version: 2.3.7
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -143,9 +143,10 @@ files:
 - k8s/plugins/parser_kubernetes.rb
 - k8s/plugins/parser_multiline_kubernetes.rb
 - lib/fluent/plugin/out_containiq.rb
+- pull_request_template.md
 - test/helper.rb
 - test/plugin/test_out_containiq.rb
-homepage: https://github.com/containiq/fluent-plugin-containiq
+homepage: https://www.containiq.com/
 licenses:
 - Apache-2.0
 metadata: {}