Release/1.1.7 (#64)

* libupdate (#61)

* add description for useful objects (#62)

* handle connection error (#63)

Author: rockb1017

Gemfile.lock

@@ -1,37 +1,38 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-kubernetes-objects (1.1.5)
+    fluent-plugin-kubernetes-objects (1.1.7)
       fluentd (>= 1.9.1)
       http_parser.rb (= 0.5.3)
       kubeclient (~> 4.6.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.1.9)
     cool.io (1.7.1)
     crack (0.4.5)
       rexml
-    docile (1.3.5)
+    docile (1.4.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    ffi (1.14.2)
+    ffi (1.15.3)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
-    fluentd (1.12.1)
+    fluentd (1.13.2)
       bundler
       cool.io (>= 1.4.5, < 2.0.0)
-      http_parser.rb (>= 0.5.1, < 0.7.0)
+      http_parser.rb (>= 0.5.1, < 0.8.0)
       msgpack (>= 1.3.1, < 2.0.0)
       serverengine (>= 2.2.2, < 3.0.0)
       sigdump (~> 0.2.2)
       strptime (>= 0.2.2, < 1.0.0)
       tzinfo (>= 1.0, < 3.0)
       tzinfo-data (~> 1.0)
+      webrick (>= 1.4.2, < 1.8.0)
       yajl-ruby (~> 1.0)
     hashdiff (1.0.1)
     http (4.4.1)
@@ -40,7 +41,7 @@ GEM
       http-form_data (~> 2.2)
       http-parser (~> 1.2.0)
     http-accept (1.7.0)
-    http-cookie (1.0.3)
+    http-cookie (1.0.4)
       domain_name (~> 0.5)
     http-form_data (2.3.0)
     http-parser (1.2.3)
@@ -52,31 +53,31 @@ GEM
       rest-client (~> 2.0)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0225)
+    mime-types-data (3.2021.0704)
     minitest (5.14.4)
     msgpack (1.4.2)
     netrc (0.11.0)
     power_assert (2.0.0)
     public_suffix (4.0.6)
-    rake (13.0.3)
+    rake (13.0.6)
     recursive-open-struct (1.1.3)
     rest-client (2.1.0)
       http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rexml (3.2.4)
-    serverengine (2.2.3)
+    rexml (3.2.5)
+    serverengine (2.2.4)
       sigdump (~> 0.2.2)
     sigdump (0.2.4)
     simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.2)
+    simplecov_json_formatter (0.1.3)
     strptime (0.2.5)
-    test-unit (3.4.0)
+    test-unit (3.4.4)
       power_assert
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
@@ -85,10 +86,11 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.7)
-    webmock (3.12.0)
+    webmock (3.13.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    webrick (1.7.0)
     yajl-ruby (1.4.1)
 
 PLATFORMS
@@ -104,4 +106,4 @@ DEPENDENCIES
   webmock (~> 3.5)
 
 BUNDLED WITH
-   2.2.13
+   2.2.24

Makefile

@@ -1,5 +1,4 @@
 VERSION := $(shell sh -c 'cat VERSION')
-NODEJS_VERSION := 14.15.1
 
 clean_pkg: 
 	@rm -rf pkg/* docker/*.gem 
@@ -17,7 +16,7 @@ docker: build install-deps
 	@cp pkg/fluent-plugin-*.gem docker
 	@mkdir -p docker/licenses
 	@cp -rp LICENSE docker/licenses/
-	@docker build --no-cache --pull --build-arg VERSION=$(VERSION) --build-arg NODEJS_VERSION=$(NODEJS_VERSION) -t splunk/kube-objects:$(VERSION) ./docker
+	@docker build --no-cache --pull --build-arg VERSION=$(VERSION) -t splunk/kube-objects:$(VERSION) ./docker
 
 unit-test:
 	@bundle exec rake test

VERSION

@@ -1 +1 @@
-1.1.5
+1.1.7

docker/Dockerfile

@@ -1,7 +1,6 @@
 FROM registry.access.redhat.com/ubi8/ruby-27
 
 ARG VERSION
-ARG NODEJS_VERSION
 
 LABEL name="Splunk Connect for Kubernetes Objects container" \
       maintainer="[email protected]" \
@@ -23,9 +22,7 @@ RUN dnf install -y jq
 
 COPY Gemfile* ./
 RUN yum update -y \
-   && npm install -g n \
-   && yum remove -y nodejs \
-   && n ${NODEJS_VERSION} \
+   && yum remove -y nodejs npm \
    && gem install bundler \
    && gem unpack /tmp/*.gem --target gem \
    && bundle install 

docker/Gemfile

@@ -4,7 +4,7 @@ source 'https://rubygems.org'
 # for kubernetes log collection agent
 # List all required gems here and install via bundler to resolve dependencies
 gem "fluentd", "= 1.11.5" 
-gem "fluent-plugin-prometheus", "= 1.8.5"
+gem "fluent-plugin-prometheus", ">= 2.0"
 gem "fluent-plugin-record-modifier", "= 2.1.0"
 gem "fluent-plugin-kubernetes_metadata_filter", "=2.5.3"
 gem "fluent-plugin-jq", "= 0.5.1"

docker/Gemfile.lock

@@ -1,34 +1,34 @@
 PATH
   remote: gem
   specs:
-    fluent-plugin-kubernetes-objects (1.1.5)
+    fluent-plugin-kubernetes-objects (1.1.6)
       fluentd (>= 1.9.1)
       http_parser.rb (= 0.5.3)
       kubeclient (~> 4.6.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.1.3)
-      activesupport (= 6.1.3)
-    activesupport (6.1.3)
+    activemodel (6.1.4)
+      activesupport (= 6.1.4)
+    activesupport (6.1.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     aes_key_wrap (1.1.0)
     attr_required (1.0.1)
-    bigdecimal (3.0.0)
-    bindata (2.4.8)
-    concurrent-ruby (1.1.8)
-    connection_pool (2.2.3)
+    bigdecimal (3.0.2)
+    bindata (2.4.10)
+    concurrent-ruby (1.1.9)
+    connection_pool (2.2.5)
     cool.io (1.7.1)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    ffi (1.14.2)
+    ffi (1.15.3)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
@@ -39,17 +39,17 @@ GEM
       fluentd (>= 0.14.0, < 1.12)
       kubeclient (< 5)
       lru_redux
-    fluent-plugin-prometheus (1.8.5)
+    fluent-plugin-prometheus (2.0.1)
       fluentd (>= 1.9.1, < 2)
-      prometheus-client (< 0.10)
+      prometheus-client (>= 2.1.0)
     fluent-plugin-record-modifier (2.1.0)
       fluentd (>= 1.0, < 2)
-    fluent-plugin-splunk-hec (1.2.5)
+    fluent-plugin-splunk-hec (1.2.7)
       fluentd (>= 1.4)
       multi_json (~> 1.13)
       net-http-persistent (~> 3.1)
       openid_connect (~> 1.1.8)
-      prometheus-client (< 0.10.0)
+      prometheus-client (>= 2.1.0)
     fluentd (1.11.5)
       cool.io (>= 1.4.5, < 2.0.0)
       http_parser.rb (>= 0.5.1, < 0.7.0)
@@ -66,14 +66,14 @@ GEM
       http-form_data (~> 2.2)
       http-parser (~> 1.2.0)
     http-accept (1.7.0)
-    http-cookie (1.0.3)
+    http-cookie (1.0.4)
       domain_name (~> 0.5)
     http-form_data (2.3.0)
     http-parser (1.2.3)
       ffi-compiler (>= 1.0, < 2.0)
     http_parser.rb (0.5.3)
     httpclient (2.8.3)
-    i18n (1.8.9)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     json-jwt (1.13.0)
       activesupport (>= 4.2)
@@ -88,8 +88,8 @@ GEM
       mini_mime (>= 0.1.1)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0225)
-    mini_mime (1.0.2)
+    mime-types-data (3.2021.0704)
+    mini_mime (1.1.0)
     minitest (5.14.4)
     msgpack (1.4.2)
     multi_json (1.15.0)
@@ -107,25 +107,23 @@ GEM
       validate_email
       validate_url
       webfinger (>= 1.0.1)
-    prometheus-client (0.9.0)
-      quantile (~> 0.2.1)
+    prometheus-client (2.1.0)
     public_suffix (4.0.6)
-    quantile (0.2.1)
     rack (2.2.3)
-    rack-oauth2 (1.16.0)
+    rack-oauth2 (1.17.0)
       activesupport
       attr_required
       httpclient
       json-jwt (>= 1.11.0)
       rack (>= 2.1.0)
-    rake (13.0.3)
+    rake (13.0.6)
     recursive-open-struct (1.1.3)
     rest-client (2.1.0)
       http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    serverengine (2.2.3)
+    serverengine (2.2.4)
       sigdump (~> 0.2.2)
     sigdump (0.2.4)
     strptime (0.2.5)
@@ -160,9 +158,9 @@ DEPENDENCIES
   fluent-plugin-jq (= 0.5.1)
   fluent-plugin-kubernetes-objects!
   fluent-plugin-kubernetes_metadata_filter (= 2.5.3)
-  fluent-plugin-prometheus (= 1.8.5)
+  fluent-plugin-prometheus (>= 2.0)
   fluent-plugin-record-modifier (= 2.1.0)
-  fluent-plugin-splunk-hec (>= 1.2.3)
+  fluent-plugin-splunk-hec (>= 1.2.5)
   fluentd (= 1.11.5)
   http_parser.rb (>= 0.5.3)
   kubeclient (>= 4.6.0)

docker/build.sh

@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 set -e
 TAG=$1
-NODEJS_VERSION=14.15.1
 
 # Install dependecies
 gem install bundler
@@ -17,4 +16,4 @@ VERSION=`cat VERSION`
 echo "Copying licenses to be included in the docker image..."
 mkdir -p docker/licenses
 cp -rp LICENSE docker/licenses/
-docker build --no-cache --pull --build-arg VERSION=$VERSION --build-arg NODEJS_VERSION=$NODEJS_VERSION -t splunk/kube-objects:$TAG ./docker
+docker build --no-cache --pull --build-arg VERSION=$VERSION -t splunk/kube-objects:$TAG ./docker

lib/fluent/plugin/in_kubernetes_objects.rb

@@ -245,15 +245,19 @@ def create_watcher_thread(conf)
         while thread_current_running?
           @client.public_send("watch_#{resource_name}", options).tap do |watcher|
             tag = generate_tag "#{resource_name}"
-            watcher.each do |entity|
-              begin
-                entity = JSON.parse(entity)
-                router.emit tag, Fluent::Engine.now, entity
-                options[:resource_version] = entity['object']['metadata']['resourceVersion']
-                @storage.put resource_name, entity['object']['metadata']['resourceVersion']
-              rescue => e
-                log.info "Got exception #{e} parsing entity #{entity}. Resetting watcher."
+            begin
+              watcher.each do |entity|
+                begin
+                  entity = JSON.parse(entity)
+                  router.emit tag, Fluent::Engine.now, entity
+                  options[:resource_version] = entity['object']['metadata']['resourceVersion']
+                  @storage.put resource_name, entity['object']['metadata']['resourceVersion']
+                rescue => e
+                  log.info "Got exception #{e} parsing entity #{entity}. Resetting watcher."
+                end
               end
+            rescue => e
+              log.info "Got exception #{e}. Resetting watcher."
             end
           end
         end

objects/daemon_sets.md

@@ -0,0 +1,22 @@
+# Kubernetes Daemon_Sets Object
+### SourceType: kube:object:daemon_sets
+
+All definitions can be found at https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#daemonset-v1-apps
+
+Field | Description | Example
+----- | ----------- | -------
+metadata.name | Daemon Set name | sck-splunk-kubernetes-metrics
+spec.template.spec.containers{}.image | Docker image name | docker.io/splunk/k8s-metrics:1.1.4
+spec.template.spec.containers{}.name | Name of the container | splunk-fluentd-k8s-metrics	
+spec.template.spec.containers{}.resources.limits.cpu | maximum amount of compute resources allowed | 200m	
+spec.template.spec.containers{}.resources.limits.memory | maximum amount of compute resources allowed |	300Mi	
+spec.template.spec.containers{}.resources.requests.cpu | minimum amount of compute resources required | 200m	
+spec.template.spec.containers{}.resources.requests.memory | minimum amount of compute resources required |300Mi	
+spec.template.spec.containers{}.volumeMounts{}.mountPath | Path within the container at which the volume should be mounted | /fluentd/etc	
+spec.template.spec.containers{}.volumeMounts{}.name | This must match the Name of a Volume | conf-configmap	
+spec.template.spec.containers{}.volumeMounts{}.readOnly | Mounted read-only if true, read-write otherwise | TRUE	
+spec.template.spec.serviceAccountName | name of the ServiceAccount to use to run this pod | splunk-kubernetes-metrics	
+status.currentNumberScheduled | number of nodes that are running at least 1 daemon pod and are supposed to run the daemon pod | 1	
+status.desiredNumberScheduled | number of nodes that should be running the daemon pod | 1	
+status.numberAvailable | number of nodes that should be running the daemon pod and have one or more of the daemon pod running and available | 1	
+status.numberReady | number of nodes that should be running the daemon pod and have one or more of the daemon pod running and ready | 1	

objects/deployments.md

@@ -0,0 +1,27 @@
+# Kubernetes Deployments Object
+### SourceType: kube:object:deployments
+
+All definitions can be found at https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#deployment-v1-apps
+
+Field | Description | Example
+----- | ----------- | -------
+metadata.name | Deployment name | cartservice
+spec.replicas | Number of desired pods | 1
+spec.strategy.type | Type of deployment | RollingUpdate
+spec.template.spec.containers{}.image | Docker image name | gcr.io/google-samples/microservices-demo/cartservice:v0.2.2
+spec.template.spec.containers{}.name | Name of the container | server	
+spec.template.spec.containers{}.livenessProbe.* | Periodic probe of container liveness
+spec.template.spec.containers{}.ports{}.containerPort | Number of port to expose on the pod's IP address | 7070	
+spec.template.spec.containers{}.ports{}.protocol | TCP	Protocol for port | TCP	
+spec.template.spec.containers{}.readinessProbe.* | Periodic probe of container service readiness
+spec.template.spec.containers{}.resources.limits.cpu | maximum amount of compute resources allowed | 200m	
+spec.template.spec.containers{}.resources.limits.memory | maximum amount of compute resources allowed |	300Mi	
+spec.template.spec.containers{}.resources.requests.cpu | minimum amount of compute resources required | 200m	
+spec.template.spec.containers{}.resources.requests.memory | minimum amount of compute resources required |300Mi	
+spec.template.spec.containers{}.volumeMounts{}.mountPath | Path within the container at which the volume should be mounted | /fluentd/etc	
+spec.template.spec.containers{}.volumeMounts{}.name | This must match the Name of a Volume | conf-configmap	
+spec.template.spec.containers{}.volumeMounts{}.readOnly | Mounted read-only if true, read-write otherwise | TRUE	
+spec.template.spec.serviceAccountName | name of the ServiceAccount to use to run this pod | default	
+status.availableReplicas | number of available pods | 1	
+status.conditions{}.message	ReplicaSet | A human readable message indicating details about the transition | "cartservice-67b89ffc69" has successfully progressed
+status.readyReplicas | number of ready pods targeted by this deployment | 1