fluent-plugin-docker-format 0.1.0 → 0.2.3

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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: b01883397bc25c175beeb51f0dee5eeb0418eb83
4
- data.tar.gz: b0a4bc332d9c179b789e1392d30d9eee0a21d31c
3
+ metadata.gz: be57ce64c465076f7b7d55257907427b1506deb0
4
+ data.tar.gz: 68dafbc546852c7d49d599f058c31904646139a9
5
5
  SHA512:
6
- metadata.gz: c235243284c7146c68712b0be4f7f655903fea69113e4594818671c81835b76be9e0e4679b8b7b1a48ec7b93074f333ec706673d1e610aff63c1fa0700814b16
7
- data.tar.gz: 11915f2fd54669bf12cdab326b891076971bc404fe0abfcaadea1db0a404d22b756dd1c400a6a7d25af780331bec2d34e888df35fd6b15dc52d6c5f4b095b612
6
+ metadata.gz: 2089eafa6b6ebbfc6b89a24eaeb833da5c42a5e6588924642006c81eb69bf45952e483d0ac410466354933f30613b8473c4cb575edfcffb5536b93320c930ee4
7
+ data.tar.gz: b2ed8d1a59c9748c010719e76ce45f42f266f4a779c9fa06e098620141bb91395589188887c9d3bd03b3dbde9248d8f3f9bccb40580fce46f6133bbf521c86d5
data/README.md CHANGED
@@ -48,7 +48,7 @@ A full example:
48
48
  <match docker.var.lib.docker.containers.*.*.log>
49
49
  type docker_format
50
50
  container_id ${tag_parts[5]}
51
- tag docker.all
51
+ tag docker.${name}
52
52
  </match>
53
53
  ```
54
54
 
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.1.0
1
+ 0.2.3
@@ -14,7 +14,7 @@ module Fluent
14
14
 
15
15
  def emit(tag, es, chain)
16
16
  es.each do |time,record|
17
- Engine.emit(@tag, time, format_record(tag, record))
17
+ Engine.emit(interpolate_tag(tag), time, format_record(tag, record))
18
18
  end
19
19
 
20
20
  chain.next
@@ -28,12 +28,20 @@ module Fluent
28
28
  str.gsub(/\$\{tag_parts\[(\d+)\]\}/) { |m| tag_parts[$1.to_i] }
29
29
  end
30
30
 
31
+ def interpolate_tag(tag)
32
+ id = interpolate(tag, @container_id)
33
+ name = get_name(id)
34
+ name = name[1..-1] if name
35
+
36
+ @tag.gsub(/\$\{name\}/, name || id)
37
+ end
38
+
31
39
  def get_name_from_cfg(id)
32
40
  begin
33
41
  docker_cfg = JSON.parse(File.read("#{@docker_containers_path}/#{id}/config.json"))
34
42
  container_name = docker_cfg['Name']
35
43
  rescue
36
- container_name = "<unknown>"
44
+ container_name = nil
37
45
  end
38
46
  container_name
39
47
  end
@@ -46,7 +54,7 @@ module Fluent
46
54
  def format_record(tag, record)
47
55
  id = interpolate(tag, @container_id)
48
56
  record['container_id'] = id
49
- record['container_name'] = get_name(id)
57
+ record['container_name'] = get_name(id) || "<unknown>"
50
58
  record
51
59
  end
52
60
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: fluent-plugin-docker-format
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.0
4
+ version: 0.2.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Alex Hornung
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-12-23 00:00:00.000000000 Z
11
+ date: 2015-01-04 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler