fluent-plugin-k8s-metrics-agg 1.1.0 → 1.1.5

data/Rakefile

@@ -24,6 +24,6 @@ namespace :docker do
     raise 'Argument `tag` was not provided.' unless args.tag
 
     cp Dir['pkg/fluent-plugin-k8s-metrics-agg-*.gem'], 'docker/'
-    sh "docker build --no-cache -t splunk/fluent-plugin-k8s-metrics-agg:#{args.tag} ./docker"
+    sh "docker build  --no-cache --pull --build-arg VERSION=$(cat VERSION) -t splunk/fluent-plugin-k8s-metrics-agg:#{args.tag} ./docker"
   end
 end

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.1.5

data/docker/Dockerfile

@@ -1,52 +1,37 @@
-FROM alpine:3.8
-
-LABEL maintainer="Splunk Inc. <DataEdge@splunk.com>"
-LABEL Description="Splunk Connect for Kubernetes docker image" Vendor="Splunk Inc."
+FROM registry.access.redhat.com/ubi8/ruby-27
 
 ARG VERSION
+ARG NODEJS_VERSION
+
+LABEL name="Splunk Connect for Kubernetes Metrics Aggregator container" \
+      maintainer="DataEdge@splunk.com" \
+      vendor="Splunk Inc." \
+      version=${VERSION} \
+      release=${VERSION} \
+      summary="Splunk Connect for Kubernetes Metrics Aggregator container" \
+      description="Splunk Connect for Kubernetes Metrics Aggregator container"
+
 ENV VERSION=${VERSION}
+ENV FLUENT_USER fluent
 
-ENV DUMB_INIT_VERSION=1.2.1
-ENV SU_EXEC_VERSION=0.2
+USER root
+COPY licenses /licenses
 
 COPY *.gem /tmp/
 
