fluent-plugin-festival 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6bf3cd0a66259715fde049cd5f12090c51742288
-  data.tar.gz: 005bf5cdf8a890ca3df7c2bf4bb96e9073de13a4
+  metadata.gz: 50683595d0191e60d7ab11e80b8d1661136dbf47
+  data.tar.gz: c9ee0fe6002245a39c5bdd5459ce219a2676aa74
 SHA512:
-  metadata.gz: b78c51d789fb7b6c7b2a956a1572475ccc4a50debc7ee86e71132174e1db7e8527960761c258bde02c8dc963a2bcc5bc36254d65a12a963e0c29b564bc7e15bf
-  data.tar.gz: 422e63db0875501548d441e1079490bd13b21dd618009fd85d816e21c889b2f6851d3bafed391694cdfff89bedf6ba71dffec6a0b2ab10812005d822a18a80e7
+  metadata.gz: 64d59abb3d6496954e1c5236d54e7924d8b04edae0d83437874a48a739298e14779d8a1ee2980ac3e94c412ef78f0cae732f40d0cdf86401d07f6736e7329f39
+  data.tar.gz: d68d607cc80dc5e3a5a7c1c180f21b426dde74ccb30bf3c060f0ed55d705321f6039e7bf2fafdea6bec764110acbcd5f822c9478ba5108ed32b53abb1879ed40

data/README.md

@@ -36,9 +36,11 @@ Input Plugin can receive events from FESTIVAL EaaS API Server. It can be used vi
   polling_interval 30
   <resource>
     path /aggregators/IOT-0/testbeds/jose/resources/train_station_kyoto001_humidity-info-value/current_data
+    fixed_location [135.0, 35.0]
   </resource>
   <resource>
     path /aggregators/IOT-0/testbeds/jose/resources/train_station_kyoto001_barometer-info-value/current_data
+    require_location
   </resource>
 </source>
 
@@ -61,12 +63,15 @@ Input Plugin can receive events from FESTIVAL EaaS API Server. It can be used vi
 - **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. Currently, only "current_data" type is supported.
  (e.g. /aggregators/IOT-0/testbeds/jose/resources/train_station_hyogo001_barometer-info-value/current_data).
+  - **fixed_location**: The target resource location can be specified by longitude and latitude values as an array, e.g. [135.0, 35.0]. The specified location is added to each sensor data.
+  - **require_location**: If the target resource is moving object, its dynamic location must be obtained from FESTIVAL platform. When this option is specified, the resource location is retrieved via REST API.
 
 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",
+  "location":{"lon":135.0,"lat":35.0},
   "dataValue": "1001.16"
 }
 ```

data/examples/README.md

@@ -24,9 +24,11 @@ Create a sample configuration file as follows. You need to change festival_porta
   polling_interval 30
   <resource>
     path /aggregators/IOT-0/testbeds/jose/resources/train_station_kyoto001_humidity-info-value/current_data
+    fixed_location [135.0, 35.0]
   </resource>
   <resource>
     path /aggregators/IOT-0/testbeds/jose/resources/train_station_kyoto001_barometer-info-value/current_data
+    require_location
   </resource>
 </source>
 
@@ -106,9 +108,11 @@ curl -XPUT 'http://localhost:9200/festival/iot_gateway/_mapping' -d @iot_gateway
   polling_interval 30
   <resource>
     path /aggregators/IOT-0/testbeds/jose/resources/train_station_kyoto001_humidity-info-value/current_data
+    fixed_location [135.0, 35.0]
   </resource>
   <resource>
     path /aggregators/IOT-0/testbeds/jose/resources/train_station_kyoto001_barometer-info-value/current_data
+    require_location
   </resource>
   @label @test0
 </source>
@@ -116,8 +120,8 @@ curl -XPUT 'http://localhost:9200/festival/iot_gateway/_mapping' -d @iot_gateway
 <label @test0>
   <filter test*>
     @type record_transformer
-    enable_ruby true
-    auto_typecast true
+    enable_ruby
+    auto_typecast
     <record>
       timestamp   ${time.strftime("%FT%T.%L%:z")}
     </record>

data/examples/fluent-festival.conf

@@ -6,9 +6,11 @@
   polling_interval 30
   <resource>
     path /aggregators/IOT-0/testbeds/jose/resources/train_station_hyogo001_barometer-info-value/current_data
+    fixed_location [135.0, 35.0]
   </resource>
   <resource>
     path /aggregators/IOT-0/testbeds/jose/resources/train_station_kyoto001_barometer-info-value/current_data
+    require_location
   </resource>
   @label @test0
 </source>
@@ -39,8 +41,8 @@
 <label @test0>
   <filter test*>
     @type record_transformer
-    enable_ruby true
-    auto_typecast true
+    enable_ruby
+    auto_typecast
     <record>
       # set timestamp granularity as second
       #timestamp   ${time.strftime("%FT%T%:z")}

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.10"
+  spec.version       = "0.0.11"
   spec.authors       = ["Toyokazu Akiyama"]
   spec.email         = ["toyokazu@gmail.com"]
 

data/lib/fluent/plugin/festival_proxy.rb

@@ -111,10 +111,10 @@ module Fluent::Plugin
       Pathname(path).dirname.to_s
     end
 
-    def add_location(result, path)
-      if @require_location
-        log.debug "get_data (location): request #{get_data_request(resource_path(path))}, #{get_data_header.inspect}"
-        get_sensor_res = @https.get(get_data_request(resource_path(path)), get_data_header)
+    def add_location(result, resource)
+      if resource.require_location
+        log.debug "get_data (location): request #{get_data_request(resource_path(resource.path))}, #{get_data_header.inspect}"
+        get_sensor_res = @https.get(get_data_request(resource_path(resource.path)), get_data_header)
         return result if !error_handler(get_sensor_res, "get_data failed.")
         log.debug "get_data: #{get_sensor_res.body}"
         sensor = JSON.parse(get_sensor_res.body)
@@ -125,6 +125,14 @@ module Fluent::Plugin
             "lat": JSON.parse(sensor["location"]["geographicArea"])["coordinates"][1]
           }
         })
+      elsif !resource.fixed_location.nil?
+        log.debug "set fixed_location: #{resource.fixed_location.inspect}"
+        return result.merge({
+          "location": {
+            "lon": resource.fixed_location[0].to_f,
+            "lat": resource.fixed_location[1].to_f
+          }
+        })
       end
       return result
     end
@@ -148,7 +156,7 @@ module Fluent::Plugin
             "resourceName": resource.path,
             "dataValue": JSON.parse(get_data_res.body)["dataValue"]
           }
-          data << add_location(result, resource.path)
+          data << add_location(result, resource)
         when "historical_data" then
           log.error "historical_data is not supported yet"
           next

data/lib/fluent/plugin/in_festival.rb

@@ -21,8 +21,6 @@ module Fluent::Plugin
     config_param :tag, :string
     desc 'Polling interval to get message from FESTIVAL EaaS API'
     config_param :polling_interval, :integer, default: 60
-    desc 'Require sensor location'
-    config_param :require_location, :bool, default: false
 
     # <resoruce> tag can be used for specifying multiple resources in a <source> tag
     # If the user wants to specify different format or polling interval for each resource,
@@ -54,6 +52,10 @@ module Fluent::Plugin
       #base.config_param :testbed_id, :string, :default => nil
       # e.g. airsensors_firenze-airsensors-location, hyogo001_barometer-info-valuesfloat
       #base.config_param :resource_id, :string, :default => nil
+      desc 'Require sensor location'
+      config_param :require_location, :bool, default: false
+      desc 'Fixed sensor location'
+      config_param :fixed_location, :array, default: nil
     end
 
     def configure(conf)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-festival
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Toyokazu Akiyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-19 00:00:00.000000000 Z
+date: 2017-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd