fluent-plugin-kubernetes_sumologic 2.3.2 → 2.4.0

Sign up to get free protection for your applications and to get access to all the features.
@@ -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_sumologic"
7
- gem.version = "2.3.2"
7
+ gem.version = "2.4.0"
8
8
  gem.authors = ["Sumo Logic"]
9
9
  gem.email = ["collection@sumologic.com"]
10
10
  gem.description = %q{FluentD plugin to extract logs from Kubernetes clusters, enrich and ship to Sumo logic.}
@@ -32,21 +32,21 @@ module Fluent::Plugin
32
32
  end
33
33
 
34
34
  def sanitize_pod_name(k8s_metadata)
35
- # Strip out dynamic bits from pod name.
36
- # NOTE: Kubernetes deployments append a template hash.
37
- # At the moment this can be in 3 different forms:
38
- # 1) pre-1.8: numeric in pod_template_hash and pod_parts[-2]
39
- # 2) 1.8-1.11: numeric in pod_template_hash, hash in pod_parts[-2]
40
- # 3) post-1.11: hash in pod_template_hash and pod_parts[-2]
41
-
42
- pod_parts = k8s_metadata[:pod].split("-")
43
- pod_template_hash = k8s_metadata[:"label:pod-template-hash"]
44
- if (pod_template_hash == pod_parts[-2] ||
45
- to_hash(pod_template_hash) == pod_parts[-2])
46
- k8s_metadata[:pod_name] = pod_parts[0..-3].join("-")
47
- else
48
- k8s_metadata[:pod_name] = pod_parts[0..-2].join("-")
49
- end
35
+ # Strip out dynamic bits from pod name.
36
+ # NOTE: Kubernetes deployments append a template hash.
37
+ # At the moment this can be in 3 different forms:
38
+ # 1) pre-1.8: numeric in pod_template_hash and pod_parts[-2]
39
+ # 2) 1.8-1.11: numeric in pod_template_hash, hash in pod_parts[-2]
40
+ # 3) post-1.11: hash in pod_template_hash and pod_parts[-2]
41
+
42
+ pod_parts = k8s_metadata[:pod].split("-")
43
+ pod_template_hash = k8s_metadata[:"label:pod-template-hash"]
44
+ if (pod_template_hash == pod_parts[-2] ||
45
+ to_hash(pod_template_hash) == pod_parts[-2])
46
+ k8s_metadata[:pod_name] = pod_parts[0..-3].join("-")
47
+ else
48
+ k8s_metadata[:pod_name] = pod_parts[0..-2].join("-")
49
+ end
50
50
  end
51
51
 
52
52
  def to_hash(pod_template_hash)
@@ -60,6 +60,7 @@ module Fluent::Plugin
60
60
  # Set the sumo metadata fields
61
61
  sumo_metadata = record["_sumo_metadata"] || {}
62
62
  record["_sumo_metadata"] = sumo_metadata
63
+ log_fields = {}
63
64
  sumo_metadata[:log_format] = @log_format
64
65
  sumo_metadata[:host] = @source_host if @source_host
65
66
  sumo_metadata[:source] = @source_name if @source_name
@@ -102,17 +103,20 @@ module Fluent::Plugin
102
103
  # Clone kubernetes hash so we don't override the cache
103
104
  kubernetes = record["kubernetes"].clone
104
105
  k8s_metadata = {
105
- :namespace => kubernetes["namespace_name"],
106
- :pod => kubernetes["pod_name"],
107
- :pod_id => kubernetes['pod_id'],
108
- :container => kubernetes["container_name"],
109
- :source_host => kubernetes["host"],
106
+ :namespace => kubernetes["namespace_name"],
107
+ :pod => kubernetes["pod_name"],
108
+ :pod_id => kubernetes['pod_id'],
109
+ :container => kubernetes["container_name"],
110
+ :source_host => kubernetes["host"],
110
111
  }
111
112
 
112
113
 
113
114
  if kubernetes.has_key? "labels"
114
115
  kubernetes["labels"].each { |k, v| k8s_metadata["label:#{k}".to_sym] = v }
115
116
  end
117
+ if kubernetes.has_key? "namespace_labels"
118
+ kubernetes["namespace_labels"].each { |k, v| k8s_metadata["namespace_label:#{k}".to_sym] = v }
119
+ end
116
120
  k8s_metadata.default = "undefined"
117
121
 
118
122
  annotations = kubernetes.fetch("annotations", {})
@@ -183,6 +187,7 @@ module Fluent::Plugin
183
187
  record["kubernetes"].delete("pod_id")
184
188
  record["kubernetes"].delete("namespace_id")
185
189
  record["kubernetes"].delete("labels")
190
+ record["kubernetes"].delete("namespace_labels")
186
191
  record["kubernetes"].delete("master_url")
187
192
  record["kubernetes"].delete("annotations")
188
193
  end
@@ -194,8 +199,34 @@ module Fluent::Plugin
194
199
  end
195
200
  # Strip sumologic.com annotations
196
201
  kubernetes.delete("annotations") if annotations
202
+
203
+ if @log_format == "fields" and record.key?("docker") and not record.fetch("docker").nil?
204
+ record["docker"].each {|k, v| log_fields[k] = v}
205
+ end
206
+
207
+ if @log_format == "fields" and record.key?("kubernetes") and not record.fetch("kubernetes").nil?
208
+ if kubernetes.has_key? "labels"
209
+ kubernetes["labels"].each { |k, v| log_fields["pod_labels_#{k}".to_sym] = v }
210
+ end
211
+ if kubernetes.has_key? "namespace_labels"
212
+ kubernetes["namespace_labels"].each { |k, v| log_fields["namespace_labels_#{k}".to_sym] = v }
213
+ end
214
+ log_fields["container"] = kubernetes["container_name"] unless kubernetes["container_name"].nil?
215
+ log_fields["namespace"] = kubernetes["namespace_name"] unless kubernetes["namespace_name"].nil?
216
+ log_fields["pod"] = kubernetes["pod_name"] unless kubernetes["pod_name"].nil?
217
+ log_fields["pod_id"] = kubernetes["pod_id"] unless kubernetes["pod_id"].nil?
218
+ log_fields["host"] = kubernetes["host"] unless kubernetes["host"].nil?
219
+ log_fields["master_url"] = kubernetes["master_url"] unless kubernetes["master_url"].nil?
220
+ log_fields["namespace_id"] = kubernetes["namespace_id"] unless kubernetes["namespace_id"].nil?
221
+ end
222
+ end
223
+
224
+ if @log_format == "fields" and not log_fields.nil?
225
+ sumo_metadata[:fields] = log_fields.map{|k,v| "#{k}=#{v}"}.join(',')
226
+ record.delete("docker")
227
+ record.delete("kubernetes")
197
228
  end
198
229
  record
199
230
  end
200
231
  end
201
- end
232
+ end
@@ -29,55 +29,247 @@ class SumoContainerOutputTest < Test::Unit::TestCase
29
29
  d = create_driver(conf)
30
30
  time = @time
31
31
  input = {
32
- "timestamp" => 1538677347823,
33
- "log" => "some message",
34
- "stream" => "stdout",
35
- "docker" => {
36
- "container_id" => "5c280b6ad5abec32e9af729295c20f60fbeadf3ba16fda2d121f87228e6822e0",
37
- },
38
- "kubernetes" => {
39
- "container_name" => "log-format-labs",
40
- "namespace_name" => "default",
41
- "pod_name" => "log-format-labs-54575ccdb9-9d677",
42
- "pod_id" => "170af806-c801-11e8-9009-025000000001",
43
- "labels" => {
44
- "pod-template-hash" => "1013177865",
45
- "run" => "log-format-labs",
46
- },
47
- "host" => "docker-for-desktop",
48
- "master_url" => "https =>//10.96.0.1 =>443/api",
49
- "namespace_id" => "e8572415-9596-11e8-b28b-025000000001",
50
- },
32
+ "timestamp" => 1538677347823,
33
+ "log" => "some message",
34
+ "stream" => "stdout",
35
+ "docker" => {
36
+ "container_id" => "5c280b6ad5abec32e9af729295c20f60fbeadf3ba16fda2d121f87228e6822e0",
37
+ },
38
+ "kubernetes" => {
39
+ "container_name" => "log-format-labs",
40
+ "namespace_name" => "default",
41
+ "pod_name" => "log-format-labs-54575ccdb9-9d677",
42
+ "pod_id" => "170af806-c801-11e8-9009-025000000001",
43
+ "labels" => {
44
+ "pod-template-hash" => "1013177865",
45
+ "run" => "log-format-labs",
46
+ },
47
+ "host" => "docker-for-desktop",
48
+ "master_url" => "https =>//10.96.0.1 =>443/api",
49
+ "namespace_id" => "e8572415-9596-11e8-b28b-025000000001",
50
+ },
51
+ }
52
+ d.run do
53
+ d.feed("filter.test", time, input)
54
+ end
55
+ expected = {
56
+ "timestamp" => 1538677347823,
57
+ "log" => "some message",
58
+ "stream" => "stdout",
59
+ "docker" => {
60
+ "container_id" => "5c280b6ad5abec32e9af729295c20f60fbeadf3ba16fda2d121f87228e6822e0",
61
+ },
62
+ "kubernetes" => {
63
+ "container_name" => "log-format-labs",
64
+ "namespace_name" => "default",
65
+ "pod_name" => "log-format-labs-54575ccdb9-9d677",
66
+ "pod_id" => "170af806-c801-11e8-9009-025000000001",
67
+ "labels" => {
68
+ "pod-template-hash" => "1013177865",
69
+ "run" => "log-format-labs",
70
+ },
71
+ "host" => "docker-for-desktop",
72
+ "master_url" => "https =>//10.96.0.1 =>443/api",
73
+ "namespace_id" => "e8572415-9596-11e8-b28b-025000000001",
74
+ },
75
+ "_sumo_metadata" => {
76
+ :category => "kubernetes/default/log/format/labs",
77
+ :host => "",
78
+ :log_format => "json",
79
+ :source => "default.log-format-labs-54575ccdb9-9d677.log-format-labs",
80
+ },
81
+ }
82
+ assert_equal(1, d.filtered_records.size)
83
+ assert_equal(d.filtered_records[0], expected)
84
+ end
85
+
86
+ test "test_default_config_no_labels" do
87
+ conf = %{}
88
+ d = create_driver(conf)
89
+ time = @time
90
+ input = {
91
+ "timestamp" => 1538677347823,
92
+ "log" => "some message",
93
+ "stream" => "stdout",
94
+ "docker" => {
95
+ "container_id" => "5c280b6ad5abec32e9af729295c20f60fbeadf3ba16fda2d121f87228e6822e0",
96
+ },
97
+ "kubernetes" => {
98
+ "container_name" => "log-format-labs",
99
+ "namespace_name" => "default",
100
+ "pod_name" => "log-format-labs-54575ccdb9-9d677",
101
+ "pod_id" => "170af806-c801-11e8-9009-025000000001",
102
+ "host" => "docker-for-desktop",
103
+ "master_url" => "https =>//10.96.0.1 =>443/api",
104
+ "namespace_id" => "e8572415-9596-11e8-b28b-025000000001",
105
+ },
106
+ }
107
+ d.run do
108
+ d.feed("filter.test", time, input)
109
+ end
110
+ expected = {
111
+ "timestamp" => 1538677347823,
112
+ "log" => "some message",
113
+ "stream" => "stdout",
114
+ "docker" => {
115
+ "container_id" => "5c280b6ad5abec32e9af729295c20f60fbeadf3ba16fda2d121f87228e6822e0",
116
+ },
117
+ "kubernetes" => {
118
+ "container_name" => "log-format-labs",
119
+ "namespace_name" => "default",
120
+ "pod_name" => "log-format-labs-54575ccdb9-9d677",
121
+ "pod_id" => "170af806-c801-11e8-9009-025000000001",
122
+ "host" => "docker-for-desktop",
123
+ "master_url" => "https =>//10.96.0.1 =>443/api",
124
+ "namespace_id" => "e8572415-9596-11e8-b28b-025000000001",
125
+ },
126
+ "_sumo_metadata" => {
127
+ :category => "kubernetes/default/log/format/labs/54575ccdb9",
128
+ :host => "",
129
+ :log_format => "json",
130
+ :source => "default.log-format-labs-54575ccdb9-9d677.log-format-labs",
131
+ },
132
+ }
133
+ assert_equal(1, d.filtered_records.size)
134
+ assert_equal(d.filtered_records[0], expected)
135
+ end
136
+
137
+ test "test_fields_format" do
138
+ conf = %{
139
+ log_format fields
140
+ }
141
+ d = create_driver(conf)
142
+ time = @time
143
+ input = {
144
+ "timestamp" => 1538677347823,
145
+ "log" => "some message",
146
+ "stream" => "stdout",
147
+ "docker" => {
148
+ "container_id" => "5c280b6ad5abec32e9af729295c20f60fbeadf3ba16fda2d121f87228e6822e0",
149
+ },
150
+ "kubernetes" => {
151
+ "container_name" => "log-format-labs",
152
+ "namespace_name" => "default",
153
+ "pod_name" => "log-format-labs-54575ccdb9-9d677",
154
+ "pod_id" => "170af806-c801-11e8-9009-025000000001",
155
+ "labels" => {
156
+ "pod-template-hash" => "1013177865",
157
+ "run" => "log-format-labs",
158
+ },
159
+ "host" => "docker-for-desktop",
160
+ "master_url" => "https =>//10.96.0.1 =>443/api",
161
+ "namespace_id" => "e8572415-9596-11e8-b28b-025000000001",
162
+ },
163
+ }
164
+ d.run do
165
+ d.feed("filter.test", time, input)
166
+ end
167
+ expected = {
168
+ "timestamp" => 1538677347823,
169
+ "log" => "some message",
170
+ "stream" => "stdout",
171
+ "_sumo_metadata" => {
172
+ :category => "kubernetes/default/log/format/labs",
173
+ :host => "",
174
+ :log_format => "fields",
175
+ :source => "default.log-format-labs-54575ccdb9-9d677.log-format-labs",
176
+ :fields => "container_id=5c280b6ad5abec32e9af729295c20f60fbeadf3ba16fda2d121f87228e6822e0,pod_labels_pod-template-hash=1013177865,pod_labels_run=log-format-labs,container=log-format-labs,namespace=default,pod=log-format-labs-54575ccdb9-9d677,pod_id=170af806-c801-11e8-9009-025000000001,host=docker-for-desktop,master_url=https =>//10.96.0.1 =>443/api,namespace_id=e8572415-9596-11e8-b28b-025000000001"
177
+ },
178
+ }
179
+ assert_equal(1, d.filtered_records.size)
180
+ assert_equal(d.filtered_records[0], expected)
181
+ end
182
+
183
+ test "test_fields_namespace_labels" do
184
+ conf = %{
185
+ log_format fields
186
+ }
187
+ d = create_driver(conf)
188
+ time = @time
189
+ input = {
190
+ "timestamp" => 1538677347823,
191
+ "log" => "some message",
192
+ "stream" => "stdout",
193
+ "docker" => {
194
+ "container_id" => "5c280b6ad5abec32e9af729295c20f60fbeadf3ba16fda2d121f87228e6822e0",
195
+ },
196
+ "kubernetes" => {
197
+ "container_name" => "log-format-labs",
198
+ "namespace_name" => "default",
199
+ "pod_name" => "log-format-labs-54575ccdb9-9d677",
200
+ "pod_id" => "170af806-c801-11e8-9009-025000000001",
201
+ "labels" => {
202
+ "pod-template-hash" => "1013177865",
203
+ "run" => "log-format-labs",
204
+ },
205
+ "namespace_labels" => {
206
+ "app" => "sumologic"
207
+ },
208
+ "host" => "docker-for-desktop",
209
+ "master_url" => "https =>//10.96.0.1 =>443/api",
210
+ "namespace_id" => "e8572415-9596-11e8-b28b-025000000001",
211
+ },
212
+ }
213
+ d.run do
214
+ d.feed("filter.test", time, input)
215
+ end
216
+ expected = {
217
+ "timestamp" => 1538677347823,
218
+ "log" => "some message",
219
+ "stream" => "stdout",
220
+ "_sumo_metadata" => {
221
+ :category => "kubernetes/default/log/format/labs",
222
+ :host => "",
223
+ :log_format => "fields",
224
+ :source => "default.log-format-labs-54575ccdb9-9d677.log-format-labs",
225
+ :fields => "container_id=5c280b6ad5abec32e9af729295c20f60fbeadf3ba16fda2d121f87228e6822e0,pod_labels_pod-template-hash=1013177865,pod_labels_run=log-format-labs,namespace_labels_app=sumologic,container=log-format-labs,namespace=default,pod=log-format-labs-54575ccdb9-9d677,pod_id=170af806-c801-11e8-9009-025000000001,host=docker-for-desktop,master_url=https =>//10.96.0.1 =>443/api,namespace_id=e8572415-9596-11e8-b28b-025000000001"
226
+ },
227
+ }
228
+ assert_equal(1, d.filtered_records.size)
229
+ assert_equal(d.filtered_records[0], expected)
230
+ end
231
+
232
+ test "test_fields_format_no_timestamp" do
233
+ conf = %{
234
+ log_format fields
235
+ add_stream false
236
+ }
237
+ d = create_driver(conf)
238
+ time = @time
239
+ input = {
240
+ "timestamp" => 1538677347823,
241
+ "log" => "some message",
242
+ "stream" => "stdout",
243
+ "docker" => {
244
+ "container_id" => "5c280b6ad5abec32e9af729295c20f60fbeadf3ba16fda2d121f87228e6822e0",
245
+ },
246
+ "kubernetes" => {
247
+ "container_name" => "log-format-labs",
248
+ "namespace_name" => "default",
249
+ "pod_name" => "log-format-labs-54575ccdb9-9d677",
250
+ "pod_id" => "170af806-c801-11e8-9009-025000000001",
251
+ "labels" => {
252
+ "pod-template-hash" => "1013177865",
253
+ "run" => "log-format-labs",
254
+ },
255
+ "host" => "docker-for-desktop",
256
+ "master_url" => "https =>//10.96.0.1 =>443/api",
257
+ "namespace_id" => "e8572415-9596-11e8-b28b-025000000001",
258
+ },
51
259
  }
52
260
  d.run do
53
261
  d.feed("filter.test", time, input)
54
262
  end
55
263
  expected = {
56
- "timestamp" => 1538677347823,
57
- "log" => "some message",
58
- "stream" => "stdout",
59
- "docker" => {
60
- "container_id" => "5c280b6ad5abec32e9af729295c20f60fbeadf3ba16fda2d121f87228e6822e0",
61
- },
62
- "kubernetes" => {
63
- "container_name" => "log-format-labs",
64
- "namespace_name" => "default",
65
- "pod_name" => "log-format-labs-54575ccdb9-9d677",
66
- "pod_id" => "170af806-c801-11e8-9009-025000000001",
67
- "labels" => {
68
- "pod-template-hash" => "1013177865",
69
- "run" => "log-format-labs",
70
- },
71
- "host" => "docker-for-desktop",
72
- "master_url" => "https =>//10.96.0.1 =>443/api",
73
- "namespace_id" => "e8572415-9596-11e8-b28b-025000000001",
74
- },
75
- "_sumo_metadata" => {
76
- :category => "kubernetes/default/log/format/labs",
77
- :host => "",
78
- :log_format => "json",
79
- :source => "default.log-format-labs-54575ccdb9-9d677.log-format-labs",
80
- },
264
+ "timestamp" => 1538677347823,
265
+ "log" => "some message",
266
+ "_sumo_metadata" => {
267
+ :category => "kubernetes/default/log/format/labs",
268
+ :host => "",
269
+ :log_format => "fields",
270
+ :source => "default.log-format-labs-54575ccdb9-9d677.log-format-labs",
271
+ :fields => "container_id=5c280b6ad5abec32e9af729295c20f60fbeadf3ba16fda2d121f87228e6822e0,pod_labels_pod-template-hash=1013177865,pod_labels_run=log-format-labs,container=log-format-labs,namespace=default,pod=log-format-labs-54575ccdb9-9d677,pod_id=170af806-c801-11e8-9009-025000000001,host=docker-for-desktop,master_url=https =>//10.96.0.1 =>443/api,namespace_id=e8572415-9596-11e8-b28b-025000000001"
272
+ },
81
273
  }
82
274
  assert_equal(1, d.filtered_records.size)
83
275
  assert_equal(d.filtered_records[0], expected)
@@ -383,39 +575,39 @@ class SumoContainerOutputTest < Test::Unit::TestCase
383
575
  d = create_driver(conf)
384
576
  time = @time
385
577
  input = {
386
- "timestamp" => 1538677347823,
387
- "log" => "some message",
388
- "stream" => "stdout",
389
- "docker" => {
390
- "container_id" => "5c280b6ad5abec32e9af729295c20f60fbeadf3ba16fda2d121f87228e6822e0",
391
- },
392
- "kubernetes" => {
393
- "container_name" => "log-format-labs",
394
- "namespace_name" => "default",
395
- "pod_name" => "log-format-labs-54575ccdb9-9d677",
396
- "pod_id" => "170af806-c801-11e8-9009-025000000001",
397
- "labels" => {
398
- "pod-template-hash" => "1013177865",
399
- "run" => "log-format-labs",
400
- },
401
- "host" => "docker-for-desktop",
402
- "master_url" => "https =>//10.96.0.1 =>443/api",
403
- "namespace_id" => "e8572415-9596-11e8-b28b-025000000001",
404
- },
578
+ "timestamp" => 1538677347823,
579
+ "log" => "some message",
580
+ "stream" => "stdout",
581
+ "docker" => {
582
+ "container_id" => "5c280b6ad5abec32e9af729295c20f60fbeadf3ba16fda2d121f87228e6822e0",
583
+ },
584
+ "kubernetes" => {
585
+ "container_name" => "log-format-labs",
586
+ "namespace_name" => "default",
587
+ "pod_name" => "log-format-labs-54575ccdb9-9d677",
588
+ "pod_id" => "170af806-c801-11e8-9009-025000000001",
589
+ "labels" => {
590
+ "pod-template-hash" => "1013177865",
591
+ "run" => "log-format-labs",
592
+ },
593
+ "host" => "docker-for-desktop",
594
+ "master_url" => "https =>//10.96.0.1 =>443/api",
595
+ "namespace_id" => "e8572415-9596-11e8-b28b-025000000001",
596
+ },
405
597
  }
406
598
  d.run do
407
599
  d.feed("filter.test", time, input)
408
600
  end
409
601
  expected = {
410
- "timestamp" => 1538677347823,
411
- "log" => "some message",
412
- "stream" => "stdout",
413
- "_sumo_metadata" => {
414
- :category => "kubernetes/default/log/format/labs",
415
- :host => "",
416
- :log_format => "json",
417
- :source => "default.log-format-labs-54575ccdb9-9d677.log-format-labs",
418
- },
602
+ "timestamp" => 1538677347823,
603
+ "log" => "some message",
604
+ "stream" => "stdout",
605
+ "_sumo_metadata" => {
606
+ :category => "kubernetes/default/log/format/labs",
607
+ :host => "",
608
+ :log_format => "json",
609
+ :source => "default.log-format-labs-54575ccdb9-9d677.log-format-labs",
610
+ },
419
611
  }
420
612
  assert_equal(1, d.filtered_records.size)
421
613
  assert_equal(d.filtered_records[0], expected)
@@ -579,116 +771,116 @@ class SumoContainerOutputTest < Test::Unit::TestCase
579
771
  d = create_driver(conf)
580
772
  time = @time
581
773
  input = {
582
- "timestamp" => 1538677347823,
583
- "log" => "some message",
584
- "stream" => "stdout",
585
- "docker" => {
586
- "container_id" => "5c280b6ad5abec32e9af729295c20f60fbeadf3ba16fda2d121f87228e6822e0",
587
- },
588
- "kubernetes" => {
589
- "container_name" => "log-format-labs",
590
- "namespace_name" => "default",
591
- "pod_name" => "log-format-labs-54575ccdb9-9d677",
592
- "pod_id" => "170af806-c801-11e8-9009-025000000001",
593
- "labels" => {
594
- "pod-template-hash" => "1013177865",
595
- "run" => "log-format-labs",
596
- },
597
- "host" => "docker-for-desktop",
598
- "master_url" => "https =>//10.96.0.1 =>443/api",
599
- "namespace_id" => "e8572415-9596-11e8-b28b-025000000001",
600
- },
601
- }
602
- d.run do
603
- d.feed("filter.test", time, input)
604
- end
605
- expected = {
606
- "timestamp" => 1538677347823,
607
- "log" => "some message",
608
- "stream" => "stdout",
609
- "docker" => {
610
- "container_id" => "5c280b6ad5abec32e9af729295c20f60fbeadf3ba16fda2d121f87228e6822e0",
611
- },
612
- "kubernetes" => {
613
- "container_name" => "log-format-labs",
614
- "namespace_name" => "default",
615
- "pod_name" => "log-format-labs-54575ccdb9-9d677",
616
- "pod_id" => "170af806-c801-11e8-9009-025000000001",
617
- "labels" => {
618
- "pod-template-hash" => "1013177865",
619
- "run" => "log-format-labs",
620
- },
621
- "host" => "docker-for-desktop",
622
- "master_url" => "https =>//10.96.0.1 =>443/api",
623
- "namespace_id" => "e8572415-9596-11e8-b28b-025000000001",
624
- },
625
- "_sumo_metadata" => {
626
- :category => "kubernetes/default/log/format/labs",
627
- :host => "",
628
- :log_format => "json_merge",
629
- :source => "default.log-format-labs-54575ccdb9-9d677.log-format-labs",
630
- },
631
- }
632
- assert_equal(1, d.filtered_records.size)
633
- assert_equal(d.filtered_records[0], expected)
634
- end
635
-
636
- test "test_log_format_text" do
774
+ "timestamp" => 1538677347823,
775
+ "log" => "some message",
776
+ "stream" => "stdout",
777
+ "docker" => {
778
+ "container_id" => "5c280b6ad5abec32e9af729295c20f60fbeadf3ba16fda2d121f87228e6822e0",
779
+ },
780
+ "kubernetes" => {
781
+ "container_name" => "log-format-labs",
782
+ "namespace_name" => "default",
783
+ "pod_name" => "log-format-labs-54575ccdb9-9d677",
784
+ "pod_id" => "170af806-c801-11e8-9009-025000000001",
785
+ "labels" => {
786
+ "pod-template-hash" => "1013177865",
787
+ "run" => "log-format-labs",
788
+ },
789
+ "host" => "docker-for-desktop",
790
+ "master_url" => "https =>//10.96.0.1 =>443/api",
791
+ "namespace_id" => "e8572415-9596-11e8-b28b-025000000001",
792
+ },
793
+ }
794
+ d.run do
795
+ d.feed("filter.test", time, input)
796
+ end
797
+ expected = {
798
+ "timestamp" => 1538677347823,
799
+ "log" => "some message",
800
+ "stream" => "stdout",
801
+ "docker" => {
802
+ "container_id" => "5c280b6ad5abec32e9af729295c20f60fbeadf3ba16fda2d121f87228e6822e0",
803
+ },
804
+ "kubernetes" => {
805
+ "container_name" => "log-format-labs",
806
+ "namespace_name" => "default",
807
+ "pod_name" => "log-format-labs-54575ccdb9-9d677",
808
+ "pod_id" => "170af806-c801-11e8-9009-025000000001",
809
+ "labels" => {
810
+ "pod-template-hash" => "1013177865",
811
+ "run" => "log-format-labs",
812
+ },
813
+ "host" => "docker-for-desktop",
814
+ "master_url" => "https =>//10.96.0.1 =>443/api",
815
+ "namespace_id" => "e8572415-9596-11e8-b28b-025000000001",
816
+ },
817
+ "_sumo_metadata" => {
818
+ :category => "kubernetes/default/log/format/labs",
819
+ :host => "",
820
+ :log_format => "json_merge",
821
+ :source => "default.log-format-labs-54575ccdb9-9d677.log-format-labs",
822
+ },
823
+ }
824
+ assert_equal(1, d.filtered_records.size)
825
+ assert_equal(d.filtered_records[0], expected)
826
+ end
827
+
828
+ test "test_log_format_text" do
637
829
  conf = %{
638
830
  log_format text
639
831
  }
640
832
  d = create_driver(conf)
641
833
  time = @time
642
834
  input = {
643
- "timestamp" => 1538677347823,
644
- "log" => "some message",
645
- "stream" => "stdout",
646
- "docker" => {
647
- "container_id" => "5c280b6ad5abec32e9af729295c20f60fbeadf3ba16fda2d121f87228e6822e0",
648
- },
649
- "kubernetes" => {
650
- "container_name" => "log-format-labs",
651
- "namespace_name" => "default",
652
- "pod_name" => "log-format-labs-54575ccdb9-9d677",
653
- "pod_id" => "170af806-c801-11e8-9009-025000000001",
654
- "labels" => {
655
- "pod-template-hash" => "1013177865",
656
- "run" => "log-format-labs",
657
- },
658
- "host" => "docker-for-desktop",
659
- "master_url" => "https =>//10.96.0.1 =>443/api",
660
- "namespace_id" => "e8572415-9596-11e8-b28b-025000000001",
661
- },
835
+ "timestamp" => 1538677347823,
836
+ "log" => "some message",
837
+ "stream" => "stdout",
838
+ "docker" => {
839
+ "container_id" => "5c280b6ad5abec32e9af729295c20f60fbeadf3ba16fda2d121f87228e6822e0",
840
+ },
841
+ "kubernetes" => {
842
+ "container_name" => "log-format-labs",
843
+ "namespace_name" => "default",
844
+ "pod_name" => "log-format-labs-54575ccdb9-9d677",
845
+ "pod_id" => "170af806-c801-11e8-9009-025000000001",
846
+ "labels" => {
847
+ "pod-template-hash" => "1013177865",
848
+ "run" => "log-format-labs",
849
+ },
850
+ "host" => "docker-for-desktop",
851
+ "master_url" => "https =>//10.96.0.1 =>443/api",
852
+ "namespace_id" => "e8572415-9596-11e8-b28b-025000000001",
853
+ },
662
854
  }
663
855
  d.run do
664
856
  d.feed("filter.test", time, input)
665
857
  end
666
858
  expected = {
667
- "timestamp" => 1538677347823,
668
- "log" => "some message",
669
- "stream" => "stdout",
670
- "docker" => {
671
- "container_id" => "5c280b6ad5abec32e9af729295c20f60fbeadf3ba16fda2d121f87228e6822e0",
672
- },
673
- "kubernetes" => {
674
- "container_name" => "log-format-labs",
675
- "namespace_name" => "default",
676
- "pod_name" => "log-format-labs-54575ccdb9-9d677",
677
- "pod_id" => "170af806-c801-11e8-9009-025000000001",
678
- "labels" => {
679
- "pod-template-hash" => "1013177865",
680
- "run" => "log-format-labs",
681
- },
682
- "host" => "docker-for-desktop",
683
- "master_url" => "https =>//10.96.0.1 =>443/api",
684
- "namespace_id" => "e8572415-9596-11e8-b28b-025000000001",
685
- },
686
- "_sumo_metadata" => {
687
- :category => "kubernetes/default/log/format/labs",
688
- :host => "",
689
- :log_format => "text",
690
- :source => "default.log-format-labs-54575ccdb9-9d677.log-format-labs",
691
- },
859
+ "timestamp" => 1538677347823,
860
+ "log" => "some message",
861
+ "stream" => "stdout",
862
+ "docker" => {
863
+ "container_id" => "5c280b6ad5abec32e9af729295c20f60fbeadf3ba16fda2d121f87228e6822e0",
864
+ },
865
+ "kubernetes" => {
866
+ "container_name" => "log-format-labs",
867
+ "namespace_name" => "default",
868
+ "pod_name" => "log-format-labs-54575ccdb9-9d677",
869
+ "pod_id" => "170af806-c801-11e8-9009-025000000001",
870
+ "labels" => {
871
+ "pod-template-hash" => "1013177865",
872
+ "run" => "log-format-labs",
873
+ },
874
+ "host" => "docker-for-desktop",
875
+ "master_url" => "https =>//10.96.0.1 =>443/api",
876
+ "namespace_id" => "e8572415-9596-11e8-b28b-025000000001",
877
+ },
878
+ "_sumo_metadata" => {
879
+ :category => "kubernetes/default/log/format/labs",
880
+ :host => "",
881
+ :log_format => "text",
882
+ :source => "default.log-format-labs-54575ccdb9-9d677.log-format-labs",
883
+ },
692
884
  }
693
885
  assert_equal(1, d.filtered_records.size)
694
886
  assert_equal(d.filtered_records[0], expected)
@@ -814,61 +1006,61 @@ class SumoContainerOutputTest < Test::Unit::TestCase
814
1006
  d = create_driver(conf)
815
1007
  time = @time
816
1008
  input = {
817
- "timestamp" => 1538677347823,
818
- "log" => "some message",
819
- "stream" => "stdout",
820
- "docker" => {
821
- "container_id" => "5c280b6ad5abec32e9af729295c20f60fbeadf3ba16fda2d121f87228e6822e0",
822
- },
823
- "kubernetes" => {
824
- "container_name" => "log-format-labs",
825
- "namespace_name" => "default",
826
- "pod_name" => "log-format-labs-54575ccdb9-9d677",
827
- "pod_id" => "170af806-c801-11e8-9009-025000000001",
828
- "labels" => {
829
- "pod-template-hash" => "1013177865",
830
- "run" => "log-format-labs",
831
- },
832
- "annotations" => {
833
- "sumologic.com/sourceHost" => "foo",
834
- },
835
- "host" => "docker-for-desktop",
836
- "master_url" => "https =>//10.96.0.1 =>443/api",
837
- "namespace_id" => "e8572415-9596-11e8-b28b-025000000001",
838
- },
1009
+ "timestamp" => 1538677347823,
1010
+ "log" => "some message",
1011
+ "stream" => "stdout",
1012
+ "docker" => {
1013
+ "container_id" => "5c280b6ad5abec32e9af729295c20f60fbeadf3ba16fda2d121f87228e6822e0",
1014
+ },
1015
+ "kubernetes" => {
1016
+ "container_name" => "log-format-labs",
1017
+ "namespace_name" => "default",
1018
+ "pod_name" => "log-format-labs-54575ccdb9-9d677",
1019
+ "pod_id" => "170af806-c801-11e8-9009-025000000001",
1020
+ "labels" => {
1021
+ "pod-template-hash" => "1013177865",
1022
+ "run" => "log-format-labs",
1023
+ },
1024
+ "annotations" => {
1025
+ "sumologic.com/sourceHost" => "foo",
1026
+ },
1027
+ "host" => "docker-for-desktop",
1028
+ "master_url" => "https =>//10.96.0.1 =>443/api",
1029
+ "namespace_id" => "e8572415-9596-11e8-b28b-025000000001",
1030
+ },
839
1031
  }
840
1032
  d.run do
841
1033
  d.feed("filter.test", time, input)
842
1034
  end
843
1035
  expected = {
844
- "timestamp" => 1538677347823,
845
- "log" => "some message",
846
- "stream" => "stdout",
847
- "docker" => {
848
- "container_id" => "5c280b6ad5abec32e9af729295c20f60fbeadf3ba16fda2d121f87228e6822e0",
849
- },
850
- "kubernetes" => {
851
- "container_name" => "log-format-labs",
852
- "namespace_name" => "default",
853
- "pod_name" => "log-format-labs-54575ccdb9-9d677",
854
- "pod_id" => "170af806-c801-11e8-9009-025000000001",
855
- "labels" => {
856
- "pod-template-hash" => "1013177865",
857
- "run" => "log-format-labs",
858
- },
859
- "annotations" => {
860
- "sumologic.com/sourceHost" => "foo",
861
- },
862
- "host" => "docker-for-desktop",
863
- "master_url" => "https =>//10.96.0.1 =>443/api",
864
- "namespace_id" => "e8572415-9596-11e8-b28b-025000000001",
865
- },
866
- "_sumo_metadata" => {
867
- :category => "kubernetes/default/log/format/labs",
868
- :host => "foo",
869
- :log_format => "json",
870
- :source => "default.log-format-labs-54575ccdb9-9d677.log-format-labs",
871
- },
1036
+ "timestamp" => 1538677347823,
1037
+ "log" => "some message",
1038
+ "stream" => "stdout",
1039
+ "docker" => {
1040
+ "container_id" => "5c280b6ad5abec32e9af729295c20f60fbeadf3ba16fda2d121f87228e6822e0",
1041
+ },
1042
+ "kubernetes" => {
1043
+ "container_name" => "log-format-labs",
1044
+ "namespace_name" => "default",
1045
+ "pod_name" => "log-format-labs-54575ccdb9-9d677",
1046
+ "pod_id" => "170af806-c801-11e8-9009-025000000001",
1047
+ "labels" => {
1048
+ "pod-template-hash" => "1013177865",
1049
+ "run" => "log-format-labs",
1050
+ },
1051
+ "annotations" => {
1052
+ "sumologic.com/sourceHost" => "foo",
1053
+ },
1054
+ "host" => "docker-for-desktop",
1055
+ "master_url" => "https =>//10.96.0.1 =>443/api",
1056
+ "namespace_id" => "e8572415-9596-11e8-b28b-025000000001",
1057
+ },
1058
+ "_sumo_metadata" => {
1059
+ :category => "kubernetes/default/log/format/labs",
1060
+ :host => "foo",
1061
+ :log_format => "json",
1062
+ :source => "default.log-format-labs-54575ccdb9-9d677.log-format-labs",
1063
+ },
872
1064
  }
873
1065
  assert_equal(1, d.filtered_records.size)
874
1066
  assert_equal(d.filtered_records[0], expected)
@@ -879,61 +1071,61 @@ class SumoContainerOutputTest < Test::Unit::TestCase
879
1071
  d = create_driver(conf)
880
1072
  time = @time
881
1073
  input = {
882
- "timestamp" => 1538677347823,
883
- "log" => "some message",
884
- "stream" => "stdout",
885
- "docker" => {
886
- "container_id" => "5c280b6ad5abec32e9af729295c20f60fbeadf3ba16fda2d121f87228e6822e0",
887
- },
888
- "kubernetes" => {
889
- "container_name" => "log-format-labs",
890
- "namespace_name" => "default",
891
- "pod_name" => "log-format-labs-54575ccdb9-9d677",
892
- "pod_id" => "170af806-c801-11e8-9009-025000000001",
893
- "labels" => {
894
- "pod-template-hash" => "1013177865",
895
- "run" => "log-format-labs",
896
- },
897
- "annotations" => {
898
- "sumologic.com/sourceName" => "foo",
899
- },
900
- "host" => "docker-for-desktop",
901
- "master_url" => "https =>//10.96.0.1 =>443/api",
902
- "namespace_id" => "e8572415-9596-11e8-b28b-025000000001",
903
- },
1074
+ "timestamp" => 1538677347823,
1075
+ "log" => "some message",
1076
+ "stream" => "stdout",
1077
+ "docker" => {
1078
+ "container_id" => "5c280b6ad5abec32e9af729295c20f60fbeadf3ba16fda2d121f87228e6822e0",
1079
+ },
1080
+ "kubernetes" => {
1081
+ "container_name" => "log-format-labs",
1082
+ "namespace_name" => "default",
1083
+ "pod_name" => "log-format-labs-54575ccdb9-9d677",
1084
+ "pod_id" => "170af806-c801-11e8-9009-025000000001",
1085
+ "labels" => {
1086
+ "pod-template-hash" => "1013177865",
1087
+ "run" => "log-format-labs",
1088
+ },
1089
+ "annotations" => {
1090
+ "sumologic.com/sourceName" => "foo",
1091
+ },
1092
+ "host" => "docker-for-desktop",
1093
+ "master_url" => "https =>//10.96.0.1 =>443/api",
1094
+ "namespace_id" => "e8572415-9596-11e8-b28b-025000000001",
1095
+ },
904
1096
  }
905
1097
  d.run do
906
1098
  d.feed("filter.test", time, input)
907
1099
  end
908
1100
  expected = {
909
- "timestamp" => 1538677347823,
910
- "log" => "some message",
911
- "stream" => "stdout",
912
- "docker" => {
913
- "container_id" => "5c280b6ad5abec32e9af729295c20f60fbeadf3ba16fda2d121f87228e6822e0",
914
- },
915
- "kubernetes" => {
916
- "container_name" => "log-format-labs",
917
- "namespace_name" => "default",
918
- "pod_name" => "log-format-labs-54575ccdb9-9d677",
919
- "pod_id" => "170af806-c801-11e8-9009-025000000001",
920
- "labels" => {
921
- "pod-template-hash" => "1013177865",
922
- "run" => "log-format-labs",
923
- },
924
- "annotations" => {
925
- "sumologic.com/sourceName" => "foo",
926
- },
927
- "host" => "docker-for-desktop",
928
- "master_url" => "https =>//10.96.0.1 =>443/api",
929
- "namespace_id" => "e8572415-9596-11e8-b28b-025000000001",
930
- },
931
- "_sumo_metadata" => {
932
- :category => "kubernetes/default/log/format/labs",
933
- :host => "",
934
- :log_format => "json",
935
- :source => "foo",
936
- },
1101
+ "timestamp" => 1538677347823,
1102
+ "log" => "some message",
1103
+ "stream" => "stdout",
1104
+ "docker" => {
1105
+ "container_id" => "5c280b6ad5abec32e9af729295c20f60fbeadf3ba16fda2d121f87228e6822e0",
1106
+ },
1107
+ "kubernetes" => {
1108
+ "container_name" => "log-format-labs",
1109
+ "namespace_name" => "default",
1110
+ "pod_name" => "log-format-labs-54575ccdb9-9d677",
1111
+ "pod_id" => "170af806-c801-11e8-9009-025000000001",
1112
+ "labels" => {
1113
+ "pod-template-hash" => "1013177865",
1114
+ "run" => "log-format-labs",
1115
+ },
1116
+ "annotations" => {
1117
+ "sumologic.com/sourceName" => "foo",
1118
+ },
1119
+ "host" => "docker-for-desktop",
1120
+ "master_url" => "https =>//10.96.0.1 =>443/api",
1121
+ "namespace_id" => "e8572415-9596-11e8-b28b-025000000001",
1122
+ },
1123
+ "_sumo_metadata" => {
1124
+ :category => "kubernetes/default/log/format/labs",
1125
+ :host => "",
1126
+ :log_format => "json",
1127
+ :source => "foo",
1128
+ },
937
1129
  }
938
1130
  assert_equal(1, d.filtered_records.size)
939
1131
  assert_equal(d.filtered_records[0], expected)
@@ -944,61 +1136,61 @@ class SumoContainerOutputTest < Test::Unit::TestCase
944
1136
  d = create_driver(conf)
945
1137
  time = @time
946
1138
  input = {
947
- "timestamp" => 1538677347823,
948
- "log" => "some message",
949
- "stream" => "stdout",
950
- "docker" => {
951
- "container_id" => "5c280b6ad5abec32e9af729295c20f60fbeadf3ba16fda2d121f87228e6822e0",
952
- },
953
- "kubernetes" => {
954
- "container_name" => "log-format-labs",
955
- "namespace_name" => "default",
956
- "pod_name" => "log-format-labs-54575ccdb9-9d677",
957
- "pod_id" => "170af806-c801-11e8-9009-025000000001",
958
- "labels" => {
959
- "pod-template-hash" => "1013177865",
960
- "run" => "log-format-labs",
961
- },
962
- "annotations" => {
963
- "sumologic.com/sourceCategory" => "foo",
964
- },
965
- "host" => "docker-for-desktop",
966
- "master_url" => "https =>//10.96.0.1 =>443/api",
967
- "namespace_id" => "e8572415-9596-11e8-b28b-025000000001",
968
- },
1139
+ "timestamp" => 1538677347823,
1140
+ "log" => "some message",
1141
+ "stream" => "stdout",
1142
+ "docker" => {
1143
+ "container_id" => "5c280b6ad5abec32e9af729295c20f60fbeadf3ba16fda2d121f87228e6822e0",
1144
+ },
1145
+ "kubernetes" => {
1146
+ "container_name" => "log-format-labs",
1147
+ "namespace_name" => "default",
1148
+ "pod_name" => "log-format-labs-54575ccdb9-9d677",
1149
+ "pod_id" => "170af806-c801-11e8-9009-025000000001",
1150
+ "labels" => {
1151
+ "pod-template-hash" => "1013177865",
1152
+ "run" => "log-format-labs",
1153
+ },
1154
+ "annotations" => {
1155
+ "sumologic.com/sourceCategory" => "foo",
1156
+ },
1157
+ "host" => "docker-for-desktop",
1158
+ "master_url" => "https =>//10.96.0.1 =>443/api",
1159
+ "namespace_id" => "e8572415-9596-11e8-b28b-025000000001",
1160
+ },
969
1161
  }
970
1162
  d.run do
971
1163
  d.feed("filter.test", time, input)
972
1164
  end
973
1165
  expected = {
974
- "timestamp" => 1538677347823,
975
- "log" => "some message",
976
- "stream" => "stdout",
977
- "docker" => {
978
- "container_id" => "5c280b6ad5abec32e9af729295c20f60fbeadf3ba16fda2d121f87228e6822e0",
979
- },
980
- "kubernetes" => {
981
- "container_name" => "log-format-labs",
982
- "namespace_name" => "default",
983
- "pod_name" => "log-format-labs-54575ccdb9-9d677",
984
- "pod_id" => "170af806-c801-11e8-9009-025000000001",
985
- "labels" => {
986
- "pod-template-hash" => "1013177865",
987
- "run" => "log-format-labs",
988
- },
989
- "annotations" => {
990
- "sumologic.com/sourceCategory" => "foo",
991
- },
992
- "host" => "docker-for-desktop",
993
- "master_url" => "https =>//10.96.0.1 =>443/api",
994
- "namespace_id" => "e8572415-9596-11e8-b28b-025000000001",
995
- },
996
- "_sumo_metadata" => {
997
- :category => "kubernetes/foo",
998
- :host => "",
999
- :log_format => "json",
1000
- :source => "default.log-format-labs-54575ccdb9-9d677.log-format-labs",
1001
- },
1166
+ "timestamp" => 1538677347823,
1167
+ "log" => "some message",
1168
+ "stream" => "stdout",
1169
+ "docker" => {
1170
+ "container_id" => "5c280b6ad5abec32e9af729295c20f60fbeadf3ba16fda2d121f87228e6822e0",
1171
+ },
1172
+ "kubernetes" => {
1173
+ "container_name" => "log-format-labs",
1174
+ "namespace_name" => "default",
1175
+ "pod_name" => "log-format-labs-54575ccdb9-9d677",
1176
+ "pod_id" => "170af806-c801-11e8-9009-025000000001",
1177
+ "labels" => {
1178
+ "pod-template-hash" => "1013177865",
1179
+ "run" => "log-format-labs",
1180
+ },
1181
+ "annotations" => {
1182
+ "sumologic.com/sourceCategory" => "foo",
1183
+ },
1184
+ "host" => "docker-for-desktop",
1185
+ "master_url" => "https =>//10.96.0.1 =>443/api",
1186
+ "namespace_id" => "e8572415-9596-11e8-b28b-025000000001",
1187
+ },
1188
+ "_sumo_metadata" => {
1189
+ :category => "kubernetes/foo",
1190
+ :host => "",
1191
+ :log_format => "json",
1192
+ :source => "default.log-format-labs-54575ccdb9-9d677.log-format-labs",
1193
+ },
1002
1194
  }
1003
1195
  assert_equal(1, d.filtered_records.size)
1004
1196
  assert_equal(d.filtered_records[0], expected)
@@ -1011,116 +1203,116 @@ class SumoContainerOutputTest < Test::Unit::TestCase
1011
1203
  d = create_driver(conf)
1012
1204
  time = @time
1013
1205
  input = {
1014
- "timestamp" => 1538677347823,
1015
- "log" => "some message",
1016
- "stream" => "stdout",
1017
- "docker" => {
1018
- "container_id" => "5c280b6ad5abec32e9af729295c20f60fbeadf3ba16fda2d121f87228e6822e0",
1019
- },
1020
- "kubernetes" => {
1021
- "container_name" => "log-format-labs",
1022
- "namespace_name" => "default",
1023
- "pod_name" => "log-format-labs-54575ccdb9-9d677",
1024
- "pod_id" => "170af806-c801-11e8-9009-025000000001",
1025
- "labels" => {
1026
- "pod-template-hash" => "1013177865",
1027
- "run" => "log-format-labs",
1028
- },
1029
- "host" => "docker-for-desktop",
1030
- "master_url" => "https =>//10.96.0.1 =>443/api",
1031
- "namespace_id" => "e8572415-9596-11e8-b28b-025000000001",
1032
- },
1033
- }
1034
- d.run do
1035
- d.feed("filter.test", time, input)
1036
- end
1037
- expected = {
1038
- "timestamp" => 1538677347823,
1039
- "log" => "some message",
1040
- "stream" => "stdout",
1041
- "docker" => {
1042
- "container_id" => "5c280b6ad5abec32e9af729295c20f60fbeadf3ba16fda2d121f87228e6822e0",
1043
- },
1044
- "kubernetes" => {
1045
- "container_name" => "log-format-labs",
1046
- "namespace_name" => "default",
1047
- "pod_name" => "log-format-labs-54575ccdb9-9d677",
1048
- "pod_id" => "170af806-c801-11e8-9009-025000000001",
1049
- "labels" => {
1050
- "pod-template-hash" => "1013177865",
1051
- "run" => "log-format-labs",
1052
- },
1053
- "host" => "docker-for-desktop",
1054
- "master_url" => "https =>//10.96.0.1 =>443/api",
1055
- "namespace_id" => "e8572415-9596-11e8-b28b-025000000001",
1056
- },
1057
- "_sumo_metadata" => {
1058
- :category => "kubernetes/default/log/format/labs/log/format/labs",
1059
- :host => "",
1060
- :log_format => "json",
1061
- :source => "default.log-format-labs-54575ccdb9-9d677.log-format-labs",
1062
- },
1063
- }
1064
- assert_equal(1, d.filtered_records.size)
1065
- assert_equal(d.filtered_records[0], expected)
1066
- end
1067
-
1068
- test "test_sourcehost_using_pod_id" do
1069
- conf = %{
1070
- source_host %{pod_id}
1071
- }
1072
- d = create_driver(conf)
1073
- time = @time
1074
- input = {
1075
- "timestamp" => 1538677347823,
1076
- "log" => "some message",
1077
- "stream" => "stdout",
1078
- "docker" => {
1079
- "container_id" => "5c280b6ad5abec32e9af729295c20f60fbeadf3ba16fda2d121f87228e6822e0",
1080
- },
1081
- "kubernetes" => {
1082
- "container_name" => "log-format-labs",
1083
- "namespace_name" => "default",
1084
- "pod_name" => "log-format-labs-54575ccdb9-9d677",
1085
- "pod_id" => "170af806-c801-11e8-9009-025000000001",
1086
- "labels" => {
1087
- "pod-template-hash" => "1013177865",
1088
- "run" => "log-format-labs",
1089
- },
1090
- "host" => "docker-for-desktop",
1091
- "master_url" => "https =>//10.96.0.1 =>443/api",
1092
- "namespace_id" => "e8572415-9596-11e8-b28b-025000000001",
1093
- },
1094
- }
1206
+ "timestamp" => 1538677347823,
1207
+ "log" => "some message",
1208
+ "stream" => "stdout",
1209
+ "docker" => {
1210
+ "container_id" => "5c280b6ad5abec32e9af729295c20f60fbeadf3ba16fda2d121f87228e6822e0",
1211
+ },
1212
+ "kubernetes" => {
1213
+ "container_name" => "log-format-labs",
1214
+ "namespace_name" => "default",
1215
+ "pod_name" => "log-format-labs-54575ccdb9-9d677",
1216
+ "pod_id" => "170af806-c801-11e8-9009-025000000001",
1217
+ "labels" => {
1218
+ "pod-template-hash" => "1013177865",
1219
+ "run" => "log-format-labs",
1220
+ },
1221
+ "host" => "docker-for-desktop",
1222
+ "master_url" => "https =>//10.96.0.1 =>443/api",
1223
+ "namespace_id" => "e8572415-9596-11e8-b28b-025000000001",
1224
+ },
1225
+ }
1226
+ d.run do
1227
+ d.feed("filter.test", time, input)
1228
+ end
1229
+ expected = {
1230
+ "timestamp" => 1538677347823,
1231
+ "log" => "some message",
1232
+ "stream" => "stdout",
1233
+ "docker" => {
1234
+ "container_id" => "5c280b6ad5abec32e9af729295c20f60fbeadf3ba16fda2d121f87228e6822e0",
1235
+ },
1236
+ "kubernetes" => {
1237
+ "container_name" => "log-format-labs",
1238
+ "namespace_name" => "default",
1239
+ "pod_name" => "log-format-labs-54575ccdb9-9d677",
1240
+ "pod_id" => "170af806-c801-11e8-9009-025000000001",
1241
+ "labels" => {
1242
+ "pod-template-hash" => "1013177865",
1243
+ "run" => "log-format-labs",
1244
+ },
1245
+ "host" => "docker-for-desktop",
1246
+ "master_url" => "https =>//10.96.0.1 =>443/api",
1247
+ "namespace_id" => "e8572415-9596-11e8-b28b-025000000001",
1248
+ },
1249
+ "_sumo_metadata" => {
1250
+ :category => "kubernetes/default/log/format/labs/log/format/labs",
1251
+ :host => "",
1252
+ :log_format => "json",
1253
+ :source => "default.log-format-labs-54575ccdb9-9d677.log-format-labs",
1254
+ },
1255
+ }
1256
+ assert_equal(1, d.filtered_records.size)
1257
+ assert_equal(d.filtered_records[0], expected)
1258
+ end
1259
+
1260
+ test "test_sourcehost_using_pod_id" do
1261
+ conf = %{
1262
+ source_host %{pod_id}
1263
+ }
1264
+ d = create_driver(conf)
1265
+ time = @time
1266
+ input = {
1267
+ "timestamp" => 1538677347823,
1268
+ "log" => "some message",
1269
+ "stream" => "stdout",
1270
+ "docker" => {
1271
+ "container_id" => "5c280b6ad5abec32e9af729295c20f60fbeadf3ba16fda2d121f87228e6822e0",
1272
+ },
1273
+ "kubernetes" => {
1274
+ "container_name" => "log-format-labs",
1275
+ "namespace_name" => "default",
1276
+ "pod_name" => "log-format-labs-54575ccdb9-9d677",
1277
+ "pod_id" => "170af806-c801-11e8-9009-025000000001",
1278
+ "labels" => {
1279
+ "pod-template-hash" => "1013177865",
1280
+ "run" => "log-format-labs",
1281
+ },
1282
+ "host" => "docker-for-desktop",
1283
+ "master_url" => "https =>//10.96.0.1 =>443/api",
1284
+ "namespace_id" => "e8572415-9596-11e8-b28b-025000000001",
1285
+ },
1286
+ }
1095
1287
  d.run do
1096
1288
  d.feed("filter.test", time, input)
1097
1289
  end
1098
1290
  expected = {
1099
- "timestamp" => 1538677347823,
1100
- "log" => "some message",
1101
- "stream" => "stdout",
1102
- "docker" => {
1103
- "container_id" => "5c280b6ad5abec32e9af729295c20f60fbeadf3ba16fda2d121f87228e6822e0",
1104
- },
1105
- "kubernetes" => {
1106
- "container_name" => "log-format-labs",
1107
- "namespace_name" => "default",
1108
- "pod_name" => "log-format-labs-54575ccdb9-9d677",
1109
- "pod_id" => "170af806-c801-11e8-9009-025000000001",
1110
- "labels" => {
1111
- "pod-template-hash" => "1013177865",
1112
- "run" => "log-format-labs",
1113
- },
1114
- "host" => "docker-for-desktop",
1115
- "master_url" => "https =>//10.96.0.1 =>443/api",
1116
- "namespace_id" => "e8572415-9596-11e8-b28b-025000000001",
1117
- },
1118
- "_sumo_metadata" => {
1119
- :category => "kubernetes/default/log/format/labs",
1120
- :host => "170af806-c801-11e8-9009-025000000001",
1121
- :log_format => "json",
1122
- :source => "default.log-format-labs-54575ccdb9-9d677.log-format-labs",
1123
- },
1291
+ "timestamp" => 1538677347823,
1292
+ "log" => "some message",
1293
+ "stream" => "stdout",
1294
+ "docker" => {
1295
+ "container_id" => "5c280b6ad5abec32e9af729295c20f60fbeadf3ba16fda2d121f87228e6822e0",
1296
+ },
1297
+ "kubernetes" => {
1298
+ "container_name" => "log-format-labs",
1299
+ "namespace_name" => "default",
1300
+ "pod_name" => "log-format-labs-54575ccdb9-9d677",
1301
+ "pod_id" => "170af806-c801-11e8-9009-025000000001",
1302
+ "labels" => {
1303
+ "pod-template-hash" => "1013177865",
1304
+ "run" => "log-format-labs",
1305
+ },
1306
+ "host" => "docker-for-desktop",
1307
+ "master_url" => "https =>//10.96.0.1 =>443/api",
1308
+ "namespace_id" => "e8572415-9596-11e8-b28b-025000000001",
1309
+ },
1310
+ "_sumo_metadata" => {
1311
+ :category => "kubernetes/default/log/format/labs",
1312
+ :host => "170af806-c801-11e8-9009-025000000001",
1313
+ :log_format => "json",
1314
+ :source => "default.log-format-labs-54575ccdb9-9d677.log-format-labs",
1315
+ },
1124
1316
  }
1125
1317
  assert_equal(1, d.filtered_records.size)
1126
1318
  assert_equal(d.filtered_records[0], expected)
@@ -1133,55 +1325,55 @@ class SumoContainerOutputTest < Test::Unit::TestCase
1133
1325
  d = create_driver(conf)
1134
1326
  time = @time
1135
1327
  input = {
1136
- "timestamp" => 1538677347823,
1137
- "log" => "some message",
1138
- "stream" => "stdout",
1139
- "docker" => {
1140
- "container_id" => "5c280b6ad5abec32e9af729295c20f60fbeadf3ba16fda2d121f87228e6822e0",
1141
- },
1142
- "kubernetes" => {
1143
- "container_name" => "log-format-labs",
1144
- "namespace_name" => "default",
1145
- "pod_name" => "log-format-labs-54575ccdb9-9d677",
1146
- "pod_id" => "170af806-c801-11e8-9009-025000000001",
1147
- "labels" => {
1148
- "pod-template-hash" => "1013177865",
1149
- "run" => "log-format-labs",
1150
- },
1151
- "host" => "docker-for-desktop",
1152
- "master_url" => "https =>//10.96.0.1 =>443/api",
1153
- "namespace_id" => "e8572415-9596-11e8-b28b-025000000001",
1154
- },
1328
+ "timestamp" => 1538677347823,
1329
+ "log" => "some message",
1330
+ "stream" => "stdout",
1331
+ "docker" => {
1332
+ "container_id" => "5c280b6ad5abec32e9af729295c20f60fbeadf3ba16fda2d121f87228e6822e0",
1333
+ },
1334
+ "kubernetes" => {
1335
+ "container_name" => "log-format-labs",
1336
+ "namespace_name" => "default",
1337
+ "pod_name" => "log-format-labs-54575ccdb9-9d677",
1338
+ "pod_id" => "170af806-c801-11e8-9009-025000000001",
1339
+ "labels" => {
1340
+ "pod-template-hash" => "1013177865",
1341
+ "run" => "log-format-labs",
1342
+ },
1343
+ "host" => "docker-for-desktop",
1344
+ "master_url" => "https =>//10.96.0.1 =>443/api",
1345
+ "namespace_id" => "e8572415-9596-11e8-b28b-025000000001",
1346
+ },
1155
1347
  }
1156
1348
  d.run do
1157
1349
  d.feed("filter.test", time, input)
1158
1350
  end
1159
1351
  expected = {
1160
- "timestamp" => 1538677347823,
1161
- "log" => "some message",
1162
- "stream" => "stdout",
1163
- "docker" => {
1164
- "container_id" => "5c280b6ad5abec32e9af729295c20f60fbeadf3ba16fda2d121f87228e6822e0",
1165
- },
1166
- "kubernetes" => {
1167
- "container_name" => "log-format-labs",
1168
- "namespace_name" => "default",
1169
- "pod_name" => "log-format-labs-54575ccdb9-9d677",
1170
- "pod_id" => "170af806-c801-11e8-9009-025000000001",
1171
- "labels" => {
1172
- "pod-template-hash" => "1013177865",
1173
- "run" => "log-format-labs",
1174
- },
1175
- "host" => "docker-for-desktop",
1176
- "master_url" => "https =>//10.96.0.1 =>443/api",
1177
- "namespace_id" => "e8572415-9596-11e8-b28b-025000000001",
1178
- },
1179
- "_sumo_metadata" => {
1180
- :category => "kubernetes/default/log/format/labs/undefined",
1181
- :host => "",
1182
- :log_format => "json",
1183
- :source => "default.log-format-labs-54575ccdb9-9d677.log-format-labs",
1184
- },
1352
+ "timestamp" => 1538677347823,
1353
+ "log" => "some message",
1354
+ "stream" => "stdout",
1355
+ "docker" => {
1356
+ "container_id" => "5c280b6ad5abec32e9af729295c20f60fbeadf3ba16fda2d121f87228e6822e0",
1357
+ },
1358
+ "kubernetes" => {
1359
+ "container_name" => "log-format-labs",
1360
+ "namespace_name" => "default",
1361
+ "pod_name" => "log-format-labs-54575ccdb9-9d677",
1362
+ "pod_id" => "170af806-c801-11e8-9009-025000000001",
1363
+ "labels" => {
1364
+ "pod-template-hash" => "1013177865",
1365
+ "run" => "log-format-labs",
1366
+ },
1367
+ "host" => "docker-for-desktop",
1368
+ "master_url" => "https =>//10.96.0.1 =>443/api",
1369
+ "namespace_id" => "e8572415-9596-11e8-b28b-025000000001",
1370
+ },
1371
+ "_sumo_metadata" => {
1372
+ :category => "kubernetes/default/log/format/labs/undefined",
1373
+ :host => "",
1374
+ :log_format => "json",
1375
+ :source => "default.log-format-labs-54575ccdb9-9d677.log-format-labs",
1376
+ },
1185
1377
  }