-ARG DEBIAN_FRONTEND=noninteractive
-# Do not split this into multiple RUN!
-# Docker creates a layer for every RUN-Statement
-# therefore an 'apk delete' has no effect
-RUN apk update \
- && apk upgrade \
- && apk add --no-cache \
-        ca-certificates \
- && update-ca-certificates \
- && apk add --no-cache \
-        ruby ruby-irb ruby-etc ruby-webrick ruby-json \
-        su-exec==${SU_EXEC_VERSION}-r0 \
-        dumb-init==${DUMB_INIT_VERSION}-r0 \
- && apk add --no-cache --virtual .build-deps \
-        build-base \
-        ruby-dev wget gnupg \
- && echo 'gem: --no-document' >> /etc/gemrc \
- && gem install -N \
-            fluentd:1.4.0 \
-            fluent-plugin-record-modifier:2.0.1 \
-            fluent-plugin-splunk-hec:${VERSION} \
-            oj:3.7.9 \
-            multi_json:1.13.1 \
-            bigdecimal:1.4.3 \
-            kubeclient:4.3.0 \
- && gem install -N /tmp/*.gem \
- && apk del .build-deps \
- && rm -rf /var/cache/apk/* \
- && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem
-
-ENV LD_PRELOAD="" \
-    FLUENTD_CONF="fluent.conf" \
-    FLUENTD_OPT="" \
-    DUMB_INIT_SETSID=0
-
-COPY entrypoint.sh /bin/entrypoint.sh
-ENTRYPOINT ["/bin/entrypoint.sh"]
-
-CMD exec fluentd -c /fluentd/etc/${FLUENTD_CONF} -p /fluentd/plugins $FLUENTD_OPT
+COPY Gemfile* ./
+RUN yum update -y \
+   && npm install -g n \
+   && yum remove -y nodejs \
+   && n ${NODEJS_VERSION} \
+   && gem install bundler \
+   && gem unpack /tmp/*.gem --target gem \
+   && bundle install 
+
+RUN groupadd -r $FLUENT_USER && \
+  useradd -r -g $FLUENT_USER $FLUENT_USER && \
+  mkdir -p /fluentd/log /fluentd/etc /fluentd/plugins &&\
+  chown -R $FLUENT_USER /fluentd && chgrp -R $FLUENT_USER /fluentd
+
+USER $FLUENT_USER
+CMD bundle exec fluentd -c /fluentd/etc/fluent.conf

data/docker/Gemfile

@@ -0,0 +1,18 @@
+source 'https://rubygems.org'
+
+# This is separate gemfile for building docker image that has all plugins 
+# 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-record-modifier", "=2.1.0"
+gem "fluent-plugin-kubernetes_metadata_filter", "=2.5.3"
+gem "kubeclient", "=4.6.0"
+gem "oj", "=3.10.2"
+gem 'multi_json', '=1.14.1'
+gem 'http_parser.rb', '=0.5.3'
+gem 'bigdecimal', '=3.0.0'
+
+gem "fluent-plugin-splunk-hec", ">= 1.2.5"
+
+gem 'fluent-plugin-k8s-metrics-agg', path: 'gem/'

data/docker/Gemfile.lock

@@ -0,0 +1,170 @@
+PATH
+  remote: gem
+  specs:
+    fluent-plugin-k8s-metrics-agg (1.1.5)
+      fluentd (>= 1.9.1)
+      kubeclient (~> 4.6.0)
+      multi_json (~> 1.14.1)
+      oj (~> 3.10.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (6.1.3.1)
+      activesupport (= 6.1.3.1)
+    activesupport (6.1.3.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    addressable (2.7.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)
+    cool.io (1.7.1)
+    domain_name (0.5.20190701)
+      unf (>= 0.0.5, < 1.0.0)
+    ffi (1.15.0)
+    ffi-compiler (1.0.1)
+      ffi (>= 1.0.0)
+      rake
+    fluent-plugin-kubernetes_metadata_filter (2.5.3)
+      fluentd (>= 0.14.0, < 1.12)
+      kubeclient (< 5)
+      lru_redux
+    fluent-plugin-prometheus (1.8.5)
+      fluentd (>= 1.9.1, < 2)
+      prometheus-client (< 0.10)
+    fluent-plugin-record-modifier (2.1.0)
+      fluentd (>= 1.0, < 2)
+    fluent-plugin-splunk-hec (1.2.5)
+      fluentd (>= 1.4)
+      multi_json (~> 1.13)
+      net-http-persistent (~> 3.1)
+      openid_connect (~> 1.1.8)
+      prometheus-client (< 0.10.0)
+    fluentd (1.11.5)
+      cool.io (>= 1.4.5, < 2.0.0)
+      http_parser.rb (>= 0.5.1, < 0.7.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)
+      yajl-ruby (~> 1.0)
+    http (4.4.1)
+      addressable (~> 2.3)
+      http-cookie (~> 1.0)
+      http-form_data (~> 2.2)
+      http-parser (~> 1.2.0)
+    http-accept (1.7.0)
+    http-cookie (1.0.3)
+      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)
+      concurrent-ruby (~> 1.0)
+    json-jwt (1.13.0)
+      activesupport (>= 4.2)
+      aes_key_wrap
+      bindata
+    kubeclient (4.6.0)
+      http (>= 3.0, < 5.0)
+      recursive-open-struct (~> 1.0, >= 1.0.4)
+      rest-client (~> 2.0)
+    lru_redux (1.1.0)
+    mail (2.7.1)
+      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.3)
+    minitest (5.14.4)
+    msgpack (1.4.2)
+    multi_json (1.14.1)
+    net-http-persistent (3.1.0)
+      connection_pool (~> 2.2)
+    netrc (0.11.0)
+    oj (3.10.2)
+    openid_connect (1.1.8)
+      activemodel
+      attr_required (>= 1.0.0)
+      json-jwt (>= 1.5.0)
+      rack-oauth2 (>= 1.6.1)
+      swd (>= 1.0.0)
+      tzinfo
+      validate_email
+      validate_url
+      webfinger (>= 1.0.1)
+    prometheus-client (0.9.0)
+      quantile (~> 0.2.1)
+    public_suffix (4.0.6)
+    quantile (0.2.1)
+    rack (2.2.3)
+    rack-oauth2 (1.16.0)
+      activesupport
+      attr_required
+      httpclient
+      json-jwt (>= 1.11.0)
+      rack (>= 2.1.0)
+    rake (13.0.3)
+    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)
+      sigdump (~> 0.2.2)
+    sigdump (0.2.4)
+    strptime (0.2.5)
+    swd (1.2.0)
+      activesupport (>= 3)
+      attr_required (>= 0.0.5)
+      httpclient (>= 2.4)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    tzinfo-data (1.2021.1)
+      tzinfo (>= 1.0.0)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.7)
+    validate_email (0.1.6)
+      activemodel (>= 3.0)
+      mail (>= 2.2.5)
+    validate_url (1.0.13)
+      activemodel (>= 3.0.0)
+      public_suffix
+    webfinger (1.1.0)
+      activesupport
+      httpclient (>= 2.4)
+    yajl-ruby (1.4.1)
+    zeitwerk (2.4.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bigdecimal (= 3.0.0)
+  fluent-plugin-k8s-metrics-agg!
+  fluent-plugin-kubernetes_metadata_filter (= 2.5.3)
+  fluent-plugin-prometheus (= 1.8.5)
+  fluent-plugin-record-modifier (= 2.1.0)
+  fluent-plugin-splunk-hec (>= 1.2.5)
+  fluentd (= 1.11.5)
+  http_parser.rb (= 0.5.3)
+  kubeclient (= 4.6.0)
+  multi_json (= 1.14.1)
+  oj (= 3.10.2)
+
+BUNDLED WITH
+   2.1.4

data/docker/build.sh

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+set -e
+TAG=$1
+NODEJS_VERSION=14.15.1
+
+# Install dependecies
+gem install bundler
+bundle update --bundler
+bundle install
+
+# Build Gem
+bundle exec rake build -t -v
+cp pkg/fluent-plugin-*.gem docker
+
+# Build Docker Image
+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 --no-cache -t splunk/k8s-metrics-aggr:$TAG ./docker

data/fluent-plugin-k8s-metrics-agg.gemspec

@@ -1,4 +1,4 @@
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
@@ -20,14 +20,14 @@ Gem::Specification.new do |spec|
   spec.test_files    = test_files
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency 'bundler', '~> 2.0.1'
-  spec.add_development_dependency 'rake', '~> 12.3.2'
+  spec.add_development_dependency 'bundler', '~> 2.0'
+  spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'test-unit', "~> 3.3.0"
   spec.add_development_dependency "simplecov", '~> 0.16.1'
   spec.add_development_dependency 'webmock', '~> 3.5.1'
-  spec.add_runtime_dependency 'fluentd', '~> 1.3.3'
-  spec.add_runtime_dependency 'kubeclient', '~> 4.2.2'
-  spec.add_runtime_dependency 'multi_json', '~> 1.13.1'
-  spec.add_runtime_dependency 'oj', '~> 3.7.8'
+  spec.add_runtime_dependency 'fluentd', '>= 1.9.1'
+  spec.add_runtime_dependency 'kubeclient', '~> 4.6.0'
+  spec.add_runtime_dependency 'multi_json', '~> 1.14.1'
+  spec.add_runtime_dependency 'oj', '~> 3.10.2'
 
 end

data/lib/fluent/plugin/in_kubernetes_metrics_aggregator.rb

@@ -355,7 +355,7 @@ module Fluent
           begin
             @client.discover unless @client.discovered
             @client.rest_client['/pods'].tap do |endpoint|
-              log.info("Use URL #{endpoint.url} for scraping limits requests metrics")
+              log.debug("Use URL #{endpoint.url} for scraping limits requests metrics")
             end
           end
       end
@@ -363,6 +363,9 @@ module Fluent
       def scrape_limits_requests_metrics
         response = limits_requests_api.get(@client.headers)
         handle_limits_requests_res(response)
+      rescue StandardError => e
+        log.error "Failed to get limit metrics, error=#{$ERROR_INFO}, #{e.inspect}"
+        log.error_backtrace
       end
 
       # This method is used to handle responses from the kube apiserver api
@@ -375,7 +378,7 @@ module Fluent
           log.error "ExMultiJson.load(response.body) expected 2xx from summary API, but got #{response.code}. Response body = #{response.body}"
         end
       rescue StandardError => e
-        log.error "Failed to scrape metrics, error=#{$ERROR_INFO}, #{e.inspect}"
+        log.error "Failed to scrape limit metrics, error=#{$ERROR_INFO}, #{e.inspect}"
         log.error_backtrace
       end
 
@@ -420,7 +423,7 @@ module Fluent
               pod_usage_metrics.add_usage_metrics(cpu_limit, cpu_request, memory_limit, memory_request)
             end
 
-            pod_labels = { 'name' => pod_json['metadata']['name'], 'namespace' => pod_json['metadata']['name'], 'node' => pod_json['spec']['nodeName'] }
+            pod_labels = { 'name' => pod_json['metadata']['name'], 'namespace' => pod_json['metadata']['namespace'], 'node' => pod_json['spec']['nodeName'] }
             emit_limits_requests_metrics(generate_tag('pod'), @scraped_at, pod_labels, pod_usage_metrics)
             @@namespace_usage_metrics_map[pod_namespace].add_usage_metrics(pod_usage_metrics.instance_variable_get(:@cpu_limit).to_s + ('m'), pod_usage_metrics.instance_variable_get(:@cpu_request).to_s + ('m'),
                                                                            pod_usage_metrics.instance_variable_get(:@memory_limit).to_s + ('Mi'), pod_usage_metrics.instance_variable_get(:@memory_request).to_s + ('Mi'))
@@ -454,7 +457,7 @@ module Fluent
           begin
             @client.discover unless @client.discovered
             @client.rest_client['/nodes'].tap do |endpoint|
-              log.info("Use URL #{endpoint.url} for scraping node metrics")
+              log.debug("Use URL #{endpoint.url} for scraping node metrics")
             end
           end
       end
@@ -462,6 +465,9 @@ module Fluent
       def scrape_node_metrics
         response = node_api.get(@client.headers)
         handle_node_response(response)
+      rescue StandardError => e
+        log.error "Failed to get node metrics, error=#{$ERROR_INFO}, #{e.inspect}"
+        log.error_backtrace
       end
 
       # This method is used to handle responses from the kubeapiserver api
@@ -474,7 +480,7 @@ module Fluent
           log.error "ExMultiJson.load(response.body) expected 2xx from summary API, but got #{response.code}. Response body = #{response.body}"
         end
       rescue StandardError => e
-        log.error "Failed to scrape metrics, error=#{$ERROR_INFO}, #{e.inspect}"
+        log.error "Failed to scrape node metrics, error=#{$ERROR_INFO}, #{e.inspect}"
         log.error_backtrace
       end
 
@@ -527,7 +533,7 @@ module Fluent
           begin
             @client.discover unless @client.discovered
             @client.rest_client['/nodes'].tap do |endpoint|
-              log.info("Use URL #{endpoint.url} for scraping node metrics")
+              log.debug("Use URL #{endpoint.url} for scraping node metrics")
             end
           end
       end
@@ -535,6 +541,9 @@ module Fluent
       def scrape_resource_usage_metrics
         response = resource_usage_api.get(@client.headers)
         handle_resource_usage_response(response)
+       rescue StandardError => e
+         log.error "Failed to get resource usage metrics, error=#{$ERROR_INFO}, #{e.inspect}"
+         log.error_backtrace
       end
 
       # This method is used to handle responses from the kubelet summary api
@@ -547,7 +556,7 @@ module Fluent
           log.error "ExMultiJson.load(response.body) expected 2xx from summary API, but got #{response.code}. Response body = #{response.body}"
         end
       rescue StandardError => e
-        log.error "Failed to scrape metrics, error=#{$ERROR_INFO}, #{e.inspect}"
+        log.error "Failed to scrape resource usage metrics, error=#{$ERROR_INFO}, #{e.inspect}"
         log.error_backtrace
       end
 
@@ -560,29 +569,31 @@ module Fluent
               begin
                 @client.discover unless @client.discovered
                 @client.rest_client["/nodes/#{node_name}:#{@kubelet_port}/proxy/stats/summary"].tap do |endpoint|
-                  log.info("Use URL #{endpoint.url} for scraping resource usage metrics")
+                  log.debug("Use URL #{endpoint.url} for scraping resource usage metrics")
                 end
               end
 
             node_response = JSON.parse(node_rest_client.get(@client.headers))
             Array(node_response['pods']).each do |pod_json|
-              pod_cpu_usage = pod_json['cpu']['usageNanoCores']
-              pod_memory_usage = pod_json['memory']['usageBytes']
-              pod_namespace = pod_json['podRef']['namespace']
-              pod_usage = ResourceUsageMetricsUnit.new
-              pod_usage.add_resource_usage_metrics(pod_cpu_usage, pod_memory_usage)
-              if @@namespace_resource_usage_metrics_map[pod_namespace].nil?
-                namespace_usage_metrics = ResourceUsageMetricsUnit.new
-                @@namespace_resource_usage_metrics_map[pod_namespace] = pod_usage
-              else
-                @@namespace_resource_usage_metrics_map[pod_namespace].add_resource_usage_metrics(pod_cpu_usage, pod_memory_usage)
-              end
-              if @@node_resource_usage_metrics_map[node_name].nil?
-                node_name_usage_metrics = ResourceUsageMetricsUnit.new
-                @@node_resource_usage_metrics_map[node_name] = node_name_usage_metrics
+              unless pod_json['cpu'].nil? || pod_json['memory'].nil?
+                pod_cpu_usage = pod_json['cpu'].fetch('usageNanoCores', 0)/ 1_000_000
+                pod_memory_usage = pod_json['memory'].fetch('usageBytes', 0)
+                pod_namespace = pod_json['podRef']['namespace']
+                pod_usage = ResourceUsageMetricsUnit.new
+                pod_usage.add_resource_usage_metrics(pod_cpu_usage, pod_memory_usage)
+                if @@namespace_resource_usage_metrics_map[pod_namespace].nil?
+                  namespace_usage_metrics = ResourceUsageMetricsUnit.new
+                  @@namespace_resource_usage_metrics_map[pod_namespace] = pod_usage
+                else
+                  @@namespace_resource_usage_metrics_map[pod_namespace].add_resource_usage_metrics(pod_cpu_usage, pod_memory_usage)
+                end
+                if @@node_resource_usage_metrics_map[node_name].nil?
+                  node_name_usage_metrics = ResourceUsageMetricsUnit.new
+                  @@node_resource_usage_metrics_map[node_name] = node_name_usage_metrics
+                end
+                @@node_resource_usage_metrics_map[node_name].add_resource_usage_metrics(pod_cpu_usage, pod_memory_usage)
+                pod_usage = nil
               end
-              @@node_resource_usage_metrics_map[node_name].add_resource_usage_metrics(pod_cpu_usage, pod_memory_usage)
-              pod_usage = nil
             end
           end
         end