fluent-plugin-kubernetes_metadata_filter 0.7.0 → 0.8.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +1 -1
  3. data/fluent-plugin-kubernetes_metadata_filter.gemspec +3 -2
  4. data/lib/fluent/plugin/filter_kubernetes_metadata.rb +10 -5
  5. data/test/cassettes/kubernetes_docker_metadata.yml +4 -6
  6. data/test/cassettes/kubernetes_docker_metadata_using_bearer_token.yml +4 -6
  7. data/test/cassettes/non_kubernetes_docker_metadata.yml +3 -5
  8. data/test/cassettes/valid_kubernetes_api_server.yml +1 -3
  9. metadata +19 -5
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 7a82b9424f63edf5e5d2100d46a865313920b13b
4
- data.tar.gz: b37b20ed922dcde3b5003706715b1cfd76e806cc
3
+ metadata.gz: 0a755b41035ee8c71bc85992f9fec3cff0c1ff1d
4
+ data.tar.gz: 43d8338dd326aec66933ebc2e00313e4629e586e
5
5
  SHA512:
6
- metadata.gz: 424baf847e3efc9a112342a575a92acaf298d1e97bf0178b0fa3e16a2c70e10932bae78912206591f977df8b24f63a9c8f42bfaa72c83fc3021ad3de486f288e
7
- data.tar.gz: d5f4ab144399234534d1d09819c9daa6ae60d7cf93af9b06c4f7e144c30841ffbf0150ec82e90c536ae5a6d963bcef7c6b74d1b14ef07df61fce2f66fbbe6815
6
+ metadata.gz: f12e9cdbf8a8079fd4eb117888961d79d2f43793ed9909d7bb9531fc23e5c773cad818f8517bf9ecae2d7b9c0bb0daca33f7ad25137afdc2bf1b21e396b98779
7
+ data.tar.gz: 30be9f34cbfcb997fbddf8e2fd7c70905ef43cdd5980b6a2ecb03ed77adc62710407a3fb8e42f9b73ea6c93745c8544cdd21d3e8c37303ee19a0a783e10130e1
data/README.md CHANGED
@@ -12,7 +12,7 @@
12
12
  Configuration options for fluent.conf are:
13
13
 
14
14
  * `kubernetes_url` - URL to the API server. Set this to retrieve further kubernetes metadata for logs from kubernetes API server
15
- * `apiVersion` - API version to use (default: `v1beta3`)
15
+ * `apiVersion` - API version to use (default: `v1`)
16
16
  * `ca_file` - path to CA file for Kubernetes server certificate validation
17
17
  * `verify_ssl` - validate SSL certificates (default: true)
18
18
  * `client_cert` - path to a client cert file to authenticate to the API server
data/fluent-plugin-kubernetes_metadata_filter.gemspec CHANGED
@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
4
4
 
5
5
  Gem::Specification.new do |gem|
6
6
  gem.name = "fluent-plugin-kubernetes_metadata_filter"
7
- gem.version = "0.7.0"
7
+ gem.version = "0.8.0"
8
8
  gem.authors = ["Jimmi Dyson"]
9
9
  gem.email = ["jimmidyson@gmail.com"]
10
10
  gem.description = %q{Filter plugin to add Kubernetes metadata}
@@ -22,7 +22,7 @@ Gem::Specification.new do |gem|
22
22
 
23
23
  gem.add_runtime_dependency "fluentd"
24
24
  gem.add_runtime_dependency "lru_redux"
25
- gem.add_runtime_dependency "kubeclient", "~> 0.1.15"
25
+ gem.add_runtime_dependency "kubeclient", "~> 0.4.0"
26
26
  gem.add_runtime_dependency "fluent-plugin-docker_metadata_filter"
27
27
 
28
28
  gem.add_development_dependency "bundler", "~> 1.3"
@@ -34,4 +34,5 @@ Gem::Specification.new do |gem|
34
34
  gem.add_development_dependency "webmock"
35
35
  gem.add_development_dependency "vcr"
36
36
  gem.add_development_dependency "bump"
37
+ gem.add_development_dependency "yajl-ruby"
37
38
  end
data/lib/fluent/plugin/filter_kubernetes_metadata.rb CHANGED
@@ -24,7 +24,7 @@ module Fluent
24
24
  config_param :cache_size, :integer, default: 1000
25
25
  config_param :cache_ttl, :integer, default: 60 * 60
26
26
  config_param :watch, :bool, default: true
27
- config_param :apiVersion, :string, default: 'v1beta3'
27
+ config_param :apiVersion, :string, default: 'v1'
28
28
  config_param :client_cert, :string, default: ''
29
29
  config_param :client_key, :string, default: ''
30
30
  config_param :ca_file, :string, default: ''
@@ -71,20 +71,25 @@ module Fluent
71
71
  @tag_to_kubernetes_name_regexp_compiled = Regexp.compile(@tag_to_kubernetes_name_regexp)
72
72
 
73
73
  if @kubernetes_url.present?
74
- @client = Kubeclient::Client.new @kubernetes_url, @apiVersion
75
74
 
76
- @client.ssl_options(
75
+ ssl_options = {
77
76
  client_cert: @client_cert.present? ? OpenSSL::X509::Certificate.new(File.read(@client_cert)) : nil,
78
77
  client_key: @client_key.present? ? OpenSSL::PKey::RSA.new(File.read(@client_key)) : nil,
79
78
  ca_file: @ca_file,
80
79
  verify_ssl: @verify_ssl ? OpenSSL::SSL::VERIFY_PEER : OpenSSL::SSL::VERIFY_NONE
81
- )
80
+ }
81
+
82
+ auth_options = {}
82
83
 
83
84
  if @bearer_token_file.present?
84
85
  bearer_token = File.read(@bearer_token_file)
85
- @client.bearer_token(bearer_token)
86
+ auth_options[:bearer_token] = bearer_token
86
87
  end
87
88
 
89
+ @client = Kubeclient::Client.new @kubernetes_url, @apiVersion,
90
+ ssl_options: ssl_options,
91
+ auth_options: auth_options
92
+
88
93
  begin
89
94
  @client.api_valid?
90
95
  rescue KubeException => kube_error
data/test/cassettes/kubernetes_docker_metadata.yml CHANGED
@@ -47,16 +47,14 @@ http_interactions:
47
47
  string: |-
48
48
  {
49
49
  "versions": [
50
- "v1beta1",
51
- "v1beta2",
52
- "v1beta3"
50
+ "v1"
53
51
  ]
54
52
  }
55
53
  http_version:
56
54
  recorded_at: Fri, 08 May 2015 10:35:37 GMT
57
55
  - request:
58
56
  method: get
59
- uri: https://localhost:8443/api/v1beta3/namespaces/default/pods/fabric8-console-controller-98rqc
57
+ uri: https://localhost:8443/api/v1/namespaces/default/pods/fabric8-console-controller-98rqc
60
58
  body:
61
59
  encoding: US-ASCII
62
60
  string: ''
@@ -83,12 +81,12 @@ http_interactions:
83
81
  string: |-
