fluent-plugin-grassland 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e17d6eedf5c9571d2634e94ddb5634dd4c2a2d0
-  data.tar.gz: c1226059029286dc67b98560ed39798f9977c1a1
+  metadata.gz: daca1a7d14f14e11fda78369ba3896e0bc4436dc
+  data.tar.gz: 9921a442694873ba204ce6fd0267ddb095235f63
 SHA512:
-  metadata.gz: 0126eab89651d364191dd563d88e8217657b7564dea3cdebccea0b34ec9307bdf1fa9559a49f6d13daa72f17a0c2d3ebc6729dd2954c71c0aa6f301a5331dc77
-  data.tar.gz: 9b4fcaadcb516068817c6fbfa5187b42c35af1d3d0bfe54e75d372a84550a7e2d0765a7440c41ba6acfa48bba4cc932908d0d329419de0cc6990e7a2922bfa96
+  metadata.gz: 96f7cae361b8c566da1bbb5a248077609a7c8fbb6eb9982c872bb37ac2d73d40e8ae39f9325f9acb58c242c69ce01854e95f5f50b1bba12542db31fd11d17479
+  data.tar.gz: 6ae0e9fd342cc5ac82fb58e0acbb653fe26541ee1f0466ba49e48e4da8104b8058ac2589ce8cb2b5b4233fba4f4661b1728066198347c8e1447801412b7c09e3

data/README.md

@@ -82,14 +82,13 @@ $logger = FluentLogger::open("localhost", "24224");
 /*** ここまでがfluent-logger-php用の前準備 ***/
 
 $param = array(
-	'cid' => 'お客様ID',
 	'dt' => 'データID',
-	'uid' => 'お客様のサービスのユーザID',
+	'uid' => '(optional)お客様のサービスのユーザID',
 	'pt' => '(optional)データの発生時刻(ISO 8601準拠の文字列, Ex. "2014-04-01T12:00:00+09:00")',
 	'd' => array(
-		'任意のキー' => '集計を行いたいデータ',
-		'任意のキー' => '(optional)集計を行いたいデータ',
-		'任意のキー' => '(以降、同様に最大10個まで追加可能)'
+    '任意のキー1' => array('任意のキー2' => '集計を行いたいデータ'),
+		'(optional)任意のキー1' => array('任意のキー2' => '集計を行いたいデータ'),
+    ...
 	)
 );
 $logger->post("grassland.data", $param);
@@ -104,13 +103,10 @@ ptを省略した場合、fluentdが受け付けた時間のUTC時刻として
 date_default_timezone_set('Asia/Tokyo');
 
 $param = array(
-  'cid' => 'cid0000001',
   'dt' => 'd822fab12eeb4db997db87876a082d82',
-  'uid' => 'user001',
-  'pt' => date( DATE_ISO8601, time() ),
   'd' => array(
-    'item1' => '100',
-    'item2' => '200'
+    'itemGroup1' => array('item1' => '100'),
+    'itemGroup1' => array('item2' => '200')
   )
 );
 $logger->post("grassland.data", $param);

data/fluent-plugin-grassland.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'fluent-plugin-grassland'
-  spec.version       = '0.0.4'
+  spec.version       = '0.0.5'
   spec.authors       = ['Ripplation Inc.']
   # spec.email         = ['xxxxxx@ripplation.co.jp']
   spec.description   = 'Output filter plugin for Grassland'

data/lib/fluent/plugin/out_grassland.rb

@@ -4,7 +4,7 @@ module Fluent
 
     attr_accessor :random
     attr_accessor :kinesis
-    attr_accessor :stream_name, :access_key_id, :secret_access_key, :region, :sessionToken, :partitionKeys
+    attr_accessor :id, :stream_name, :access_key_id, :secret_access_key, :region, :sessionToken, :partitionKeys
 
     def initialize
       super
@@ -18,7 +18,7 @@ module Fluent
     end
 
     config_param :apiuri,               :string,  :default => 'https://grassland.biz/credentials'
-    config_param :id,                  :string,  :default => 'nil'
+    # config_param :id,                  :string,  :default => 'nil'
     config_param :key,                  :string,  :default => 'nil'
     config_param :debug,                :bool,    :default => false
     config_param :resetCredentialTimer, :integer, :default => 86400
@@ -72,6 +72,7 @@ module Fluent
 
     def setCredential()
       credential = get_json("#{@apiuri}?key=#{@key}")
+      @id = credential['id']
       @stream_name = credential['streamName']
       @access_key_id = credential['accessKeyId']
       @secret_access_key = credential['secretAccessKey']
@@ -109,7 +110,7 @@ module Fluent
 
     def format(tag, time, record)
       # print(record)
-      ['dt', 'uid', 'd'].each do |key|
+      ['dt', 'd'].each do |key|
         unless record.has_key?(key)
           puts "input data error: '#{key}' is required"
           return ""
@@ -121,6 +122,9 @@ module Fluent
       unless record.has_key?('cid')
         record['cid'] = @id
       end
+      unless record.has_key?('uid')
+        record['uid'] = '0'
+      end
 
       record['pk'] = record['cid'] + record['dt']
       return "#{record.to_json},"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-grassland
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Ripplation Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-04 00:00:00.000000000 Z
+date: 2015-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd