fluent-plugin-zebrium_output 1.59.1 → 1.60.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb6b0f324a3a9fe5d9a95faefc8bef89bff44658ba7785f38a8d77690618cbc0
-  data.tar.gz: c9d33eccabdf8b8ede3142e92951d8d554113d193b2994aa9a98201a6abab8a9
+  metadata.gz: 0dcd1899853ded6d1534b6ea989e357015a5dc5d8af78fff0cfa6f66a3497f82
+  data.tar.gz: 8509a8a6f1c21c9877e832ca2c967c831c302f5ec62c9d3aca173c31d8b7c341
 SHA512:
-  metadata.gz: cdf359ff83668ecc6251ff1091b50f1e75bbca07590d471951696564af019716da75ed7cfcb3d924d8e64177cf0cd5bcd719d7e6df60122a3a635ea8dcda64a8
-  data.tar.gz: 85f399972066fc15867eb0d2dbb39bdba0c4a8668fa1ef4a06e3449b9538f3b60f2ffd9eed6f65684d96f4c884aaffa9dab63ad8e18e8fbec07c414a506ab6a4
+  metadata.gz: 7aa06c850610396b2b277ea16d9dedd1bcbae46d16b12ded0028843309fc1bbffa9a4fe6db1be7d32bf27ac7cfcfd15fc45ab52e15f5a12701dc3ecfcae4917d
+  data.tar.gz: b1e43bad6dede00ed39c68fa5ea84145a4e386a6be8e31cdc11058c9505d61c523116806fd5331d0d2a653479ea06406d296c13d837a36f0c6c5babba20af6f3

data/Jenkinsfile

@@ -4,7 +4,7 @@
     stages {
         stage('Build and Publish Gem'){
             steps{
-                buildGem(false, "fluent-plugin-zebrium_output")
+                buildGem( "fluent-plugin-zebrium_output")
             }
         }
    }

data/LICENSE

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

data/SECURITY.md

@@ -0,0 +1,15 @@
+# Security Policy
+
+## Supported Versions
+
+Use this section to tell people about which versions of your project are
+currently being supported with security updates.
+
+| Version | Supported          |
+| ------- | ------------------ |
+| >= 1.60.0 | :white_check_mark: |
+
+
+## Reporting a Vulnerability
+
+Please reach out to security@zebrium.com with any concerns or findings.  

data/build.sh

@@ -1,5 +1,9 @@
 #!/bin/sh
 