84
82
  {
85
83
  "kind": "Pod",
86
- "apiVersion": "v1beta3",
84
+ "apiVersion": "v1",
87
85
  "metadata": {
88
86
  "name": "fabric8-console-controller-98rqc",
89
87
  "generateName": "fabric8-console-controller-",
90
88
  "namespace": "default",
91
- "selfLink": "/api/v1beta3/namespaces/default/pods/fabric8-console-controller-98rqc",
89
+ "selfLink": "/api/v1/namespaces/default/pods/fabric8-console-controller-98rqc",
92
90
  "uid": "c76927af-f563-11e4-b32d-54ee7527188d",
93
91
  "resourceVersion": "122",
94
92
  "creationTimestamp": "2015-05-08T09:22:42Z",
data/test/cassettes/kubernetes_docker_metadata_using_bearer_token.yml CHANGED
@@ -49,16 +49,14 @@ http_interactions:
49
49
  string: |-
50
50
  {
51
51
  "versions": [
52
- "v1beta1",
53
- "v1beta2",
54
- "v1beta3"
52
+ "v1"
55
53
  ]
56
54
  }
57
55
  http_version:
58
56
  recorded_at: Sat, 09 May 2015 13:51:07 GMT
59
57
  - request:
60
58
  method: get
61
- uri: https://localhost:8443/api/v1beta3/namespaces/default/pods/fabric8-console-controller-98rqc
59
+ uri: https://localhost:8443/api/v1/namespaces/default/pods/fabric8-console-controller-98rqc
62
60
  body:
63
61
  encoding: US-ASCII
64
62
  string: ''
@@ -87,12 +85,12 @@ http_interactions:
87
85
  string: |-
88
86
  {
89
87
  "kind": "Pod",
90
- "apiVersion": "v1beta3",
88
+ "apiVersion": "v1",
91
89
  "metadata": {
92
90
  "name": "fabric8-console-controller-98rqc",
93
91
  "generateName": "fabric8-console-controller-",
94
92
  "namespace": "default",
95
- "selfLink": "/api/v1beta3/namespaces/default/pods/fabric8-console-controller-98rqc",
93
+ "selfLink": "/api/v1/namespaces/default/pods/fabric8-console-controller-98rqc",
96
94
  "uid": "c76927af-f563-11e4-b32d-54ee7527188d",
97
95
  "resourceVersion": "3556",
98
96
  "creationTimestamp": "2015-05-08T09:22:42Z",
data/test/cassettes/non_kubernetes_docker_metadata.yml CHANGED
@@ -47,16 +47,14 @@ http_interactions:
47
47
  string: |-
48
48
  {
49
49
  "versions": [
50
- "v1beta1",
51
- "v1beta2",
52
- "v1beta3"
50
+ "v1"
53
51
  ]
54
52
  }
55
53
  http_version:
56
54
  recorded_at: Fri, 08 May 2015 10:35:37 GMT
57
55
  - request:
58
56
  method: get
59
- uri: https://localhost:8443/api/v1beta3/namespaces/default/pods/fabric8-forge-controller-ymkew
57
+ uri: https://localhost:8443/api/v1/namespaces/default/pods/fabric8-forge-controller-ymkew
60
58
  body:
61
59
  encoding: US-ASCII
62
60
  string: ''
@@ -83,7 +81,7 @@ http_interactions:
83
81
  string: |-
84
82
  {
85
83
  "kind": "Status",
86
- "apiVersion": "v1beta3",
84
+ "apiVersion": "v1",
87
85
  "metadata": {},
88
86
  "status": "Failure",
89
87
  "message": "pods \"fabric8-forge-controller-ymkew\" not found",
data/test/cassettes/valid_kubernetes_api_server.yml CHANGED
@@ -47,9 +47,7 @@ http_interactions:
47
47
  string: |-
48
48
  {
49
49
  "versions": [
50
- "v1beta1",
51
- "v1beta2",
52
- "v1beta3"
50
+ "v1"
53
51
  ]
54
52
  }
55
53
  http_version:
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: fluent-plugin-kubernetes_metadata_filter
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.7.0
4
+ version: 0.8.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jimmi Dyson
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-05-19 00:00:00.000000000 Z
11
+ date: 2015-08-24 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: fluentd
@@ -44,14 +44,14 @@ dependencies:
44
44
  requirements:
45
45
  - - "~>"
46
46
  - !ruby/object:Gem::Version
47
- version: 0.1.15
47
+ version: 0.4.0
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
52
  - - "~>"
53
53
  - !ruby/object:Gem::Version
54
- version: 0.1.15
54
+ version: 0.4.0
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: fluent-plugin-docker_metadata_filter
57
57
  requirement: !ruby/object:Gem::Requirement
@@ -192,6 +192,20 @@ dependencies:
192
192
  - - ">="
193
193
  - !ruby/object:Gem::Version
194
194
  version: '0'
195
+ - !ruby/object:Gem::Dependency
196
+ name: yajl-ruby
197
+ requirement: !ruby/object:Gem::Requirement
198
+ requirements:
199
+ - - ">="
200
+ - !ruby/object:Gem::Version
201
+ version: '0'
202
+ type: :development
203
+ prerelease: false
204
+ version_requirements: !ruby/object:Gem::Requirement
205
+ requirements:
206
+ - - ">="
207
+ - !ruby/object:Gem::Version
208
+ version: '0'
195
209
  description: Filter plugin to add Kubernetes metadata
196
210
  email:
197
211
  - jimmidyson@gmail.com
@@ -236,7 +250,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
236
250
  version: '0'
237
251
  requirements: []
238
252
  rubyforge_project:
239
- rubygems_version: 2.2.2
253
+ rubygems_version: 2.4.8
240
254
  signing_key:
241
255
  specification_version: 4
242
256
  summary: Filter plugin to add Kubernetes metadata