fluent-plugin-kubernetes_sumologic 0.0.1 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad8e3aa9817fe1b08fe011c5ce3965a0d8111ff9c54cbd0d06adcc6c179ef22c
-  data.tar.gz: 803b1a5027bd5f9863be35eb07c0c67e17c745bf73d6e97e548d49037e290c69
+  metadata.gz: 4747f2253f58c1c9c9f6c94486884381bb3f0477f26ca7d4b3f5f8234f5a8498
+  data.tar.gz: 306be127290383599712dd2f48a907836ce44a04fe2cf3e8146b53a1554cedbe
 SHA512:
-  metadata.gz: 3614d3f18a3cee94a4c9caddacba78037deee9217fe022fe621ab061c3e43cdc7438b96621cb02697bc28dc893b22024c93096aed80b450ce520bce2e2999e4c
-  data.tar.gz: adb72a5a1d8db4d0e1b10e1ea8e91275b21081c6fc7c57e5967086768fb64e397b0378cef20b1042b073299f4fb278e560f23fbf11844fd194b9567b2233ed0c
+  metadata.gz: f56475ddff67518a13bc3b3f28d0f62055bdd4755eba3002a13203c93983f631a1d3323b8ff079513fd15090b70665e0e629439edc40cc07a011423780283896
+  data.tar.gz: b3d79819aa770e6791e82242ce66b5089704f458532ff4bd94affd3b4c42759e2fa00962b14eed3a9bad70b149b197740e1327490eaa37f0f598c4af203def10

data/.travis.yml

@@ -1,6 +1,8 @@
 lang: ruby
 services: docker
-before_install: gem install bundler
+before_install:
+  - rm -f ./Gemfile.lock
+  - gem install bundler
 script: ci/build.sh
 deploy:
   provider: rubygems

data/Dockerfile

@@ -2,6 +2,8 @@ FROM fluent/fluentd:v1.3.2-debian AS builder
 
 ENV PATH /home/fluent/.gem/ruby/2.3.0/bin:$PATH
 
+COPY ./fluent-plugin-kubernetes_sumologic*.gem ./
+
 # New fluent image dynamically creates user in entrypoint
 RUN [ -f /bin/entrypoint.sh ] && /bin/entrypoint.sh echo || : && \
     apt-get update && \
@@ -14,6 +16,7 @@ RUN [ -f /bin/entrypoint.sh ] && /bin/entrypoint.sh echo || : && \
     gem install fluent-plugin-concat -v 2.3.0 && \
     gem install fluent-plugin-rewrite-tag-filter -v 2.1.0 && \
     gem install fluent-plugin-prometheus -v 1.1.0 && \
