fluent-plugin-grassland 0.0.5 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: daca1a7d14f14e11fda78369ba3896e0bc4436dc
-  data.tar.gz: 9921a442694873ba204ce6fd0267ddb095235f63
+SHA256:
+  metadata.gz: 0a58e5705d031e2680d0e20166851d5837aea29de2e0f635700b1b42315849c0
+  data.tar.gz: 925f4f26f5d36c91d06a3f08eb0994a0992a1fb2548af1c5ebc7677c9a0d1cb0
 SHA512:
-  metadata.gz: 96f7cae361b8c566da1bbb5a248077609a7c8fbb6eb9982c872bb37ac2d73d40e8ae39f9325f9acb58c242c69ce01854e95f5f50b1bba12542db31fd11d17479
-  data.tar.gz: 6ae0e9fd342cc5ac82fb58e0acbb653fe26541ee1f0466ba49e48e4da8104b8058ac2589ce8cb2b5b4233fba4f4661b1728066198347c8e1447801412b7c09e3
+  metadata.gz: f376fe29cdc9881dd025c545d98532b05596143841dd28175d514e626d34fe4625569cf5fb68b6cb0bfe450da29a69978c42fca00ff2fbfb65131aeede340eff
+  data.tar.gz: 5e5484eaa1b00cd6d09dd025062e885f78760355946f8f3981f80bffa0491191153af97fff4660d230444cc12297e3b3e3660896bd6cd1c9897ead98928271ca

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"
@@ -83,8 +86,7 @@ $logger = FluentLogger::open("localhost", "24224");
 
 $param = array(
 	'dt' => 'データID',
-	'uid' => '(optional)お客様のサービスのユーザ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(
     '任意のキー1' => array('任意のキー2' => '集計を行いたいデータ'),
 		'(optional)任意のキー1' => array('任意のキー2' => '集計を行いたいデータ'),
@@ -93,7 +95,7 @@ $param = array(
 );
 $logger->post("grassland.data", $param);
 ```
-  
+
 ptを省略した場合、fluentdが受け付けた時間のUTC時刻として入力されます。  
 「任意のキー」は、グラフに表示される一つの要素になります。  
 例を以下に示します。  
@@ -110,4 +112,42 @@ $param = array(
   )
 );
 $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.5'
+  spec.version       = '0.2.1'
   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

@@ -1,6 +1,9 @@
-module Fluent
-  class GrasslandOutput < Fluent::BufferedOutput
-    Fluent::Plugin.register_output('grassland', self)
+require 'syslog/logger'
+require 'fluent/plugin/output'
+
+module Fluent::Plugin
+  class GrasslandOutput < Fluent::Plugin::Output
+    Fluent::Plugin.register_output("grassland", self)
 
     attr_accessor :random
     attr_accessor :kinesis
@@ -8,6 +11,7 @@ module Fluent
 
     def initialize
       super
+      # require 'aws-sdk-v1'
       require 'aws-sdk'
       require 'base64'
       require 'json'
@@ -15,6 +19,10 @@ module Fluent
       require 'net/http'
       require 'uri'
       @random = Random.new
+
+      log = Syslog::Logger.new 'grasslandplugin'
+      log.info 'grassland initialize'
+      # puts "grassland initialize"
     end
 
     config_param :apiuri,               :string,  :default => 'https://grassland.biz/credentials'
@@ -59,14 +67,14 @@ module Fluent
       begin
         setCredential
         configure_aws
-        AWS.kinesis.client.put_record({
+        @kinesis.put_record({
           :stream_name   => @stream_name,
           :data          => "test",
           :partition_key => "#{random.rand(999)}"
         })
-        puts "fluentd: reset credential"
+        log.info "grassland: reset credential"
       rescue => e
-        puts [e.class, e].join(" : initialize error.")
+        log.info [e.class, e].join(" : initialize error.")
       end
     end
 
@@ -78,7 +86,7 @@ module Fluent
       @secret_access_key = credential['secretAccessKey']
       @region = credential['region']
       @sessionToken = credential['SessionToken']
-      @partitionKeys = credential['SessionToken']
+      @partitionKeys = credential['partitionKeyList']
     end
 
     def get_json(location, limit = 3)
@@ -99,11 +107,11 @@ module Fluent
           warn "redirected to #{location}"
           get_json(location, limit - 1)
         else
-          puts [uri.to_s, response.value].join(" : ")
+          log.info [uri.to_s, response.value].join(" : ")
           # handle error
         end
       rescue => e
-        puts [uri.to_s, e.class, e].join(" : ")
+        log.info [uri.to_s, e.class, e].join(" : ")
         # handle error
       end
     end
@@ -112,7 +120,7 @@ module Fluent
       # print(record)
       ['dt', 'd'].each do |key|
         unless record.has_key?(key)
-          puts "input data error: '#{key}' is required"
+          log.info "input data error: '#{key}' is required"
           return ""
         end
       end
@@ -138,13 +146,15 @@ module Fluent
 
       begin
         dataList.each do |data|
+          # debug log
+          # log.info data.to_json
           if bufList[":#{data['pk']}"] == nil then
             bufList[":#{data['pk']}"] = "#{data.to_json},"
           else
             bufList[":#{data['pk']}"] += "#{data.to_json},"
           end
           if bufList[":#{data['pk']}"].bytesize >= 30720 then
-            AWS.kinesis.client.put_record({
+            @kinesis.put_record({
               :stream_name   => @stream_name,
               :data          => "["+bufList[":#{data['pk']}"].chop+"]",
               :partition_key => partitionKeys[random.rand(partitionKeys.length)]
@@ -155,7 +165,7 @@ module Fluent
         end
         dataList.each do |data|
           if bufList[":#{data['pk']}"] != nil then
-            AWS.kinesis.client.put_record({
+            @kinesis.put_record({
               :stream_name   => @stream_name,
               :data          => "["+bufList[":#{data['pk']}"].chop+"]",
               :partition_key => partitionKeys[random.rand(partitionKeys.length)]
@@ -165,7 +175,7 @@ module Fluent
           end
         end
       rescue
-        puts "error: put_record to grassland. maybe too many requests. few data dropped."
+        log.info "error: put_record to grassland. maybe too many requests. few data dropped."
       end
     end
 
@@ -187,7 +197,7 @@ module Fluent
         )
       end
 
-      AWS.config(options)
+      @kinesis = Aws::Kinesis::Client.new(options)
     end
   end
-end
+  end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-grassland
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.2.1
 platform: ruby
 authors:
 - Ripplation Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-06 00:00:00.000000000 Z
+date: 2020-10-28 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.0.3
 signing_key: 
 specification_version: 4
 summary: Output filter plugin for Grassland