fluent-plugin-festival 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39f17a14ffb311c60b34d91173456b7f5dcb42ee
-  data.tar.gz: e2afc237a7290b637d502b2a13d19c94c451da29
+  metadata.gz: bbcf0080a756a3a28db069b2a68035e09c77333e
+  data.tar.gz: 61642c76c8f8f002f25c1f8531faea27c987dbe4
 SHA512:
-  metadata.gz: 0b46e4b7db77cfd24bbd5993f4b4cea7e304e475366fff713562419c7c47a5b23185b0ec25eb827d8d579ee4810c6c5834cab2e4b74e6e6efe85e9a5455659d2
-  data.tar.gz: 3224d8f695a96136f36c1a0d9a269d48d4d6fb7dc2907cc9e6e2eaddccd91387af682c479a075c9d3d105b7cae80eccf62951b369ef9368f8f1f1fd7a894d283
+  metadata.gz: 462dd1a294995d5d706444df5fada12ea58fd3da35e3f7830dc4cb8b745a5896e4db997a0616542d2ddfcfe08e3e564bb8ae82a09770788385ffc6f57930afa7
+  data.tar.gz: b5275ddc0aba66472bfc1bc9acc82d69a36255f78e54fcd0fb2a0028d700dd57dc429e1281fde1f54fd5209c1747dc90b8f7e8ca39a3049d4e362cdea8d25cab

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.12"
+  spec.version       = "0.0.13"
   spec.authors       = ["Toyokazu Akiyama"]
   spec.email         = ["toyokazu@gmail.com"]
 
@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.2.0'
 
-  spec.add_dependency 'fluentd', '~> 0.14.0'
+  spec.add_dependency 'fluentd', '>= 0.14.0'
 
   spec.add_development_dependency "bundler", "~> 1.14"
   spec.add_development_dependency "rake", "~> 12.0"

data/lib/fluent/plugin/festival_proxy.rb

@@ -89,7 +89,13 @@ module Fluent::Plugin
     def get_data_request(path)
       #get_data_req = @uri + target_path(type)
 
-      get_data_req = @uri + Pathname("/festival/eaas/experimentation/#{WEBrick::HTTPUtils.escape(path)}").cleanpath.to_s
+      get_data_req = @uri +
+        case @api_type
+        when 'sensinact' 
+          Pathname("/sensinact/providers/#{WEBrick::HTTPUtils.escape(path)}").cleanpath.to_s
+        else # default (festival)
+          Pathname("/festival/eaas/experimentation/#{WEBrick::HTTPUtils.escape(path)}").cleanpath.to_s
+        end
       #get_data_req.query = URI.encode_www_form(get_data_params)
       log.debug "#{get_data_req}"
       # currently time window is automatically updated
@@ -98,18 +104,31 @@ module Fluent::Plugin
     end
 
     def get_data_header
-      {
-        "Accept": "application/json",
-        "X-Auth-Token": @session["access_token"]
+      header = {
+        "Accept": "application/json"
       }
+      if @api_type == 'festival'
+        return header.merge("X-Auth-Token": @session["access_token"])
+      end
+      header
     end
 
     def resource_type(path)
-      Pathname(path).basename.to_s
+      case @api_type
+      when 'sensinact'
+        "current_data"
+      else
+        Pathname(path).basename.to_s
+      end
     end
 
     def resource_path(path)
-      Pathname(path).dirname.to_s
+      case @api_type
+      when 'sensinact'
+        path
+      else
+        Pathname(path).dirname.to_s
+      end
     end
 
     def add_location(result, resource)
@@ -139,7 +158,7 @@ module Fluent::Plugin
     end
 
     def get_data
-      if !valid_session?
+      if !valid_session? && @api_type == 'festival'
         return nil if create_session.nil?
         log.debug "session #{@session} created."
       end
@@ -153,10 +172,22 @@ 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}"
-          result = {
-            "resourceName": resource.path,
-            "dataValue": JSON.parse(get_data_res.body)["dataValue"]
-          }
+          result = 
+            case @api_type
+            when 'festival'
+              {
+                "resourceName": resource.path,
+                "dataValue": JSON.parse(get_data_res.body)["dataValue"]
+              }
+            when 'sensinact'
+              {
+                "resourceName": resource.path,
+                "dataValue": JSON.parse(get_data_res.body)["response"]["value"],
+                "timestamp": JSON.parse(get_data_res.body)["response"]["timestamp"]
+              }
+            else
+              return nil
+            end
           data << add_location(result, resource)
         when "historical_data" then
           log.error "historical_data is not supported yet"

data/lib/fluent/plugin/in_festival.rb

@@ -13,6 +13,8 @@ module Fluent::Plugin
 
     desc 'FESTIVAL EaaS API URI'
     config_param :api_uri, :string, default: 'https://api.festival-project.eu'
+    desc 'API Type (festival or sensinact)'
+    config_param :api_type, :string, default: 'festival'
     desc 'email (login_name) for FESTIVAL EaaS API'
     config_param :email, :string
     desc 'password for FESTIVAL EaaS API'

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-festival
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Toyokazu Akiyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-31 00:00:00.000000000 Z
+date: 2018-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.14.0
 - !ruby/object:Gem::Dependency
@@ -105,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: Fluent Input/Output plugin for FESTIVAL platform