fluent-plugin-grassland 0.0.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1e17d6eedf5c9571d2634e94ddb5634dd4c2a2d0
-  data.tar.gz: c1226059029286dc67b98560ed39798f9977c1a1
+SHA256:
+  metadata.gz: c0a50827624e60eb0a7e3aa7ece74ccb3b4ee63800efe9d5b882fd07667f98c0
+  data.tar.gz: 33dc0fcfe60b74de19c3fdcbca92362aff2bf0a9e4391bbb80a724b8d6685625
 SHA512:
-  metadata.gz: 0126eab89651d364191dd563d88e8217657b7564dea3cdebccea0b34ec9307bdf1fa9559a49f6d13daa72f17a0c2d3ebc6729dd2954c71c0aa6f301a5331dc77
-  data.tar.gz: 9b4fcaadcb516068817c6fbfa5187b42c35af1d3d0bfe54e75d372a84550a7e2d0765a7440c41ba6acfa48bba4cc932908d0d329419de0cc6990e7a2922bfa96
+  metadata.gz: 4ec89f13aeae1939aba751a8e87b03851b7316bfbc772dfab2d6247602d61236c0eaec16eef3bd67f320aa9fc9772849cca6d6f0830b96032296847c6393fcec
+  data.tar.gz: e7272781f77dfbaf0afa8d512e23ac56d8f8e05b0a9732a3ab0c5ad7223ed7af9eacbc763b3020370b30a653110122e3293c1a9b6fb8dcf65c223f11bf0355b5

data/README.md

@@ -5,11 +5,12 @@ Output filter plugin for Grassland
 [![Gem Version](https://badge.fury.io/rb/fluent-plugin-grassland.svg)](http://badge.fury.io/rb/fluent-plugin-grassland)
 
 ## Notice
-* このアプリケーションはまだテスト中です。
-
 本アプリケーションはFluentdのGrassland用プラグインです。
 [Fluentdをインストール](http://docs.fluentd.org/categories/installation)してからご利用下さい。
 
+[GRASSLANDのWebサイトはこちら](https://grassland.biz/)
+
+
 ## Installation
 
 __Gemfileに記載する場合__
@@ -34,6 +35,8 @@ fluent-gemでインストールします。
 注意： fluent-gemのパスは環境によって異なります。
 
     $ /usr/lib64/fluent/ruby/bin/fluent-gem install fluent-plugin-grassland
+    または、
+    $ /opt/td-agent/embedded/bin/fluent-gem install fluent-plugin-grassland
 
 ## Usage
 
@@ -49,7 +52,7 @@ __Fluentdの設定ファイルに以下を追記します。__
 <match grassland.**>
   type grassland
   key xxxxxxxxxxxxxxxx
-  flush_interval 3
+  flush_interval 5
 </match>
 ```
 
@@ -58,7 +61,7 @@ __Fluentdの設定ファイルに以下を追記します。__
 
 __1. [fluent-logger-phpをインストール](https://github.com/fluent/fluent-logger-php)して下さい。__
 ```
-cat >> composer.json << EOF
+cat > composer.json << EOF
 {
     "require": {
         "fluent/logger": "v0.3.7"
@@ -82,19 +85,17 @@ $logger = FluentLogger::open("localhost", "24224");
 /*** ここまでがfluent-logger-php用の前準備 ***/
 
 $param = array(
-	'cid' => 'お客様ID',
 	'dt' => 'データID',
-	'uid' => 'お客様のサービスのユーザID',
-	'pt' => '(optional)データの発生時刻(ISO 8601準拠の文字列, Ex. "2014-04-01T12:00:00+09:00")',
+	'pt' => '(optional)データの発生時刻(ISO 8601準拠の文字列、又はUnixtimestamp（秒）, Ex. "2014-04-01T12:00:00+09:00" or "1432698912")',
 	'd' => array(
-		'任意のキー' => '集計を行いたいデータ',
-		'任意のキー' => '(optional)集計を行いたいデータ',
-		'任意のキー' => '(以降、同様に最大10個まで追加可能)'
+    '任意のキー1' => array('任意のキー2' => '集計を行いたいデータ'),
+		'(optional)任意のキー1' => array('任意のキー2' => '集計を行いたいデータ'),
+    ...
 	)
 );
 $logger->post("grassland.data", $param);
 ```
-  
+
 ptを省略した場合、fluentdが受け付けた時間のUTC時刻として入力されます。  
 「任意のキー」は、グラフに表示される一つの要素になります。  
 例を以下に示します。  
@@ -104,14 +105,49 @@ 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);
+```
+
+### Node.js usage
+
+__1. [fluent-logger-nodeをインストール](https://github.com/fluent/fluent-logger-node)して下さい。__
+```
+cat > package.json << EOF
+{
+  "name": "grassland_test ",
+  "version": "0.0.1",
+  "dependencies": {
+    "fluent-logger": "0.2.6"
+  }
+}
+EOF
+npm install
+```
+
+__2. 実際にPHPに記載して下さい。__
+```
+var logger = require('fluent-logger');
+logger.configure('grassland', {
+   host: 'localhost',
+   port: 24224,
+   timeout: 3.0
+});
+
+/*** ここまでがfluent-loggerの前準備 ***/
+
+var param = {
+  dt: 'データID',
+  pt: '(optional)データの発生時刻(ISO 8601準拠の文字列 Ex. "2014-04-01T12:00:00+09:00")',
+  d: {
+    '任意のキー1': {'任意のキー2': '(int)集計を行いたいデータ'},
+    '(optional)任意のキー1': {'任意のキー2': '(int)集計を行いたいデータ'}
+  }
+};
+logger.emit('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.2.0'
   spec.authors       = ['Ripplation Inc.']
   # spec.email         = ['xxxxxx@ripplation.co.jp']
   spec.description   = 'Output filter plugin for Grassland'
@@ -17,8 +17,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'fluentd'
-  spec.add_dependency 'eventmachine', '~> 1.0.3'
-  spec.add_dependency 'aws-sdk', '~> 1.40.3'
+  spec.add_dependency 'eventmachine', '~> 1.2'
+  spec.add_dependency 'aws-sdk', '~> 2'
   spec.add_dependency 'json'
   # spec.add_development_dependency 'bundler', '~> 1.3'
   # spec.add_development_dependency 'rake'

data/lib/fluent/plugin/out_grassland.rb

@@ -4,10 +4,11 @@ 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
+      # require 'aws-sdk-v1'
       require 'aws-sdk'
       require 'base64'
       require 'json'
@@ -18,7 +19,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
@@ -59,7 +60,7 @@ module Fluent
       begin
         setCredential
         configure_aws
-        AWS.kinesis.client.put_record({
+        @kinesis.client.put_record({
           :stream_name   => @stream_name,
           :data          => "test",
           :partition_key => "#{random.rand(999)}"
@@ -72,12 +73,13 @@ 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']
       @region = credential['region']
       @sessionToken = credential['SessionToken']
-      @partitionKeys = credential['SessionToken']
+      @partitionKeys = credential['partitionKeyList']
     end
 
     def get_json(location, limit = 3)
@@ -109,7 +111,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 +123,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},"
@@ -140,7 +145,7 @@ module Fluent
             bufList[":#{data['pk']}"] += "#{data.to_json},"
           end
           if bufList[":#{data['pk']}"].bytesize >= 30720 then
-            AWS.kinesis.client.put_record({
+            @kinesis.client.put_record({
               :stream_name   => @stream_name,
               :data          => "["+bufList[":#{data['pk']}"].chop+"]",
               :partition_key => partitionKeys[random.rand(partitionKeys.length)]
@@ -151,7 +156,7 @@ module Fluent
         end
         dataList.each do |data|
           if bufList[":#{data['pk']}"] != nil then
-            AWS.kinesis.client.put_record({
+            @kinesis.client.put_record({
               :stream_name   => @stream_name,
               :data          => "["+bufList[":#{data['pk']}"].chop+"]",
               :partition_key => partitionKeys[random.rand(partitionKeys.length)]
@@ -183,7 +188,8 @@ module Fluent
         )
       end
 
-      AWS.config(options)
+      @kinesis = AWS::Kinesis::Client.new(options)
+      # AWS.config(options)
     end
   end
 end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-grassland
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Ripplation Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-04 00:00:00.000000000 Z
+date: 2020-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.40.3
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.40.3
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Output filter plugin for Grassland
@@ -72,7 +72,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -91,17 +91,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Output filter plugin for Grassland