+    gem install fluent-plugin-kubernetes_sumologic && \
     rm -rf /home/fluent/.gem/ruby/2.3.0/cache/*.gem && \
     gem sources -c && \
     apt-get remove --purge -y build-essential ruby-dev libffi-dev libsystemd-dev && \
@@ -59,12 +62,12 @@ ENV K8S_METADATA_FILTER_VERIFY_SSL "true"
 ENV K8S_METADATA_FILTER_BEARER_CACHE_SIZE "1000"
 ENV K8S_METADATA_FILTER_BEARER_CACHE_TTL "3600"
 ENV VERIFY_SSL "true"
+ENV FORWARD_INPUT_BIND "0.0.0.0"
+ENV FORWARD_INPUT_PORT "24224"
 
 COPY --from=builder /var/lib/gems /var/lib/gems
 COPY ./conf.d/ /fluentd/conf.d/
 COPY ./etc/* /fluentd/etc/
 COPY ./entrypoint.sh /fluentd/
-COPY ./fluent-plugin-kubernetes_sumologic*.gem ./
-RUN gem install fluent-plugin-kubernetes_sumologic
 
 ENTRYPOINT ["/fluentd/entrypoint.sh"]

data/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/SumoLogic/fluentd-kubernetes-sumologic.svg?branch=master)](https://travis-ci.org/SumoLogic/fluentd-kubernetes-sumologic) [![contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat)](https://github.com/SumoLogic/fluentd-output-sumologic/issues)
+[![Build Status](https://travis-ci.org/SumoLogic/fluentd-kubernetes-sumologic.svg?branch=master)](https://travis-ci.org/SumoLogic/fluentd-kubernetes-sumologic) [![Gem Version](https://badge.fury.io/rb/fluent-plugin-kubernetes_sumologic.svg)](https://badge.fury.io/rb/fluent-plugin-kubernetes_sumologic) [![Docker Pulls](https://img.shields.io/docker/pulls/sumologic/fluentd-kubernetes-sumologic.svg)](https://hub.docker.com/r/sumologic/fluentd-kubernetes-sumologic) [![contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat)](https://github.com/SumoLogic/fluentd-output-sumologic/issues)
 
 This page describes the Sumo Kubernetes [Fluentd](http://www.fluentd.org/) plugin.
 
@@ -96,7 +96,7 @@ Environment | Variable Description
 `EXCLUDE_POD_REGEX`|A regular expression for pods. Matching pods will be excluded from Sumo. The logs will still be sent to FluentD.
 `EXCLUDE_PRIORITY_REGEX`|A regular expression for syslog [priorities](https://en.wikipedia.org/wiki/Syslog#Severity_level). Matching priorities will be excluded from Sumo. The logs will still be sent to FluentD.
 `EXCLUDE_UNIT_REGEX` |A regular expression for `systemd` units. Matching units will be excluded from Sumo. The logs will still be sent to FluentD.
-`FLUENTD_SOURCE`|Fluentd can tail files or query `systemd`. Allowable values: `file`, `Systemd`. <br/><br/>Default: `file` 
+`FLUENTD_SOURCE`|Fluentd can use log tail, systemd query or forward as the source, Allowable values: `file`, `systemd`, `forward`. <br/><br/>Default: `file`
 `FLUENTD_USER_CONFIG_DIR`|A directory of user-defined fluentd configuration files, which must be in the  `*.conf` directory in the container.
 `FLUSH_INTERVAL` |How frequently to push logs to Sumo.<br/><br/>Default: `5s`
 `KUBERNETES_META`|Include or exclude Kubernetes metadata such as `namespace` and `pod_name` if using JSON log format. <br/><br/>Default: `true`
@@ -128,6 +128,8 @@ Environment | Variable Description
 `K8S_METADATA_FILTER_BEARER_CACHE_TTL`|Option to control the enabling of [metadata filter plugin cache_ttl](https://github.com/fabric8io/fluent-plugin-kubernetes_metadata_filter#configuration). Default: `3600`
 `K8S_NODE_NAME`|If set, improves [caching of pod metadata](https://github.com/fabric8io/fluent-plugin-kubernetes_metadata_filter#environment-variables-for-kubernetes) and reduces API calls. 
 `VERIFY_SSL`|Verify ssl certificate of sumologic endpoint. Default: `true`
+`FORWARD_INPUT_BIND`|The bind address to listen to if using forward as `FLUENTD_SOURCE`. Default: `0.0.0.0` (all addresses)
+`FORWARD_INPUT_PORT`|The port to listen to if using forward as `FLUENTD_SOURCE`. Default: `24224`
 
 
 The following table show which  environment variables affect which Fluentd sources.

data/ci/build.sh

@@ -4,6 +4,7 @@ echo "Starting build process in: `pwd`"
 set -e
 
 VERSION="${TRAVIS_TAG:-0.0.0}"
+VERSION="${VERSION#v}"
 : "${DOCKER_TAG:=sumologic/fluentd-kubernetes-sumologic}"
 : "${DOCKER_USERNAME:=sumodocker}"
 PLUGIN_NAME="fluent-plugin-kubernetes_sumologic"
@@ -22,15 +23,14 @@ echo "Build gem $PLUGIN_NAME $VERSION..."
 gem build $PLUGIN_NAME
 
 echo "Building docker image with $DOCKER_TAG:$VERSION and $DOCKER_TAG:latest in `pwd`..."
-docker build . -f ./Dockerfile -t $DOCKER_TAG:$VERSION --no-cache
+docker build . -f ./Dockerfile -t $DOCKER_TAG:v$VERSION --no-cache
 docker build . -f ./Dockerfile -t $DOCKER_TAG:latest
-
-if [[ -z "${DOCKER_PASSWORD}" ]] || [[ -z "${TRAVIS_TAG}" ]]; then
+if [ -z "$DOCKER_PASSWORD" ] || [ -z "$TRAVIS_TAG" ]; then
     echo "Skip Docker pushing"
 else
     echo "Pushing docker image with $DOCKER_TAG:$VERSION and $DOCKER_TAG:latest..."
     echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
-    docker push $DOCKER_TAG:$VERSION
+    docker push $DOCKER_TAG:v$VERSION
     docker push $DOCKER_TAG:latest
 fi
 

data/conf.d/forward/.gitignore

@@ -0,0 +1 @@
+# placeholder

data/entrypoint.sh

@@ -4,7 +4,7 @@ if [ $# -gt 0 ] && [ "${1:0:1}" != "-" ]; then
 else
   cd `dirname $0`
 
-  if [ $FLUENTD_SOURCE != file ] && [ $FLUENTD_SOURCE != systemd ]; then
+  if ! ls /fluentd/etc/fluent.${FLUENTD_SOURCE}.conf > /dev/null; then
     echo "Unknown source '$FLUENTD_SOURCE'"
     if [ -e /dev/termination-log ]; then
       echo "Unknown source '$FLUENTD_SOURCE'" >/dev/termination-log

data/etc/fluent.forward.conf

@@ -0,0 +1,18 @@
+## built-in TCP input
+## $ echo <json> | fluent-cat <tag>
+<source>
+  @type forward
+  @id forward_input
+  port "#{ENV['FORWARD_INPUT_PORT']}"
+  bind "#{ENV['FORWARD_INPUT_BIND']}"
+</source>
+
+<source>
+  @type monitor_agent
+  bind 0.0.0.0
+  port 24220
+</source>
+
+@include /fluentd/conf.d/forward/source.*.conf
+@include /fluentd/conf.d/user/*.conf
+@include /fluentd/conf.d/out.sumo.conf

data/fluent-plugin-kubernetes_sumologic.gemspec

@@ -4,9 +4,9 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-kubernetes_sumologic"
-  gem.version       = "0.0.1"
-  gem.authors       = ["Frank Reno"]
-  gem.email         = ["frank.reno@me.com"]
+  gem.version       = "2.3.1"
+  gem.authors       = ["Sumo Logic"]
+  gem.email         = ["collection@sumologic.com"]
   gem.description   = %q{FluentD plugin to extract logs from Kubernetes clusters, enrich and ship to Sumo logic.}
   gem.summary       = %q{FluentD plugin to extract logs from Kubernetes clusters, enrich and ship to Sumo logic.}
   gem.homepage      = "https://github.com/SumoLogic/fluentd-kubernetes-sumologic"
@@ -16,7 +16,6 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}) { |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
-  gem.has_rdoc      = false
 
   gem.required_ruby_version = '>= 2.0.0'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-kubernetes_sumologic
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 2.3.1
 platform: ruby
 authors:
-- Frank Reno
+- Sumo Logic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-14 00:00:00.000000000 Z
+date: 2019-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -97,7 +97,7 @@ dependencies:
 description: FluentD plugin to extract logs from Kubernetes clusters, enrich and ship
   to Sumo logic.
 email:
-- frank.reno@me.com
+- collection@sumologic.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -107,7 +107,6 @@ files:
 - CHANGELOG.md
 - Dockerfile
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -115,6 +114,7 @@ files:
 - conf.d/file/source.containers.conf
 - conf.d/file/source.docker.conf
 - conf.d/file/source.kubernetes.conf
+- conf.d/forward/.gitignore
 - conf.d/out.sumo.conf
 - conf.d/systemd/source.containers.conf
 - conf.d/systemd/source.systemd.conf
@@ -122,6 +122,7 @@ files:
 - daemonset/rbac/fluentd.yaml
 - entrypoint.sh
 - etc/fluent.file.conf
+- etc/fluent.forward.conf
 - etc/fluent.systemd.conf
 - fluent-plugin-kubernetes_sumologic.gemspec
 - lib/fluent/plugin/filter_kubernetes_sumologic.rb
@@ -150,8 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: FluentD plugin to extract logs from Kubernetes clusters, enrich and ship