fluent-plugin-geovis 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c9f1a5ffa607e0cf5e9d28c26cb4c5b50092f43e750b31b05568d45bc88f3b8
-  data.tar.gz: 8b8c93bfa7360461709e5e4d73cd42ff81a5843d191c8ad43c8cc54cfb9a59cb
+  metadata.gz: 4ecae9544ef25c489a7c538488346d0eeafe51c18006ea741e064fc61c4793d5
+  data.tar.gz: 1f45276072d904bff25260d796ea0e48a8e983f7842efc827c333b22f3b7019c
 SHA512:
-  metadata.gz: d26eeeaad6ca0d44968bc46e45bc982ea26b9d01427f4ae0aecd6bb53d03636d5a03e3c2d9754752c2dd61cca1378e5aded3be9c20aaae2de62cb5ca5e402fac
-  data.tar.gz: 2c344b51b54d911baf0760029e7697fca5df2be120b4ff82778d9e979a73b469a191475ab9e223f91c03ea63b6a5103efccb52c33a1a0b05fd6b0962c03d9784
+  metadata.gz: 3d84a7a8aec1675bbc84e17b19b2cf73ea66feb816a3200ef059501fe8202363ec0cb73dde9b0fd66523a84fe96c9fd41c2b6fe6e2725ff58f29ce277328f6aa
+  data.tar.gz: 8ceedfbe7555743a38893274739fcbc77725efdcbd3612e7c4bf719ba654c347b5b7229084522b6a32890c636dd2b8ae3f25f8e8b3304bea16c8796b9c2fbabb

data/fluent-plugin-geovis.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name    = "fluent-plugin-geovis"
-  spec.version = "0.0.3"
+  spec.version = "0.0.4"
   spec.authors = ["li.baosheng"]
   spec.email   = ["libs@geovis.com.cn"]
 

data/lib/fluent/plugin/filter_geovis.rb

@@ -31,7 +31,7 @@ module Fluent
         end
         require 'kubeclient'
 
-        log.info "==================================FetchpodnameFilter configure"
+        log.debug "Geovis Filter configure"
 
         # Use Kubernetes default service account if we're in a pod.
         if @kubernetes_url.nil?
@@ -68,6 +68,7 @@ module Fluent
 
         if !@kubernetes_url.nil?
           if insecure
+            log.debug "Creating insecure K8S client"
             @client = Kubeclient::Client.new @kubernetes_url, @apiVersion
           else 
             ssl_options = {
@@ -84,7 +85,7 @@ module Fluent
               auth_options[:bearer_token] = bearer_token
             end
 
-            log.debug "Creating K8S client"
+            log.debug "Creating secure K8S client"
             @client = Kubeclient::Client.new @kubernetes_url, @apiVersion,
                                             ssl_options: ssl_options,
                                             auth_options: auth_options
@@ -95,23 +96,99 @@ module Fluent
           rescue KubeException => kube_error
             raise Fluent::ConfigError, "Invalid Kubernetes API #{@apiVersion} endpoint #{@kubernetes_url}: #{kube_error.message}"
           end
+          @podsHash = {}
+          fetch_pods
         end
       end
 
       def filter_stream(tag, es)
-        puts "==================================FetchpodnameFilter filter"
+        log.debug "Geovis Filter filter"
         return es if (es.respond_to?(:empty?) && es.empty?) || !es.is_a?(Fluent::EventStream)
         new_es = Fluent::MultiEventStream.new
         es.each do |time, record|
-          puts record['uuid']
-
+          metadata = nil
+          if @podsHash.has_key?(record['uuid'])
+            metadata = @podsHash[record['uuid']]
+            log.info "find pod for uuid: #{record['uuid']}"
+          else
+            fetch_pods
+            if @podsHash.has_key?(record['uuid'])
+              metadata = @podsHash[record['uuid']]
+            else
+              log.error "pod does not exist: #{record['uuid']}"
+            end
+          end
+          record = record.merge(metadata) if metadata
           new_es.add(time, record)
         end
 
         new_es
       end
 
+      def fetch_pods()
+        log.debug "Geovis Filter fetch_pods"
+        newPodsHash = {}
+        @client.get_pods.each do |pod_object|
+          kubernetes_metadata = parse_pod_metadata(pod_object)
+          newPodsHash[kubernetes_metadata['pod_id']] = kubernetes_metadata
+        end
+        log.info @podsHash.length
+        @podsHash = newPodsHash.merge @podsHash
+        log.info newPodsHash.length
+      end
+
+      def parse_pod_metadata(pod_object)
+        labels = syms_to_strs(pod_object['metadata']['labels'].to_h)
+        if @de_dot
+          self.de_dot!(labels)
+          self.de_dot!(annotations)
+        end
+  
+        # collect container informations
+        container_meta = {}
+        begin
+          pod_object['status']['containerStatuses'].each do|container_status|
+            # get plain container id (eg. docker://hash -> hash)
+            container_id = container_status['containerID'].sub /^[-_a-zA-Z0-9]+:\/\//, ''
+            container_meta[container_id] = {
+                'name' => container_status['name'],
+                'image' => container_status['image'],
+                'image_id' => container_status['imageID']
+            }
+          end
+        rescue
+          log.debug("parsing container meta information failed for: #{pod_object['metadata']['namespace']}/#{pod_object['metadata']['name']} ")
+        end
+  
+        kubernetes_metadata = {
+            'namespace_name' => pod_object['metadata']['namespace'],
+            'pod_id'         => pod_object['metadata']['uid'],
+            'pod_name'       => pod_object['metadata']['name'],
+            'containers'     => syms_to_strs(container_meta),
+            'labels'         => labels,
+            'host'           => pod_object['spec']['nodeName'],
+            'master_url'     => @kubernetes_url
+        }
+        return kubernetes_metadata
+      end
+  
+      def syms_to_strs(hsh)
+        newhsh = {}
+        hsh.each_pair do |kk,vv|
+          if vv.is_a?(Hash)
+            vv = syms_to_strs(vv)
+          end
+          if kk.is_a?(Symbol)
+            newhsh[kk.to_s] = vv
+          else
+            newhsh[kk] = vv
+          end
+        end
+        newhsh
+      end
+      
     end
   end
 end
 
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-geovis
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - li.baosheng
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-20 00:00:00.000000000 Z
+date: 2018-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler