fluent-plugin-festival 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f7ff2033cb17a3eed91120e367c628170b6303e
-  data.tar.gz: ab5990ecf2a5277b29768e3e9de483455ca99ed6
+  metadata.gz: 6bf3cd0a66259715fde049cd5f12090c51742288
+  data.tar.gz: 005bf5cdf8a890ca3df7c2bf4bb96e9073de13a4
 SHA512:
-  metadata.gz: bd45aa3604f41f4264276e5b2fe263838a35992c08f9daf233a857c13326e9bcbad71f23cd3e5a126249fff5a797efd2dcdefd5b302c48b8cb37e4e6021455a1
-  data.tar.gz: 46efde3496d336fb907c43106f5bb0a28b8a729a45cd8222393194717d8bf4e2b232f9bf9601f2386b6a33dd11b05ef7b0c5b81bf1fa0106ed4a521b20fa0daf
+  metadata.gz: b78c51d789fb7b6c7b2a956a1572475ccc4a50debc7ee86e71132174e1db7e8527960761c258bde02c8dc963a2bcc5bc36254d65a12a963e0c29b564bc7e15bf
+  data.tar.gz: 422e63db0875501548d441e1079490bd13b21dd618009fd85d816e21c889b2f6851d3bafed391694cdfff89bedf6ba71dffec6a0b2ab10812005d822a18a80e7

data/examples/README.md

@@ -71,10 +71,10 @@ In the followings, how to store FESTIVAL platform data into Elasticsearch will b
 First of all, you need to create mapping in Elasticsearch. An Elasticsearch server is assumed to run in localhost.
 
 ```
-vi train_station-mapping.json
+vi iot_gateway-mapping.json
 ---
 {
-  "train_station": {
+  "iot_gateway": {
     "properties": {
       "timestamp": {
         "type": "date",
@@ -92,7 +92,7 @@ vi train_station-mapping.json
 ---
 
 curl -XPUT 'http://localhost:9200/festival'
-curl -XPUT 'http://localhost:9200/festival/train_station/_mapping' -d @train_station-mapping.json
+curl -XPUT 'http://localhost:9200/festival/iot_gateway/_mapping' -d @iot_gateway-mapping.json
 ```
 
 ```
@@ -134,7 +134,7 @@ curl -XPUT 'http://localhost:9200/festival/train_station/_mapping' -d @train_sta
       host localhost
       port 9200
       index_name festival
-      type_name train_station
+      type_name iot_gateway
       logstash_format false
       include_tag_key true
       time_key timestamp

data/examples/fluent-festival.conf

@@ -25,9 +25,11 @@
   @label @test0
 </source>
 
-#<match *>
-#  @type stdout
-#</match>
+#<label @test0>
+#  <match *>
+#    @type stdout
+#  </match>
+#</label>
 
 # <label> is not required in a simple use case like this configuration
 # You can just specify tag at filter and match directives

data/examples/{train_station-mapping.json → iot_gateway-mapping.json}

@@ -1,5 +1,5 @@
 {
-  "train_station": {
+  "iot_gateway": {
     "properties": {
       "timestamp": {
         "type": "date",
@@ -10,6 +10,9 @@
       },
       "dataValue": {
         "type": "double"
+      },
+      "location": {
+        "type": "geo_point"
       }
     }
   }

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

data/lib/fluent/plugin/festival_proxy.rb

@@ -99,7 +99,6 @@ module Fluent::Plugin
     def get_data_header
       {
         "Accept": "application/json",
-        "x-nick-name": @email,
         "X-Auth-Token": @session["access_token"]
       }
     end
@@ -108,6 +107,28 @@ module Fluent::Plugin
       Pathname(path).basename.to_s
     end
 
+    def resource_path(path)
+      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)
+        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)
+        # TODO: arbitrary geographicArea type should be supported
+        return result.merge({
+          "location": {
+            "lon": JSON.parse(sensor["location"]["geographicArea"])["coordinates"][0],
+            "lat": JSON.parse(sensor["location"]["geographicArea"])["coordinates"][1]
+          }
+        })
+      end
+      return result
+    end
+
     def get_data
       if !valid_session?
         return nil if create_session.nil?
@@ -123,10 +144,11 @@ module Fluent::Plugin
           get_data_res = @https.get(get_data_request(resource.path), get_data_header)
           next if !error_handler(get_data_res,"get_data failed.")
           log.debug "get_data: #{get_data_res.body}"
-          data << {
+          result = {
             "resourceName": resource.path,
             "dataValue": JSON.parse(get_data_res.body)["dataValue"]
           }
+          data << add_location(result, resource.path)
         when "historical_data" then
           log.error "historical_data is not supported yet"
           next

data/lib/fluent/plugin/in_festival.rb

@@ -21,6 +21,8 @@ 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,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-festival
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Toyokazu Akiyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-16 00:00:00.000000000 Z
+date: 2017-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -79,7 +79,7 @@ files:
 - Rakefile
 - examples/README.md
 - examples/fluent-festival.conf
-- examples/train_station-mapping.json
+- examples/iot_gateway-mapping.json
 - fluent-plugin-festival.gemspec
 - lib/fluent/plugin/festival_proxy.rb
 - lib/fluent/plugin/in_festival.rb