fluent-plugin-specinfra_inventory 0.0.4 → 0.0.5

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: b0ea3ec07653d8b75cc0fe2e2e026cabc13227ae
4
- data.tar.gz: 09d802e09ea9bbac466b7be48be8e3982582a9b2
3
+ metadata.gz: ab4962abfc51a59a788743b26c55cc4a251e595f
4
+ data.tar.gz: e646b0dc5575f0ccc004eb2cfcbed549b9741f70
5
5
  SHA512:
6
- metadata.gz: ac83104cc0d6ab3f275fd4d45a96fcf975b61f5e1df91cee4197f029815b08ec69a68dc6a1d21e88ed1185d75a85e50c00f68040016c88184398c7c6bd97d532
7
- data.tar.gz: a03cc33c305456ee36781dc773efe07300bf7995b3e9caab0cfcdbcf8d48e4d43cdaa550f683722fbc4879072cfedba664745bd3da1b2acad335e32ccd85b54b
6
+ metadata.gz: 8fcb996c10c39e2e9c4f62b97f0e27b356bc27238fbb5b751c348aa10beeabdf8802a95eec3c3dfaa3f0a06e04e0498e4a05bc63c74350e754e7f628e8435095
7
+ data.tar.gz: 3addbd5f62a7af81d990e811bb0a0b24be7d39249513e7afa77fe70ca5e5805143b351ad336c6ff359226a852d5ea45c94e8e1adef6a6401e4162fd33feb9ccf
data/CHANGELOG.md CHANGED
@@ -1,3 +1,11 @@
1
+ ## 0.0.5
2
+
3
+ * Add combine option
4
+
5
+ ## 0.0.4
6
+
7
+ * Change record format
8
+
1
9
  ## 0.0.3
2
10
 
3
11
  * Bug fix
data/README.md CHANGED
@@ -27,6 +27,7 @@ Or install it yourself as:
27
27
  tag_prefix example.prefix
28
28
  backend exec
29
29
  inventory_keys ["cpu.total","memory"]
30
+ combine false
30
31
  family ubuntu
31
32
  release 14.04
32
33
  arch x86_64
@@ -51,11 +52,14 @@ default: `specinfra.inventory`
51
52
  Specinfra backend type.
52
53
  default: `exec`
53
54
 
54
-
55
55
  ### inventory_keys
56
56
  Key of Host Inventory.
57
57
  If you access the key on nested Hash, you should separated by `.`
58
58
 
59
+ ### combine
60
+ Combining values of `inventory_keys` to one record.
61
+ default: `true`
62
+
59
63
  ### family, release, arch
60
64
  See [Multi OS Support](http://serverspec.org/tutorial.html)
61
65
 
@@ -13,7 +13,8 @@ module Fluent
13
13
  config_param :ssh_user, :string, default: nil
14
14
  config_param :ssh_port, :integer, default: nil
15
15
  config_param :env, :hash, default: {}
16
- config_param :inventory_keys, :array
16
+ config_param :inventory_keys, :array, default: []
17
+ config_param :combine, :bool, default: true
17
18
 
18
19
  KEY_DELIMITER = "."
19
20
 
@@ -60,13 +61,30 @@ module Fluent
60
61
  def run
61
62
  loop do
62
63
  time = Engine.now
63
- @inventory_keys.each do |key|
64
- Engine.emit(tag(key), time, record(key))
64
+ if @combine
65
+ emit_combine_record(time)
66
+ else
67
+ emit_separate_record(time)
65
68
  end
66
69
  sleep @time_span
67
70
  end
68
71
  end
69
72
 
73
+ def emit_combine_record(time)
74
+ records = {}
75
+ @inventory_keys.each do |key|
76
+ records.merge!(record(key))
77
+ end
78
+ Engine.emit(@tag_prefix, time, records) if records.length > 0
79
+ end
80
+
81
+ def emit_separate_record(time)
82
+ time = Engine.now
83
+ @inventory_keys.each do |key|
84
+ Engine.emit(tag(key), time, record(key))
85
+ end
86
+ end
87
+
70
88
  def tag(key)
71
89
  "#{@tag_prefix}.#{key}"
72
90
  end
@@ -1,7 +1,7 @@
1
1
  module Fluent
2
2
  module Plugin
3
3
  module SpecinfraInventory
4
- VERSION = "0.0.4"
4
+ VERSION = "0.0.5"
5
5
  end
6
6
  end
7
7
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: fluent-plugin-specinfra_inventory
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.4
4
+ version: 0.0.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Masashi Terui
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-02-27 00:00:00.000000000 Z
11
+ date: 2015-03-02 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: fluentd