fluent-plugin-kubernetes_metadata_input 0.21.8 → 0.21.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d6046a3e056886887ed41df204015cb3a5203f0
-  data.tar.gz: 294f347610284f83500c72167b9cd9b1bb45b7ec
+  metadata.gz: f0cc7b953fde4c60ea251c82bbe8947e229199ce
+  data.tar.gz: 8b963c80b30f3d74cf7c7772175444e4403d12c2
 SHA512:
-  metadata.gz: e14ccc276c48558aa350fdb1d6929bb1b2127db9dd6f6cb834145c029ccb34171e71ee9cd87c0b645695674c861d377fdb4ff509c6eca1e6541f05365921995c
-  data.tar.gz: cc47b47a2c514cd516a9bbb5fccc2e79da917d88afd4ddbb86c7f895d7b855c1024a12f7cc95fa4c4e01c0620c11cbaaa69901a49d2b049383752cb65acd4c81
+  metadata.gz: 47a783e798ad45b5c6817e8c537fd771e14fcd683fd840da7fba3a474f4ad2778e2cde07f155654777d76d9ec3e5cd452791444602fc5d880f8d802b71f409e5
+  data.tar.gz: d563102ed3693849845f4d06d4953f3f28e664fd2c490c4b44276b4f1558e8ed270245f2b7bd218af777b782c1665b238c4216edb3f7ab5b859fd0f40c40d483

data/README.md

@@ -1,2 +1,67 @@
 # fluent-plugin-kubernetes_metadata_input
-fork of kubernetes_metadata_filter
+fork of [fluent-plugin-kubernetes_metadata_filter](https://github.com/fabric8io/fluent-plugin-kubernetes_metadata_filter)
+Plugin watches for K8s resource updates and ingests them as nested JSON.
+Untested, use at your own risk.
+
+## Installation
+
+    gem install fluent-plugin-kubernetes_metadata_input
+
+## Configuration
+
+Configuration options for fluent.conf are:
+
+* `kubernetes_url` - URL to the API server. Set this to retrieve further kubernetes metadata for logs from kubernetes API server
+* `apiVersion` - API version to use (default: `v1`)
+* `ca_file` - path to CA file for Kubernetes server certificate validation
+* `verify_ssl` - validate SSL certificates (default: `true`)
+* `client_cert` - path to a client cert file to authenticate to the API server
+* `client_key` - path to a client key file to authenticate to the API server
+* `bearer_token_file` - path to a file containing the bearer token to use for authentication
+* `resource` - Kubernetes resource type. f.e. Events, Pods, Service, ReplicationController, Node, Endpoint, Namespace
+
+### Sample configuration:
+The following configuration watches for Kubernetes events and pod changes and sends them to stdout.
+```
+<source>
+  @type kubernetes_metadata
+  kubernetes_url https://127.0.0.1:8443
+  verify_ssl false
+  bearer_token_file /Users/asherkho-osx/src/fluent-plugin-kubernetes_metadata_input/bearer_token
+  resource Events
+</source>
+<source>
+  @type kubernetes_metadata
+  kubernetes_url https://127.0.0.1:8443
+  verify_ssl false
+  bearer_token_file /Users/asherkho-osx/src/fluent-plugin-kubernetes_metadata_input/bearer_token
+  resource Pods
+</source>
+
+<match **>
+  type stdout
+</match>
+```
+### Tag
+The tag is constructed as following:
+```
+kubernetes.<resource_type>.<namespace_name>.<resource_name>
+```
+
+If a resource doesn't have a namespace, namespace ```openshift-infra``` is added.
+
+### Kubernetes labels and annotations
+Labels and annotations are converted to an array of strings.
+```
+"labels":{
+  "kubernetes.io/hostname":"origin",
+  "logging-infra-fluentd":"true"
+}
+```
+will be converted to
+```
+"labels": [
+  "kubernetes.io/hostname=origin",
+  "logging-infra-fluentd=true"
+]
+```

data/fluent-plugin-kubernetes_metadata_input.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-kubernetes_metadata_input"
-  gem.version       = "0.21.8"
+  gem.version       = "0.21.9"
   gem.authors       = ["Anton Sherkhonov"]
   gem.email         = ["sherkhonov@gmail.com"]
   gem.description   = %q{Input plugin to collect Kubernetes metadata}

data/lib/fluent/plugin/in_kubernetes_metadata.rb

@@ -26,12 +26,19 @@ module Fluent
 
     Fluent::Plugin.register_input('kubernetes_metadata', self)
 
+    desc 'URL to the API server. Set this to retrieve further kubernetes metadata for logs from kubernetes API server'
     config_param :kubernetes_url, :string, default: nil
+    desc 'k8s API version to use'
     config_param :apiVersion, :string, default: 'v1'
+    desc 'path to a client cert file to authenticate to the API server'
     config_param :client_cert, :string, default: nil
+    desc 'path to a client key file to authenticate to the API server'
     config_param :client_key, :string, default: nil
+    desc 'path to CA file for Kubernetes server certificate validation'
     config_param :ca_file, :string, default: nil
+    desc 'validate SSL certificates'
     config_param :verify_ssl, :bool, default: true
+    desc 'path to a file containing the bearer token to use for authentication'
     config_param :bearer_token_file, :string, default: nil
     config_param :secret_dir, :string, default: '/var/run/secrets/kubernetes.io/serviceaccount'
     desc 'Kubernetes resource type to watch.'
@@ -141,10 +148,17 @@ module Fluent
       end
 
 
-      watcher.each do |notice|
-        time = Engine.now
-        emit_event(notice.object, time, notice.type)
+      begin
+        watcher.each do |notice|
+          time = Engine.now
+          emit_event(notice.object, time, notice.type)
+        end
+        log.trace "Exited resource watcher"
+      rescue
+        log.error "Unexpected error in resource watcher", :error=>$!.to_s
+        log.error_backtrace
       end
+
     end
 
     def emit_event(event_obj, time, type)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-kubernetes_metadata_input
 version: !ruby/object:Gem::Version
-  version: 0.21.8
+  version: 0.21.9
 platform: ruby
 authors:
 - Anton Sherkhonov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-24 00:00:00.000000000 Z
+date: 2016-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd