fluent-plugin-specinfra_inventory 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e40de8d848e26a71a26c212ed59acb2859137db3
-  data.tar.gz: 2d0e70c4e86e30311a606f38fd3e40374c84df82
+  metadata.gz: c35a9f933b74336ff3368f97af2aa0b395900ca5
+  data.tar.gz: 97e3626f3e103d249fb71c9d5372175cd63e1f25
 SHA512:
-  metadata.gz: 8b4287f1e14a392579eed53bed1d01e2255a0472bcf928b8a1f9c83fbdd4337d2e5b206778fe45409b46aacdf246378d4d50414cca081fa96cd842bf1fe91ed4
-  data.tar.gz: 782dae04b88ee21be1a72b401ef081697026eafb7afa0e2fc0357d6b8b5c527b16627329307f2b3242aae8ceb3963c04dace48448e842f66ef488d75a618eed3
+  metadata.gz: b60860e63defc7b0768512ffc7c076e9df51b71f64a5751a23871efe4cf2a8f9a94a577f0921a96c9f1bcd38413602dd2599d6575e70c2c8fe2ac88723b2a332
+  data.tar.gz: 81ef6e0ea37192b585d6562874a7c0af2b3d36626d15b1a3c27fedfa0bede4c6ca0baad884c304e42bf42a767d6d9541d866fa746ac25461876b7c845491d64b

data/CHANGELOG.md

@@ -0,0 +1,7 @@
+## 0.0.2
+
+* Support nested Hash in inventory
+
+## 0.0.1
+
+* Initial release

data/README.md

@@ -1,4 +1,5 @@
 # fluent-plugin-specinfra_inventory
+[![Gem Version](https://badge.fury.io/rb/fluent-plugin-specinfra_inventory.svg)](http://badge.fury.io/rb/fluent-plugin-specinfra_inventory)
 
 Specinfra Host Inventory Plugin for [Fluentd](http://github.com/fluent/fluentd)
 
@@ -25,7 +26,7 @@ Or install it yourself as:
   time_span      300
   tag_prefix     example.prefix
   backend        exec
-  inventory_keys ["cpu","memory"]
+  inventory_keys ["cpu.total","memory"]
   family         ubuntu
   release        14.04
   arch           x86_64
@@ -47,21 +48,22 @@ Event tags are added together inventory key at the end. like: `example.prefix.cp
 default: `specinfra.inventory`
 
 ### backend
-Specinfra backend type  
+Specinfra backend type.  
 default: `exec`
 
 
 ### inventory_keys
-Key of Host Inventory
+Key of Host Inventory.  
+If you access the key on nested Hash, you should separated by `.`
 
 ### family, release, arch
 See [Multi OS Support](http://serverspec.org/tutorial.html)
 
 ### path
-`PATH` environment variable
+Environment variable `PATH`
 
 ### host
-Target host
+Target hostname or IP
 
 ### ssh_user
 SSH user name

data/lib/fluent/plugin/in_specinfra_inventory.rb

@@ -15,6 +15,10 @@ module Fluent
     config_param :env,            :hash,    default: {}
     config_param :inventory_keys, :array
 
+    KEY_DELIMITER = "."
+
+    attr_accessor :inventory
+
     def initialize
       super
       require 'specinfra'
@@ -68,7 +72,11 @@ module Fluent
     end
 
     def record(key)
-      @inventory[key]
+      inv = @inventory
+      key.split(KEY_DELIMITER).each do |k|
+        inv = inv[k]
+      end
+      inv
     end
 
   end

data/lib/fluent/plugin/specinfra_inventory/version.rb

@@ -1,7 +1,7 @@
 module Fluent
   module Plugin
     module SpecinfraInventory
-      VERSION = "0.0.1"
+      VERSION = "0.0.2"
     end
   end
 end

data/spec/in_specinfra_inventory_spec.rb

@@ -5,6 +5,14 @@ describe Fluent::SpecinfraInventoryInput do
   before do
     Fluent::Test.setup
     @d = Fluent::Test::InputTestDriver.new(Fluent::SpecinfraInventoryInput).configure(config)
+    @d.instance.inventory = {
+      'cpu' => {
+        'total' => "2",
+        '0' => {
+          'vendor_id' => "1"
+        }
+      }
+    }
   end
 
   let(:config) do
@@ -12,7 +20,7 @@ describe Fluent::SpecinfraInventoryInput do
       time_span      300
       tag_prefix     test.prefix
       backend        exec
-      inventory_keys ["cpu"]
+      inventory_keys ["cpu.0"]
       family         ubuntu
       release        14.04
       arch           x86_64
@@ -28,7 +36,7 @@ describe Fluent::SpecinfraInventoryInput do
     example { expect(@d.instance.time_span).to eq 300 }
     example { expect(@d.instance.tag_prefix).to eq "test.prefix" }
     example { expect(@d.instance.backend).to eq "exec" }
-    example { expect(@d.instance.inventory_keys).to eq ["cpu"] }
+    example { expect(@d.instance.inventory_keys).to eq ["cpu.0"] }
     example { expect(@d.instance.family).to eq "ubuntu" }
     example { expect(@d.instance.release).to eq "14.04" }
     example { expect(@d.instance.arch).to eq "x86_64" }
@@ -43,7 +51,11 @@ describe Fluent::SpecinfraInventoryInput do
     example { expect(@d.instance.tag("cpu")).to eq "test.prefix.cpu" }
   end
 
-  describe "record" do
-    example { expect(@d.instance.record("cpu")).to have_key "total" }
+  describe "record on flat hash" do
+    example { expect(@d.instance.record("cpu")).to include('total' => "2") }
+  end
+
+  describe "record on nested hash" do
+    example { expect(@d.instance.record("cpu.0")).to include('vendor_id' => "1") }
   end
 end

data/spec/spec_helper.rb

@@ -4,8 +4,6 @@ Coveralls.wear!
 require 'fluent/load'
 require 'fluent/test'
 
-require 'fluent/plugin/in_specinfra_inventory'
-
 RSpec.configure do |config|
   # rspec-expectations config goes here. You can use an alternate
   # assertion/expectation library such as wrong or the stdlib/minitest

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-specinfra_inventory
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Masashi Terui
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-25 00:00:00.000000000 Z
+date: 2015-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -104,6 +104,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md