fluent-plugin-festival 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5c1e3d242c010ee823e858117bb2da6b3ea39c8
-  data.tar.gz: 3312a4df58ff87953ae05f435d497d9d83e8463d
+  metadata.gz: ffd09b60d96a422385ed83d21715333f16163c8d
+  data.tar.gz: 6c1b16397f48192b61465efb873b8941d58d8538
 SHA512:
-  metadata.gz: 4b1846ac7d13723e084f3cc29ab4a96ba28c8001cf624fa06fb6a6d9f2e5ebc748900cacbf91120b8b55f9331611c80cd865163e67c245e99aa7f470b317346b
-  data.tar.gz: c6d592339f4f57927c03c2919a9efbdc59b14bce99bf6f3ea4f0c8863cd2eb3d6085673b65041635f9f25fabf3519ef91c9b4cda54e49d76697e618e6408c3fa
+  metadata.gz: 3087b75bade794d00747b9b0fb6486b6748595b99a263b48ea0ad63a9a94536affc7973fad3cb563de48fdbfb0cb01055a1dbe17bf43d482f81c3d9d4798c10e
+  data.tar.gz: 9b413322b9da6c52d6ec5b9224b4c39f3c3d9da10db0e5da4ecb79e5d5628562d7d9a27fb2d89b9f5c6af5867834b2efcbd926bf79b5b36b325dca14bf78e240

data/README.md

@@ -35,10 +35,10 @@ Input Plugin can receive events from FESTIVAL EaaS API Server. It can be used vi
   password festival_portal_password
   polling_interval 30
   <resource>
-    path /aggregators/IOT-0/testbeds/jose/resources/hyogo001_barometer-info-value
+    path /aggregators/IOT-0/testbeds/jose/resources/hyogo001_barometer-info-value/current_data
   </resource>
   <resource>
-    path /aggregators/IOT-0/testbeds/jose/resources/kyoto001_barometer-info-value
+    path /aggregators/IOT-0/testbeds/jose/resources/kyoto001_barometer-info-value/current_data
   </resource>
 </source>
 
@@ -49,7 +49,7 @@ Input Plugin can receive events from FESTIVAL EaaS API Server. It can be used vi
   password festival_portal_password
   polling_interval 180
   <resource>
-    path /aggregators/IOT-0/testbeds/smartsantander/resources/smartsantander_u7jcfa_f3176-chemicalAgentAtmosphericConcentration:airParticles-sensor
+    path /aggregators/IOT-0/testbeds/smartsantander/resources/smartsantander_u7jcfa_f3176-chemicalAgentAtmosphericConcentration:airParticles-sensor/current_data
   </resource>
 </source>
 ```
@@ -59,13 +59,14 @@ Input Plugin can receive events from FESTIVAL EaaS API Server. It can be used vi
 - **password** (required): password for the login_name
 - **polling_interval** (optional): Polling interval (seconds) for accessing EaaS API (default: 60 seconds)
 - **resource** (at least one entry is required): The target resources to obtain sensor data. multiple resources can be specified by multiple <resource> tags. If a user wants to specify different polling interval for each resource, it must be specified different <source> tags.
-  - **path** (at least one entry is required): The target resource path name should be specified. The pathname should specify only under aggregator part and target data type, i.e. current_data or historical_data, should be omitted
- (e.g. /aggregators/IOT-0/testbeds/jose/resources/hyogo001_barometer-info-value).
+  - **path** (at least one entry is required): The target resource path name should be specified. The pathname should specify only under aggregator part and target data type. Currently, only "current_data" type is supported.
+ (e.g. /aggregators/IOT-0/testbeds/jose/resources/hyogo001_barometer-info-value/current_data).
 
 If the time field is empty, this plugin automatically set the finished time of data downloading. If multiple sensor data specified simultaneously, the time difference may become larger than single datum case. A sample data format is shown below.
 
 ```
 {
+  "resourceName": "/aggregators/IOT-0/testbeds/jose/resources/hyogo001_barometer-info-value/current_data",
   "dataValue": "1001.16"
 }
 ```

data/docs/tutorial.md

@@ -23,10 +23,10 @@ Create a sample configuration file as follows. You need to change festival_porta
   password festival_portal_password
   polling_interval 30
   <resource>
-    path /aggregators/IOT-0/testbeds/jose/resources/hyogo001_barometer-info-value
+    path /aggregators/IOT-0/testbeds/jose/resources/hyogo001_barometer-info-value/current_data
   </resource>
   <resource>
-    path /aggregators/IOT-0/testbeds/jose/resources/kyoto001_barometer-info-value
+    path /aggregators/IOT-0/testbeds/jose/resources/kyoto001_barometer-info-value/current_data
   </resource>
 </source>
 
@@ -37,7 +37,7 @@ Create a sample configuration file as follows. You need to change festival_porta
   password festival_portal_password
   polling_interval 180
   <resource>
-    path /aggregators/IOT-0/testbeds/smartsantander/resources/smartsantander_u7jcfa_f3176-chemicalAgentAtmosphericConcentration:airParticles-sensor
+    path /aggregators/IOT-0/testbeds/smartsantander/resources/smartsantander_u7jcfa_f3176-chemicalAgentAtmosphericConcentration:airParticles-sensor/current_data
   </resource>
 </source>
 

data/fluent-plugin-festival.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-festival"
-  spec.version       = "0.0.3"
+  spec.version       = "0.0.4"
   spec.authors       = ["Toyokazu Akiyama"]
   spec.email         = ["toyokazu@gmail.com"]
 
@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = '>= 2.1.0'
+  spec.required_ruby_version = '>= 2.2.0'
 
   spec.add_dependency 'fluentd', '~> 0.14.0'
 

data/lib/fluent/plugin/festival_proxy.rb

@@ -85,10 +85,10 @@ module Fluent::Plugin
     #  end
     #end
 
-    def get_data_request(path, type)
+    def get_data_request(path)
       #get_data_req = @uri + target_path(type)
 
-      get_data_req = @uri + Pathname("/festival/eaas/experimentation/#{path}/#{type}").cleanpath.to_s
+      get_data_req = @uri + Pathname("/festival/eaas/experimentation/#{path}").cleanpath.to_s
       #get_data_req.query = URI.encode_www_form(get_data_params)
       $log.debug "#{get_data_req}"
       # currently time window is automatically updated
@@ -104,7 +104,11 @@ module Fluent::Plugin
       }
     end
 
-    def get_current_data
+    def resource_type(path)
+      Pathname(path).basename.to_s
+    end
+
+    def get_data
       if !valid_session?
         return nil if create_session.nil?
         $log.debug "session #{@session} created."
@@ -113,11 +117,24 @@ module Fluent::Plugin
       #require 'pry-byebug'
       $log.debug "@resources: #{@resources.inspect}"
       @resources.each do |resource|
-        $log.debug "get_current_data: request #{get_data_request(resource.path, "current_data")}, #{get_data_header.inspect}"
-        get_current_data_res = @https.get(get_data_request(resource.path, "current_data"), get_data_header)
-        return nil if !error_handler(get_current_data_res,"get_data failed.")
-        $log.debug "get_current_data: #{get_current_data_res.body}"
-        data << {"dataValue": JSON.parse(get_current_data_res.body)["dataValue"]}
+        case resource_type(resource.path)
+        when "current_data" then
+          $log.debug "get_data: request #{get_data_request(resource.path)}, #{get_data_header.inspect}"
+          get_data_res = @https.get(get_data_request(resource.path), get_data_header)
+          return nil if !error_handler(get_data_res,"get_data failed.")
+          $log.debug "get_data: #{get_data_res.body}"
+          data << {
+            "resourceName": resource.path,
+            "dataValue": JSON.parse(get_data_res.body)["dataValue"]
+          }
+        when "historical_data" then
+          $log.error "historical_data is not supported yet"
+          return nil
+        else
+          $log.error "The other resource type is not supported yet"
+          $log.error "resource_type: #{resource_type(resource.path)}"
+          return nil
+        end
       end
       if data.size > 1
         return data

data/lib/fluent/plugin/in_festival.rb

@@ -36,7 +36,7 @@ module Fluent::Plugin
     # A resource URI example
     # https://api.festival-project.eu/festival/eaas/experimentation/aggregators/IOT-0/testbeds/jose/resources/hyogo001_barometer-info-value/current_data
     # <resource>
-    #   path /aggregators/IOT-0/testbeds/jose/resources/hyogo001_barometer-info-value
+    #   path /aggregators/IOT-0/testbeds/jose/resources/hyogo001_barometer-info-value/current_data
     # </resource>
     #
     # Resource ID case (not supported now):
@@ -49,7 +49,7 @@ module Fluent::Plugin
     # If you want to specify historical data
     config_section :resource, param_name: :resources, required: true, multi: true do
       desc 'Resource path'
-      # e.g. /aggregators/IOT-0/testbeds/jose/resources/hyogo001_barometer-info-value
+      # e.g. /aggregators/IOT-0/testbeds/jose/resources/hyogo001_barometer-info-value/current_data
       config_param :path, :string
       # e.g. IT-0, OD-0, IOT-0, LL-0
       #base.config_param :aggregator_id, :string, :default => nil
@@ -73,7 +73,7 @@ module Fluent::Plugin
     def get_loop
       while (true)
         begin
-          data = get_current_data
+          data = get_data
           emit(data) if !(data.nil? || data.empty?)
           sleep @polling_interval
         rescue Exception => e

data/test/plugin/test_in_festival.rb

@@ -23,17 +23,17 @@ class FestivalInputTest < Test::Unit::TestCase
           password login_password
           polling_interval 30
           <resource>
-            path /aggregators/IOT-0/testbeds/jose/resources/hyogo001_barometer-info-value
+            path /aggregators/IOT-0/testbeds/jose/resources/hyogo001_barometer-info-value/current_data
           </resource>
           <resource>
-            path /aggregators/IOT-0/testbeds/jose/resources/kyoto001_barometer-info-value
+            path /aggregators/IOT-0/testbeds/jose/resources/kyoto001_barometer-info-value/current_data
           </resource>
       ]
       assert_equal 'test', d.instance.tag
       assert_equal 'login_password', d.instance.password
       assert_equal 30, d.instance.polling_interval
-      assert_equal '/aggregators/IOT-0/testbeds/jose/resources/hyogo001_barometer-info-value', d.instance.resources[0].path
-      assert_equal '/aggregators/IOT-0/testbeds/jose/resources/kyoto001_barometer-info-value', d.instance.resources[1].path
+      assert_equal '/aggregators/IOT-0/testbeds/jose/resources/hyogo001_barometer-info-value/current_data', d.instance.resources[0].path
+      assert_equal '/aggregators/IOT-0/testbeds/jose/resources/kyoto001_barometer-info-value/current_data', d.instance.resources[1].path
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-festival
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Toyokazu Akiyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-21 00:00:00.000000000 Z
+date: 2017-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -95,7 +95,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="