+. /auto/share/etc/functions
+
+PROG=${0##*/}
+
 PLUGIN_NAME="fluent-plugin-zebrium_output"
 
 main() {
@@ -8,4 +12,4 @@ main() {
     echo "DONE"
 }
 
-main "$@"
+main "$@"

data/fluent-plugin-zebrium_output.gemspec

@@ -19,10 +19,10 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '>= 2.0.0'
 
-  gem.add_development_dependency "bundler", '~> 2'
-  gem.add_development_dependency 'rake', '>= 0', '< 14'
-  gem.add_development_dependency 'test-unit', '>= 3.1.0', '~> 3'
-  gem.add_development_dependency 'codecov', '>= 0.1.10', '< 1'
-  gem.add_runtime_dependency 'fluentd', '>= 0.14.12', '< 2'
-  gem.add_runtime_dependency 'httpclient', '>= 2.8.0', '~> 2'
+  gem.add_development_dependency 'bundler', '~> 2', '>= 2.2.33'
+  gem.add_development_dependency 'rake', '~> 13'
+  gem.add_development_dependency 'test-unit', '~> 3.1', '>= 3.1.0'
+  gem.add_development_dependency 'codecov', '~> 0.1', '>= 0.1.10'
+  gem.add_runtime_dependency 'fluentd', '~> 1.14', '>= 1.14.2'
+  gem.add_runtime_dependency 'httpclient', '~> 2.8', '>= 2.8.0'
 end

data/lib/fluent/plugin/out_zebrium.rb

@@ -8,7 +8,7 @@ require 'docker'
 require 'yaml'
 require 'time'
 
-$ZLOG_COLLECTOR_VERSION = '1.59.0'
+$ZLOG_COLLECTOR_VERSION = '1.60.0'
 
 class PathMappings 
   def initialize
@@ -81,7 +81,7 @@ class Fluent::Plugin::Zebrium < Fluent::Plugin::Output
   config_param :ze_path_map_file, :string, :default => ""
   config_param :ze_ns_svcgrp_map_file, :string, :default => ""
   config_param :ze_handle_host_as_config, :bool, :default => false 
-
+  config_param :cluster_name, :string, :default => ""
   config_section :format do
     config_set_default :@type, DEFAULT_LINE_FORMAT_TYPE
     config_set_default :output_type, DEFAULT_FORMAT_TYPE
@@ -209,6 +209,7 @@ class Fluent::Plugin::Zebrium < Fluent::Plugin::Output
     @zapi_support_uri = @zapi_uri.clone
     @zapi_support_uri.path = "/api/v2/support"
     @auth_token = conf["ze_log_collector_token"]
+    @cluster_name = conf["cluster_name"]
     log.info("ze_log_collector_vers=" + $ZLOG_COLLECTOR_VERSION)
     log.info("ze_log_collector_type=" + @ze_log_collector_type)
     log.info("ze_deployment_name=" + (conf["ze_deployment_name"].nil? ? "<not set>": conf["ze_deployment_name"]))
@@ -218,6 +219,7 @@ class Fluent::Plugin::Zebrium < Fluent::Plugin::Output
     log.info("ze_path_map_file=" + @ze_path_map_file)
     log.info("ze_host_in_logpath=#{@ze_host_in_logpath}")
     log.info("ze_ns_svcgrp_map_file=" + @ze_ns_svcgrp_map_file)
+    log.info("cluster_name=" +(conf["cluster_name"].nil? ? "<not set>": conf["cluster_name"]))
     data = {}
     data['msg'] = "log collector starting"
     send_support_data(data)
@@ -607,6 +609,11 @@ class Fluent::Plugin::Zebrium < Fluent::Plugin::Output
       unless kubernetes["labels"].nil?
         cfgs.merge!(kubernetes["labels"])
       end
+      # Allow Cluster name to be set via an env variable
+      if !@cluster_name.nil? and !@cluster_name.empty?
+        cfgs["cluster_name"] = @cluster_name
+      end
+
       # At this point k8s config should be set. Save these so a subsequent file-log
       # record for the same pod_id can use them.
       save_kubernetes_cfgs(cfgs)
@@ -706,6 +713,10 @@ class Fluent::Plugin::Zebrium < Fluent::Plugin::Output
         logbasename = record["_SYSTEMD_UNIT"].gsub(/\.service$/, '')
       elsif chunk_tag =~ /^k8s\.events/
         logbasename = "zk8s-events"
+        # Allow Cluster name to be set via an env variable
+        if !@cluster_name.nil? and !@cluster_name.empty?
+          cfgs["cluster_name"] = @cluster_name
+        end
       elsif chunk_tag =~ /^ztcp\.events\./
         ids["host"] = record_host.empty? ? "ztcp_host": record["host"]
         logbasename = record["logbasename"] ? record["logbasename"] : "ztcp_stream"
@@ -1128,4 +1139,4 @@ class Fluent::Plugin::Zebrium < Fluent::Plugin::Output
     super
   end
 
-end
+end

data/version.txt

@@ -1 +1 @@
-1.59.1
+1.60.1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-zebrium_output
 version: !ruby/object:Gem::Version
-  version: 1.59.1
+  version: 1.60.1
 platform: ruby
 authors:
 - Zebrium, Inc
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-01 00:00:00.000000000 Z
+date: 2022-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -17,6 +17,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.33
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,108 +27,105 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.33
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '14'
+        version: '13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '14'
+        version: '13'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3'
 - !ruby/object:Gem::Dependency
   name: codecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.10
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.10
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1'
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.12
-    - - "<"
+        version: '1.14'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: 1.14.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.12
-    - - "<"
+        version: '1.14'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: 1.14.2
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.8'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.8.0
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.8'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.8.0
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
 description: Output plugin to Zebrium HTTP LOG COLLECTOR SERVER
-email:
+email: 
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -133,7 +133,9 @@ files:
 - ".gitignore"
 - Gemfile
 - Jenkinsfile
+- LICENSE
 - README.TXT
+- SECURITY.md
 - build.sh
 - config/td-agent.conf
 - fluent-plugin-zebrium_output.gemspec
@@ -143,8 +145,8 @@ homepage: https://github.com/Zebrium/fluentd-output-zebrium
 licenses:
 - Apache-2.0
 metadata:
-  git-version: c9861a38b8a60b7c37a2bafcc39043fb76cefcc9
-post_install_message:
+  git-version: fef054bb305aca8e2a2d595f06c1d0a52d88abee
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -159,8 +161,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key:
+rubygems_version: 3.2.5
+signing_key: 
 specification_version: 4
 summary: Zebrium fluentd output plugin
 test_files: []