1186
1378
  assert_equal(1, d.filtered_records.size)
1187
1379
  assert_equal(d.filtered_records[0], expected)
@@ -1240,55 +1432,55 @@ class SumoContainerOutputTest < Test::Unit::TestCase
1240
1432
  d = create_driver(conf)
1241
1433
  time = @time
1242
1434
  input = {
1243
- "timestamp" => 1538677347823,
1244
- "log" => "some message",
1245
- "stream" => "stdout",
1246
- "docker" => {
1247
- "container_id" => "5c280b6ad5abec32e9af729295c20f60fbeadf3ba16fda2d121f87228e6822e0",
1248
- },
1249
- "kubernetes" => {
1250
- "container_name" => "log-format-labs",
1251
- "namespace_name" => "default",
1252
- "pod_name" => "log-format-labs-1013177865-9d677",
1253
- "pod_id" => "170af806-c801-11e8-9009-025000000001",
1254
- "labels" => {
1255
- "pod-template-hash" => "1013177865",
1256
- "run" => "log-format-labs",
1257
- },
1258
- "host" => "docker-for-desktop",
1259
- "master_url" => "https =>//10.96.0.1 =>443/api",
1260
- "namespace_id" => "e8572415-9596-11e8-b28b-025000000001",
1261
- },
1435
+ "timestamp" => 1538677347823,
1436
+ "log" => "some message",
1437
+ "stream" => "stdout",
1438
+ "docker" => {
1439
+ "container_id" => "5c280b6ad5abec32e9af729295c20f60fbeadf3ba16fda2d121f87228e6822e0",
1440
+ },
1441
+ "kubernetes" => {
1442
+ "container_name" => "log-format-labs",
1443
+ "namespace_name" => "default",
1444
+ "pod_name" => "log-format-labs-1013177865-9d677",
1445
+ "pod_id" => "170af806-c801-11e8-9009-025000000001",
1446
+ "labels" => {
1447
+ "pod-template-hash" => "1013177865",
1448
+ "run" => "log-format-labs",
1449
+ },
1450
+ "host" => "docker-for-desktop",
1451
+ "master_url" => "https =>//10.96.0.1 =>443/api",
1452
+ "namespace_id" => "e8572415-9596-11e8-b28b-025000000001",
1453
+ },
1262
1454
  }
1263
1455
  d.run do
1264
1456
  d.feed("filter.test", time, input)
1265
1457
  end
1266
1458
  expected = {
1267
- "timestamp" => 1538677347823,
1268
- "log" => "some message",
1269
- "stream" => "stdout",
1270
- "docker" => {
1271
- "container_id" => "5c280b6ad5abec32e9af729295c20f60fbeadf3ba16fda2d121f87228e6822e0",
1272
- },
1273
- "kubernetes" => {
1274
- "container_name" => "log-format-labs",
1275
- "namespace_name" => "default",
1276
- "pod_name" => "log-format-labs-1013177865-9d677",
1277
- "pod_id" => "170af806-c801-11e8-9009-025000000001",
1278
- "labels" => {
1279
- "pod-template-hash" => "1013177865",
1280
- "run" => "log-format-labs",
1281
- },
1282
- "host" => "docker-for-desktop",
1283
- "master_url" => "https =>//10.96.0.1 =>443/api",
1284
- "namespace_id" => "e8572415-9596-11e8-b28b-025000000001",
1285
- },
1286
- "_sumo_metadata" => {
1287
- :category => "kubernetes/default/log/format/labs",
1288
- :host => "",
1289
- :log_format => "json",
1290
- :source => "default.log-format-labs-1013177865-9d677.log-format-labs",
1291
- },
1459
+ "timestamp" => 1538677347823,
1460
+ "log" => "some message",
1461
+ "stream" => "stdout",
1462
+ "docker" => {
1463
+ "container_id" => "5c280b6ad5abec32e9af729295c20f60fbeadf3ba16fda2d121f87228e6822e0",
1464
+ },
1465
+ "kubernetes" => {
1466
+ "container_name" => "log-format-labs",
1467
+ "namespace_name" => "default",
1468
+ "pod_name" => "log-format-labs-1013177865-9d677",
1469
+ "pod_id" => "170af806-c801-11e8-9009-025000000001",
1470
+ "labels" => {
1471
+ "pod-template-hash" => "1013177865",
1472
+ "run" => "log-format-labs",
1473
+ },
1474
+ "host" => "docker-for-desktop",
1475
+ "master_url" => "https =>//10.96.0.1 =>443/api",
1476
+ "namespace_id" => "e8572415-9596-11e8-b28b-025000000001",
1477
+ },
1478
+ "_sumo_metadata" => {
1479
+ :category => "kubernetes/default/log/format/labs",
1480
+ :host => "",
1481
+ :log_format => "json",
1482
+ :source => "default.log-format-labs-1013177865-9d677.log-format-labs",
1483
+ },
1292
1484
  }
1293
1485
  assert_equal(1, d.filtered_records.size)
1294
1486
  assert_equal(d.filtered_records[0], expected)
@@ -1299,55 +1491,55 @@ class SumoContainerOutputTest < Test::Unit::TestCase
1299
1491
  d = create_driver(conf)
1300
1492
  time = @time
1301
1493
  input = {
1302
- "timestamp" => 1538677347823,
1303
- "log" => "some message",
1304
- "stream" => "stdout",
1305
- "docker" => {
1306
- "container_id" => "5c280b6ad5abec32e9af729295c20f60fbeadf3ba16fda2d121f87228e6822e0",
1307
- },
1308
- "kubernetes" => {
1309
- "container_name" => "log-format-labs",
1310
- "namespace_name" => "default",
1311
- "pod_name" => "log-format-labs-54575ccdb9-9d677",
1312
- "pod_id" => "170af806-c801-11e8-9009-025000000001",
1313
- "labels" => {
1314
- "pod-template-hash" => "1013177865",
1315
- "run" => "log-format-labs",
1316
- },
1317
- "host" => "docker-for-desktop",
1318
- "master_url" => "https =>//10.96.0.1 =>443/api",
1319
- "namespace_id" => "e8572415-9596-11e8-b28b-025000000001",
1320
- },
1494
+ "timestamp" => 1538677347823,
1495
+ "log" => "some message",
1496
+ "stream" => "stdout",
1497
+ "docker" => {
1498
+ "container_id" => "5c280b6ad5abec32e9af729295c20f60fbeadf3ba16fda2d121f87228e6822e0",
1499
+ },
1500
+ "kubernetes" => {
1501
+ "container_name" => "log-format-labs",
1502
+ "namespace_name" => "default",
1503
+ "pod_name" => "log-format-labs-54575ccdb9-9d677",
1504
+ "pod_id" => "170af806-c801-11e8-9009-025000000001",
1505
+ "labels" => {
1506
+ "pod-template-hash" => "1013177865",
1507
+ "run" => "log-format-labs",
1508
+ },
1509
+ "host" => "docker-for-desktop",
1510
+ "master_url" => "https =>//10.96.0.1 =>443/api",
1511
+ "namespace_id" => "e8572415-9596-11e8-b28b-025000000001",
1512
+ },
1321
1513
  }
1322
1514
  d.run do
1323
1515
  d.feed("filter.test", time, input)
1324
1516
  end
1325
1517
  expected = {
1326
- "timestamp" => 1538677347823,
1327
- "log" => "some message",
1328
- "stream" => "stdout",
1329
- "docker" => {
1330
- "container_id" => "5c280b6ad5abec32e9af729295c20f60fbeadf3ba16fda2d121f87228e6822e0",
1331
- },
1332
- "kubernetes" => {
1333
- "container_name" => "log-format-labs",
1334
- "namespace_name" => "default",
1335
- "pod_name" => "log-format-labs-54575ccdb9-9d677",
1336
- "pod_id" => "170af806-c801-11e8-9009-025000000001",
1337
- "labels" => {
1338
- "pod-template-hash" => "1013177865",
1339
- "run" => "log-format-labs",
1340
- },
1341
- "host" => "docker-for-desktop",
1342
- "master_url" => "https =>//10.96.0.1 =>443/api",
1343
- "namespace_id" => "e8572415-9596-11e8-b28b-025000000001",
1344
- },
1345
- "_sumo_metadata" => {
1346
- :category => "kubernetes/default/log/format/labs",
1347
- :host => "",
1348
- :log_format => "json",
1349
- :source => "default.log-format-labs-54575ccdb9-9d677.log-format-labs",
1350
- },
1518
+ "timestamp" => 1538677347823,
1519
+ "log" => "some message",
1520
+ "stream" => "stdout",
1521
+ "docker" => {
1522
+ "container_id" => "5c280b6ad5abec32e9af729295c20f60fbeadf3ba16fda2d121f87228e6822e0",
1523
+ },
1524
+ "kubernetes" => {
1525
+ "container_name" => "log-format-labs",
1526
+ "namespace_name" => "default",
1527
+ "pod_name" => "log-format-labs-54575ccdb9-9d677",
1528
+ "pod_id" => "170af806-c801-11e8-9009-025000000001",
1529
+ "labels" => {
1530
+ "pod-template-hash" => "1013177865",
1531
+ "run" => "log-format-labs",
1532
+ },
1533
+ "host" => "docker-for-desktop",
1534
+ "master_url" => "https =>//10.96.0.1 =>443/api",
1535
+ "namespace_id" => "e8572415-9596-11e8-b28b-025000000001",
1536
+ },
1537
+ "_sumo_metadata" => {
1538
+ :category => "kubernetes/default/log/format/labs",
1539
+ :host => "",
1540
+ :log_format => "json",
1541
+ :source => "default.log-format-labs-54575ccdb9-9d677.log-format-labs",
1542
+ },
1351
1543
  }
1352
1544
  assert_equal(1, d.filtered_records.size)
1353
1545
  assert_equal(d.filtered_records[0], expected)
@@ -1358,55 +1550,55 @@ class SumoContainerOutputTest < Test::Unit::TestCase
1358
1550
  d = create_driver(conf)
1359
1551
  time = @time
1360
1552
  input = {
1361
- "timestamp" => 1538677347823,
1362
- "log" => "some message",
1363
- "stream" => "stdout",
1364
- "docker" => {
1365
- "container_id" => "5c280b6ad5abec32e9af729295c20f60fbeadf3ba16fda2d121f87228e6822e0",
1366
- },
1367
- "kubernetes" => {
1368
- "container_name" => "log-format-labs",
1369
- "namespace_name" => "default",
1370
- "pod_name" => "log-format-labs-54575ccdb9-9d677",
1371
- "pod_id" => "170af806-c801-11e8-9009-025000000001",
1372
- "labels" => {
1373
- "pod-template-hash" => "54575ccdb9",
1374
- "run" => "log-format-labs",
1375
- },
1376
- "host" => "docker-for-desktop",
1377
- "master_url" => "https =>//10.96.0.1 =>443/api",
1378
- "namespace_id" => "e8572415-9596-11e8-b28b-025000000001",
1379
- },
1553
+ "timestamp" => 1538677347823,
1554
+ "log" => "some message",
1555
+ "stream" => "stdout",
1556
+ "docker" => {
1557
+ "container_id" => "5c280b6ad5abec32e9af729295c20f60fbeadf3ba16fda2d121f87228e6822e0",
1558
+ },
1559
+ "kubernetes" => {
1560
+ "container_name" => "log-format-labs",
1561
+ "namespace_name" => "default",
1562
+ "pod_name" => "log-format-labs-54575ccdb9-9d677",
1563
+ "pod_id" => "170af806-c801-11e8-9009-025000000001",
1564
+ "labels" => {
1565
+ "pod-template-hash" => "54575ccdb9",
1566
+ "run" => "log-format-labs",
1567
+ },
1568
+ "host" => "docker-for-desktop",
1569
+ "master_url" => "https =>//10.96.0.1 =>443/api",
1570
+ "namespace_id" => "e8572415-9596-11e8-b28b-025000000001",
1571
+ },
1380
1572
  }
1381
1573
  d.run do
1382
1574
  d.feed("filter.test", time, input)
1383
1575
  end
1384
1576
  expected = {
1385
- "timestamp" => 1538677347823,
1386
- "log" => "some message",
1387
- "stream" => "stdout",
1388
- "docker" => {
1389
- "container_id" => "5c280b6ad5abec32e9af729295c20f60fbeadf3ba16fda2d121f87228e6822e0",
1390
- },
1391
- "kubernetes" => {
1392
- "container_name" => "log-format-labs",
1393
- "namespace_name" => "default",
1394
- "pod_name" => "log-format-labs-54575ccdb9-9d677",
1395
- "pod_id" => "170af806-c801-11e8-9009-025000000001",
1396
- "labels" => {
1397
- "pod-template-hash" => "54575ccdb9",
1398
- "run" => "log-format-labs",
1399
- },
1400
- "host" => "docker-for-desktop",
1401
- "master_url" => "https =>//10.96.0.1 =>443/api",
1402
- "namespace_id" => "e8572415-9596-11e8-b28b-025000000001",
1403
- },
1404
- "_sumo_metadata" => {
1405
- :category => "kubernetes/default/log/format/labs",
1406
- :host => "",
1407
- :log_format => "json",
1408
- :source => "default.log-format-labs-54575ccdb9-9d677.log-format-labs",
1409
- },
1577
+ "timestamp" => 1538677347823,
1578
+ "log" => "some message",
1579
+ "stream" => "stdout",
1580
+ "docker" => {
1581
+ "container_id" => "5c280b6ad5abec32e9af729295c20f60fbeadf3ba16fda2d121f87228e6822e0",
1582
+ },
1583
+ "kubernetes" => {
1584
+ "container_name" => "log-format-labs",
1585
+ "namespace_name" => "default",
1586
+ "pod_name" => "log-format-labs-54575ccdb9-9d677",
1587
+ "pod_id" => "170af806-c801-11e8-9009-025000000001",
1588
+ "labels" => {
1589
+ "pod-template-hash" => "54575ccdb9",
1590
+ "run" => "log-format-labs",
1591
+ },
1592
+ "host" => "docker-for-desktop",
1593
+ "master_url" => "https =>//10.96.0.1 =>443/api",
1594
+ "namespace_id" => "e8572415-9596-11e8-b28b-025000000001",
1595
+ },
1596
+ "_sumo_metadata" => {
1597
+ :category => "kubernetes/default/log/format/labs",
1598
+ :host => "",
1599
+ :log_format => "json",
1600
+ :source => "default.log-format-labs-54575ccdb9-9d677.log-format-labs",
1601
+ },
1410
1602
  }
1411
1603
  assert_equal(1, d.filtered_records.size)
1412
1604
  assert_equal(d.filtered_records[0], expected)
@@ -1417,57 +1609,57 @@ class SumoContainerOutputTest < Test::Unit::TestCase
1417
1609
  d = create_driver(conf)
1418
1610
  time = @time
1419
1611
  input = {
1420
- "timestamp" => 1538677347823,
1421
- "log" => "some message",
1422
- "stream" => "stdout",
1423
- "docker" => {
1424
- "container_id" => "5c280b6ad5abec32e9af729295c20f60fbeadf3ba16fda2d121f87228e6822e0",
1425
- },
1426
- "kubernetes" => {
1427
- "container_name" => "log-format-labs",
1428
- "namespace_name" => "default",
1429
- "pod_name" => "log-format-labs-53575ccdb9-9d677",
1430
- "pod_id" => "170af806-c801-11e8-9009-025000000001",
1431
- "labels" => {
1432
- "pod-template-hash" => "54575ccdb9",
1433
- "run" => "log-format-labs",
1434
- },
1435
- "host" => "docker-for-desktop",
1436
- "master_url" => "https =>//10.96.0.1 =>443/api",
1437
- "namespace_id" => "e8572415-9596-11e8-b28b-025000000001",
1438
- },
1612
+ "timestamp" => 1538677347823,
1613
+ "log" => "some message",
1614
+ "stream" => "stdout",
1615
+ "docker" => {
1616
+ "container_id" => "5c280b6ad5abec32e9af729295c20f60fbeadf3ba16fda2d121f87228e6822e0",
1617
+ },
1618
+ "kubernetes" => {
1619
+ "container_name" => "log-format-labs",
1620
+ "namespace_name" => "default",
1621
+ "pod_name" => "log-format-labs-53575ccdb9-9d677",
1622
+ "pod_id" => "170af806-c801-11e8-9009-025000000001",
1623
+ "labels" => {
1624
+ "pod-template-hash" => "54575ccdb9",
1625
+ "run" => "log-format-labs",
1626
+ },
1627
+ "host" => "docker-for-desktop",
1628
+ "master_url" => "https =>//10.96.0.1 =>443/api",
1629
+ "namespace_id" => "e8572415-9596-11e8-b28b-025000000001",
1630
+ },
1439
1631
  }
1440
1632
  d.run do
1441
1633
  d.feed("filter.test", time, input)
1442
1634
  end
1443
1635
  expected = {
1444
- "timestamp" => 1538677347823,
1445
- "log" => "some message",
1446
- "stream" => "stdout",
1447
- "docker" => {
1448
- "container_id" => "5c280b6ad5abec32e9af729295c20f60fbeadf3ba16fda2d121f87228e6822e0",
1449
- },
1450
- "kubernetes" => {
1451
- "container_name" => "log-format-labs",
1452
- "namespace_name" => "default",
1453
- "pod_name" => "log-format-labs-53575ccdb9-9d677",
1454
- "pod_id" => "170af806-c801-11e8-9009-025000000001",
1455
- "labels" => {
1456
- "pod-template-hash" => "54575ccdb9",
1457
- "run" => "log-format-labs",
1458
- },
1459
- "host" => "docker-for-desktop",
1460
- "master_url" => "https =>//10.96.0.1 =>443/api",
1461
- "namespace_id" => "e8572415-9596-11e8-b28b-025000000001",
1462
- },
1463
- "_sumo_metadata" => {
1464
- :category => "kubernetes/default/log/format/labs/53575ccdb9",
1465
- :host => "",
1466
- :log_format => "json",
1467
- :source => "default.log-format-labs-53575ccdb9-9d677.log-format-labs",
1468
- },
1636
+ "timestamp" => 1538677347823,
1637
+ "log" => "some message",
1638
+ "stream" => "stdout",
1639
+ "docker" => {
1640
+ "container_id" => "5c280b6ad5abec32e9af729295c20f60fbeadf3ba16fda2d121f87228e6822e0",
1641
+ },
1642
+ "kubernetes" => {
1643
+ "container_name" => "log-format-labs",
1644
+ "namespace_name" => "default",
1645
+ "pod_name" => "log-format-labs-53575ccdb9-9d677",
1646
+ "pod_id" => "170af806-c801-11e8-9009-025000000001",
1647
+ "labels" => {
1648
+ "pod-template-hash" => "54575ccdb9",
1649
+ "run" => "log-format-labs",
1650
+ },
1651
+ "host" => "docker-for-desktop",
1652
+ "master_url" => "https =>//10.96.0.1 =>443/api",
1653
+ "namespace_id" => "e8572415-9596-11e8-b28b-025000000001",
1654
+ },
1655
+ "_sumo_metadata" => {
1656
+ :category => "kubernetes/default/log/format/labs/53575ccdb9",
1657
+ :host => "",
1658
+ :log_format => "json",
1659
+ :source => "default.log-format-labs-53575ccdb9-9d677.log-format-labs",
1660
+ },
1469
1661
  }
1470
1662
  assert_equal(1, d.filtered_records.size)
1471
1663
  assert_equal(d.filtered_records[0], expected)
1472
1664
  end
1473
- end
1665
+ end