fluent-plugin-vmware-loginsight 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 769cbf3caa38634e432618e399254da2f53d6ba18e8b2def4b9d172aaed29c63
-  data.tar.gz: ba0ef75193473229d2d1d47de0866160e261dcd19672f5fde1c7bdfd9b423ea1
+  metadata.gz: c51be49fa1014357b97a164dd1d7f560a3370abdee80aa461323864a08799c00
+  data.tar.gz: c6de42ca3daa2d432a95ead1a9534ce61a09379ecd24bca06a87dbaaa56b98cd
 SHA512:
-  metadata.gz: 3e6a40c4f69297840d6da7cab368a22df065080e0e3706e351686f67ea440d04d8a550d1b4554bac46a25d922be4c40584afb42ffe958c3f48b1cdb18d19822f
-  data.tar.gz: 1f954795a9d5064904df57469ebe071f94400a39644b14101767542a13bab312a6091ca0348855c8c392be385edf030374e3588c1d012da7208d0c8a6d74b335
+  metadata.gz: eaa154fcc5d89035c02f6544b5badb1258cb3af4bef6642aa54cba61791af656b98ea53bdf84ec299fd8b198e6a6ef479fbfb7ea737e0a37a477a71d818fc795
+  data.tar.gz: dc3c4176ffb0dc4765bbaa3bba6dc1cf94528daac797d8c8b6dae878585434faf96074bcd24390ad249424867fc499b3fc83360e71124f1607aa1f94c11e60b7

data/examples/{Dockerfile → fluentd-vrli-plugin-debian.dockerfile}

@@ -1,6 +1,6 @@
 # Fluentd plugin for VMware Log Insight
 # 
-# Copyright 2018 VMware, Inc. All Rights Reserved. 
+# Copyright 2018-2019 VMware, Inc. All Rights Reserved. 
 # 
 # This product is licensed to you under the MIT license (the "License").  You may not use this product except in compliance with the MIT License.  
 # 
@@ -8,7 +8,11 @@
 # 
 # SPDX-License-Identifier: MIT
 
-
+# Builds a debian-based image that contains fluentd, fluent-plugin-vmware-loginsight, fluent-plugin-kubernetes_metadata_filter
+# and fluent-plugin-systemd.
+#
+# The image is preconfigured with the fluent.conf from the examples dir. For more details see
+# https://github.com/vmware/fluent-plugin-vmware-loginsight/blob/master/examples/fluent.conf
 FROM fluent/fluentd:v0.14.15-debian-onbuild
 # Above image expects the loginsight plugin vmware_loginsight to be available under ./plugins/vmware_loginsight.rb
 # and fluentd config under ./fluent.conf by default

data/examples/fluentd-vrli-plugin-photon-tdnf.dockerfile

@@ -0,0 +1,45 @@
+# Fluentd plugin for VMware Log Insight
+# 
+# Copyright 2019 VMware, Inc. All Rights Reserved. 
+# 
+# This product is licensed to you under the MIT license (the "License").  You may not use this product except in compliance with the MIT License.  
+# 
+# This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file. 
+# 
+# SPDX-License-Identifier: MIT
+
+# Builds a photon-based image that contains fluentd, fluent-plugin-vmware-loginsight some of the tools recommended by fluent
+# (libjemalloc, oj, assync-http). This image is based on the minimalistic VMware Photon OS so the result is smaller in size.
+# Furthermore, all of the needed components are installed from the trusted Photon repository by using the tdnf package manager.
+#
+# Fluentd is configured with the default configuration that gets produced by the `fluentd --setup` command. For an example of
+# a configuration that uses the fluent-plugin-vmware-loginsight plugin check fluent.conf under the examples dir:
+# https://github.com/vmware/fluent-plugin-vmware-loginsight/blob/master/examples/fluent.conf
+
+FROM photon:3.0-20190705
+
+USER root
+
+# Distro sync and install components
+RUN tdnf distro-sync --refresh -y \
+    && tdnf install -y \
+    rubygem-fluentd-1.6.3 \
+    #
+    # optional but used by fluentd
+    rubygem-oj-3.3.10 \
+    rubygem-async-http-0.48.2 \
+    jemalloc-4.5.0 \
+    #
+    # Install Log Insight plugin
+    rubygem-fluent-plugin-vmware-loginsight-0.1.5
+
+RUN ln -s /usr/lib/ruby/gems/2.5.0/bin/fluentd /usr/bin/fluentd \
+    && fluentd --setup
+
+# Make sure fluentd picks jemalloc
+ENV LD_PRELOAD="/usr/lib/libjemalloc.so.2"
+
+# Standard fluentd ports
+EXPOSE 24224 5140
+
+ENTRYPOINT ["/usr/bin/fluentd"]

data/examples/fluentd-vrli-plugin-photon.dockerfile

@@ -0,0 +1,68 @@
+# Fluentd plugin for VMware Log Insight
+# 
+# Copyright 2019 VMware, Inc. All Rights Reserved. 
+# 
+# This product is licensed to you under the MIT license (the "License").  You may not use this product except in compliance with the MIT License.  
+# 
+# This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file. 
+# 
+# SPDX-License-Identifier: MIT
+
+# Builds a photon-based image that contains fluentd, fluent-plugin-vmware-loginsight some of the tools recommended by fluent
+# (libjemalloc, oj, assync-http). This image is based on the minimalistic VMware Photon OS so the result is smaller in size.
+#
+# Fluentd is configured with the default configuration that gets produced by the `fluentd --setup` command. For an example of
+# a configuration that uses the fluent-plugin-vmware-loginsight plugin check fluent.conf under the examples dir:
+# https://github.com/vmware/fluent-plugin-vmware-loginsight/blob/master/examples/fluent.conf
+FROM photon:3.0-20190705
+
+USER root
+
+RUN buildDeps="\
+    binutils linux-api-headers glibc-devel \
+    make gcc gmp-devel libffi-devel \
+    tar bzip2 sed gawk" \
+    #
+    # Distro sync and install build dependencies
+    && tdnf distro-sync --refresh -y \
+    # Toybox conflicts with bzip2. The latter is needed to unpack libjemalloc
+    && tdnf remove -y toybox \
+    && tdnf install -y $buildDeps ruby \
+    #
+    # These are not required but are used if available
+    && gem install oj -v 3.3.10 \
+    && gem install json -v 2.2.0 \
+    && gem install async-http -v 0.46.3 \
+    #
+    # Install fluentd
+    && gem install --norc --no-document fluentd -v 1.6.3 \
+    && mkdir -p /fluentd/etc /fluentd/plugins \
+    #
+    # Install Log Insight plugin
+    && gem install --norc --no-document -v 0.1.5 fluent-plugin-vmware-loginsight \
+    #
+    # Install jemalloc 4.5.0
+    && curl -L --output /tmp/jemalloc-4.5.0.tar.bz2 https://github.com/jemalloc/jemalloc/releases/download/4.5.0/jemalloc-4.5.0.tar.bz2 \
+    && tar -C /tmp/ -xjvf /tmp/jemalloc-4.5.0.tar.bz2 \
+    && cd /tmp/jemalloc-4.5.0 \
+    && ./configure && make \
+    && mv lib/libjemalloc.so.2 /usr/lib \
+    && cd / \
+    #
+    # Cleanup to reduce image size
+    && rm -rf /tmp/jemalloc-4.5.0* \
+    && tdnf remove -y $buildDeps \
+    && tdnf clean all \
+    && gem sources --clear-all \
+    && gem cleanup
+
+# Create default fluent.conf
+RUN fluentd --setup
+
+# Make sure fluentd picks jemalloc
+ENV LD_PRELOAD="/usr/lib/libjemalloc.so.2"
+
+# Standard fluentd ports
+EXPOSE 24224 5140
+
+ENTRYPOINT ["/usr/bin/fluentd"]

data/fluent-plugin-vmware-loginsight.gemspec

@@ -14,7 +14,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name    = "fluent-plugin-vmware-loginsight"
-  spec.version = "0.1.5"
+  spec.version = "0.1.6"
   spec.authors = ["Vishal Mohite", "Chris Todd"]
   spec.email   = ["vmohite@vmware.com", "toddc@vmware.com"]
 

data/lib/fluent/plugin/out_vmware_loginsight.rb

@@ -136,7 +136,8 @@ module Fluent
         else
           flattened_records = record
         end
-        flattened_records[@tag_key] = tag if @include_tag_key
+        # tag can be immutable in some cases, use a copy.
+        flattened_records[@tag_key] = tag.dup if @include_tag_key
         fields = []
         keys = []
         log = ''
@@ -154,6 +155,7 @@ module Fluent
             begin
               value = value.to_json if value.is_a?(Hash)
               value = value.to_s
+              value = value.frozen? ? value.dup : value # if value is immutable, use a copy.
               value.force_encoding("utf-8")
             rescue Exception=>e
               $log.warn "force_encoding exception: " "#{e.class}, '#{e.message}', " \

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-vmware-loginsight
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Vishal Mohite
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-22 00:00:00.000000000 Z
+date: 2019-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -87,8 +87,10 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- examples/Dockerfile
 - examples/fluent.conf
+- examples/fluentd-vrli-plugin-debian.dockerfile
+- examples/fluentd-vrli-plugin-photon-tdnf.dockerfile
+- examples/fluentd-vrli-plugin-photon.dockerfile
 - examples/k8s-log-collector-ds.yaml
 - fluent-plugin-vmware-loginsight.gemspec
 - lib/fluent/plugin/out_vmware_loginsight.rb