fluent-plugin-containiq 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0ac5cbe86d69c5a71b112445037390c8b2aa3711b0e1a8c9d403a4d0bb1c5f8
-  data.tar.gz: a67d1f017e124ad161fda905faac98bed490c678405312bd5a82a01ee114e0b8
+  metadata.gz: 3887ee226b158277ad98bb86a53a3b9f77f5bd4ece17832f40b2f63e32b8209d
+  data.tar.gz: b2edcafdaf2fd9b0e781fe4f76ebc0c74e182e226ba02dd6eeb79453029feb12
 SHA512:
-  metadata.gz: 60f894974ff6ce7b229d857e69521f341402a473932d2c23c07ad2862ef56ffdd1c3947ff87dcadac6a0a84f5d558b6c1d5af90dedddc5c505abdb5a683a81a7
-  data.tar.gz: baf145db919d170b7c0c8979c9f4c77f28a7c0d5d110faf044d723e6c01c85980bc49c35d74bf0ccb8569335838cfb4a3eea196d25eb0c47f8ad3bf70648636c
+  metadata.gz: a91f7c8f01f9ade710de5019729e28d8bd67e2a7571b9897f36b97fefa24bed5a4260359dd4b67f70c0ec4900f19481c6366075913a90c0562de34f31a3f78e4
+  data.tar.gz: c0940944e1a8c756db22f9deb7184124b6f308beeb2c9e69c2fc993a0035ca7cac2ef3c8b254a6150e9ad21dcb321c6c9bc419d1ff89650a76882868af5c00d9

data/fluent-plugin-containiq.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name    = "fluent-plugin-containiq"
-  spec.version = "1.0.1"
+  spec.version = "1.0.2"
   spec.authors = ["ContainIQ"]
   spec.email   = ["matt@containiq.com"]
 

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: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - ContainIQ
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-28 00:00:00.000000000 Z
+date: 2021-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-http-persistent
@@ -143,6 +143,7 @@ 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://www.containiq.com/