logstash-output-monasca_log_api 0.4 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59bde00a1b625fee42b79d0244c9f5bbb8852ca7
-  data.tar.gz: 906cf828c864a7b3f7d913d96cf26e47677afa10
+  metadata.gz: 574bed4eaf7960e5e102494e439fe7433582f50e
+  data.tar.gz: 3be5356921f6b101be710c2a7eaa057dad41a219
 SHA512:
-  metadata.gz: 53bbbb42df6fcd83d4e7c31fbb93382607d497bcb69cd9585ae06578bf65542422ac661632061aedc71e86d9deeefa009811ea0048e11e944acf83a7e28ea751
-  data.tar.gz: 1154db9689c90dc9fadbe66076efe87c26f54ad04babcda105f6a18467b1056d10d05e16d59ae9f22acaa0092aa44a8e2a4d47bf9de273f07b34af1583bb803b
+  metadata.gz: 847120ddd6fc6a12c87ef8e8828fdfeb54e32e34d458735df35aad317d85b16fe9bf4b5c45f44fa632b8b04dc15047d4497301d5d8741a9405221954f9afb217
+  data.tar.gz: e369ab34daa398a122bddc9e099ee2e1c782e2321f85441849ca5829c37aaf0af598de7007985bd990715e8c63206f4131759c680d972d9d4d5d8226fdbbefde

data/README.md

@@ -121,13 +121,15 @@ Save the configfile wherever you like. For example ~/logstash.conf
 
 | name | description | type | required | default | example |
 | --- | --- | --- | --- | --- | --- |
-| monasca_log_api | monasca log api url | string | true | | http://192.168.10.4:8080 |
-| monasca_log_api_version | monasca log api version | string | false | v3.0 | |
-| keystone_api | keystone api url | string | true | | http://192.168.10.5:35357/v3 |
+| monasca_log_api_url | monasca log api url | string | true | | https://192.168.10.4:5607/v3.0 |
+| monasca_log_api_insecure | set to true if monasca-log-api is using an insecure ssl certificate  | boolean | false | false | |
+| keystone_api_url | keystone api url | string | true | | http://192.168.10.5:35357/v3 |
+| keystone_api_insecure | set to true if keystone is using an insecure ssl certificate | boolean | false | false | |
 | project_name | Keystone user credentials: project name | string | true | | monasca |
 | username | Keystone user credentials: username | string | true | | admin-agent |
 | password | Keystone user credentials: password | string | true | | password |
-| domain_id | Keystone user credentials: domain-id | string | true | | default |
+| user_domain_name | Keystone user credentials: user domain name | string | true | | default |
+| project_domain_name | Keystone user credentials: project domain name | string | true | | default |
 | dimensions | global array dimensions in form of key-value pairs to describe the monitored node | array | false | | ['app_type:kafka', 'priority:high'] |
 | num_of_logs | maximum number of logs that are send by one request to monasca-log-api | number | false | 125 | |
 | elapsed_time_sec | send logs if the maximum elapsed time in seconds is reached | number | false | 30 | |
@@ -140,12 +142,13 @@ Save the configfile wherever you like. For example ~/logstash.conf
 ```bash
 output {
   monasca_log_api {
-    monasca_log_api => "http://192.168.10.4:8074"
-    keystone_api => "http://192.168.10.5:35357/v3"
+    monasca_log_api_url => "http://192.168.10.4:5607/v3.0"
+    keystone_api_url => "http://192.168.10.5:35357/v3"
     project_name => "cmm"
+    project_domain_name => "Default"
     username => "cmm-operator"
+    user_domain_name => "Default"
     password => "admin"
-    domain_id => "default"
   }
 }
 ```
@@ -154,17 +157,19 @@ output {
 ```bash
 output {
   monasca_log_api {
-    monasca_log_api => "http://192.168.10.4:8074"
-    monasca_log_api_version => "v3.0"
-    keystone_api => "http://192.168.10.5:35357/v3"
+    monasca_log_api_url => "https://192.168.10.4:5607/v3.0"
+    monasca_log_api_insecure => true
+    keystone_api_url => "http://192.168.10.5:35357/v3"
+    keystone_api_insecure => false
     project_name => "cmm"
+    project_domain_name => "Default"
     username => "cmm-operator"
+    user_domain_name => "Default"
     password => "admin"
-    domain_id => "default"
-    dimensions => ["hostname:kamil", "ip:10.10.10.10"]
-    num_of_logs => 100
-    delay => 1
-    elapsed_time_sec => 600
+    dimensions => ["hostname: monasca", "ip:192.168.10.4"]
+    num_of_logs => 125
+    delay => 10
+    elapsed_time_sec => 30
     max_data_size_kb => 5120
   }
 }
@@ -206,4 +211,3 @@ input {
 ## Open tasks
 * Language translations (Replace hardcoded String messages with a configuration/language file)
 * Exception handling (monasca-api requests)
-* https support

data/lib/logstash/outputs/keystone/keystone_client.rb

@@ -16,8 +16,9 @@
 
 require 'logstash/environment'
 require 'logger'
+require 'json'
+require 'net/http'
 
-require_relative '../helper/url_helper'
 require_relative './token'
 
 # This class connects to keystone and authenticates an user.
@@ -28,39 +29,43 @@ module LogStash::Outputs
 
       @client = nil
 
-      def initialize(host)
+      def initialize(url, insecure=false)
         @logger = Cabin::Channel.get(LogStash)
-        @client = get_client(host, '/v3/auth/tokens')
+        @uri = URI.parse(url)
+        @http = Net::HTTP.new(@uri.host, @uri.port)
+        if @uri.scheme == 'https'
+          @http.use_ssl = true
+          @http.verify_mode = OpenSSL::SSL::VERIFY_NONE if insecure
+        end
       end
 
-      def authenticate(domain_id, username, password, project_name)
-        auth_hash = generate_hash(domain_id, username, password, project_name)
-        response = request(auth_hash)
+      def authenticate(username, user_domain_name, password, project_name, project_domain_name)
+        auth_hash = generate_hash(username, user_domain_name, password, project_name, project_domain_name)
+        post_header = {
+              'Accept' => 'application/json',
+              'Content-Type' => 'application/json',
+          }
+        response = request('/auth/tokens', post_header, auth_hash)
         handle_response(response)
       end
 
       private
 
-      def request(auth_hash)
-        @client.post(
-          auth_hash,
-          :content_type => 'application/json',
-          :accept => 'application/json')
-      end
-
-      def get_client(host, path)
-        RestClient::Resource.new(
-          LogStash::Outputs::Helper::UrlHelper.generate_url(host, path).to_s)
+      def request(path, header, body)
+        @logger.debug('Sending authentication to ', :url => @uri.to_s)
+        post_request = Net::HTTP::Post.new(@uri.request_uri + path, header)
+        post_request.body = body
+        @http.request(post_request)
       end
 
-      def generate_hash(domain_id, username, password, project_name)
+      def generate_hash(username, user_domain_name, password, project_name, project_domain_name)
         {
           "auth"=>{
             "identity"=>{
               "methods"=>["password"],
               "password"=>{
                 "user"=>{
-                  "domain"=>{"id"=>domain_id},
+                  "domain"=>{"name"=>user_domain_name},
                   "name"=>username,
                   "password"=>password
                 }
@@ -68,7 +73,7 @@ module LogStash::Outputs
             },
             "scope"=>{
               "project"=>{
-                "domain"=>{"id"=>domain_id},
+                "domain"=>{"name"=>project_domain_name},
                 "name"=>project_name
               }
             }
@@ -77,16 +82,16 @@ module LogStash::Outputs
       end
 
       def handle_response(response)
-        case response.code
-        when 201
+        case response
+        when Net::HTTPCreated
           expires_at = DateTime.parse(
             JSON.parse(response.body)["token"]["expires_at"])
 
           @logger.debug("Authentication succeed: code=#{response.code}, "\
-            "auth-token=#{response.headers[:x_subject_token]}, "\
+            "auth-token=#{response['X-Subject-Token']}, "\
             "expires_at=#{expires_at.to_time}")
 
-          {:token => response.headers[:x_subject_token],
+          {:token => response['X-Subject-Token'],
             :expires_at => expires_at}
         else
           @logger.info("Authentication failed. Response=#{response}")

data/lib/logstash/outputs/keystone/token.rb

@@ -24,9 +24,9 @@ module LogStash::Outputs
       include Singleton
       attr_accessor :id, :expires_at, :keystone_client
 
-      def request_new_token(domain_id, username, password, project_name)
+      def request_new_token(username, user_domain_name, password, project_name, project_domain_name)
         token = @keystone_client
-          .authenticate(domain_id, username, password, project_name)
+          .authenticate(username, user_domain_name, password, project_name, project_domain_name)
         set_token(token[:token], token[:expires_at])
         @logger.info("New token requested")
         @logger.debug("token=#{@id}, expire_at=#{@expires_at}")
@@ -37,9 +37,9 @@ module LogStash::Outputs
         @expires_at = expires_at
       end
 
-      def set_keystone_client keystone_api
+      def set_keystone_client(keystone_api, insecure)
         @keystone_client = LogStash::Outputs::Keystone::KeystoneClient
-          .new keystone_api
+          .new(keystone_api, insecure)
       end
 
       def initialize
@@ -57,4 +57,4 @@ module LogStash::Outputs
 
     end
   end
-end
+end

data/lib/logstash/outputs/monasca/monasca_log_api_client.rb

@@ -14,25 +14,23 @@
 
 # encoding: utf-8
 
-require 'rest-client'
 require 'logger'
-require 'singleton'
-
-# relative requirements
-require_relative '../helper/url_helper'
+require 'json'
+require 'net/http'
 
 # This class creates a connection to monasca-log-api
 module LogStash::Outputs
   module Monasca
     class MonascaLogApiClient
 
-      SUPPORTED_API_VERSION = %w(3.0)
-
-      def initialize(host, version)
+      def initialize(url, insecure=false)
         @logger = Cabin::Channel.get(LogStash)
-        rest_client_url = LogStash::Outputs::Helper::UrlHelper
-          .generate_url(host, '/' + check_version(version)).to_s
-        @rest_client = RestClient::Resource.new(rest_client_url)
+        @uri = URI.parse(url)
+        @http = Net::HTTP.new(@uri.host, @uri.port)
+        if @uri.scheme == 'https'
+          @http.use_ssl = true
+          @http.verify_mode = OpenSSL::SSL::VERIFY_NONE if insecure
+        end
       end
 
       def send_logs(logs, auth_token)
@@ -41,7 +39,8 @@ module LogStash::Outputs
               'X-Auth-Token' => auth_token,
               'Content-Type' => 'application/json',
           }
-          request(logs.to_json, post_header)
+          response = request('/logs', post_header, logs.to_json)
+          handle_response(response)
         rescue => e
           @logger.warn('Sending event to monasca-log-api threw exception',
             :exceptionew => e)
@@ -50,20 +49,21 @@ module LogStash::Outputs
 
       private
 
-      def request(body, header)
-        @logger.debug('Sending data to ', :url => @rest_client.url)
-        @rest_client['logs'].post(body, header)
+      def request(path, header, body)
+        @logger.debug('Sending data to ', :url => @uri.to_s)
+        post_request = Net::HTTP::Post.new(@uri.request_uri + path, header)
+        post_request.body = body
+        @http.request(post_request)
       end
 
-      def check_version(version)
-        tmp_version = version.sub('v','')
-
-        unless SUPPORTED_API_VERSION.include? tmp_version
-          raise "#{tmp_version} is not supported, "\
-            "supported versions are #{SUPPORTED_API_VERSION}"
+      def handle_response(response)
+        case response
+        when Net::HTTPNoContent
+          @logger.debug("Successfully sent logs")
+        else
+          # TODO: Handle logs which could not be sent
+          @logger.error("Failed to send logs. Response=#{response}")
         end
-
-        version
       end
 
     end

data/lib/logstash/outputs/monasca_log_api.rb

@@ -32,16 +32,19 @@ class LogStash::Outputs::MonascaLogApi < LogStash::Outputs::Base
   config_name 'monasca_log_api'
 
   # monasca-log-api configuration
-  config :monasca_log_api, :validate => :string, :required => true
-  config :monasca_log_api_version, :validate => :string, :required => false,
-    :default => "v3.0"
+  config :monasca_log_api_url, :validate => :string, :required => true
+  config :monasca_log_api_insecure, :validate => :boolean, :required => false,
+    :default => false
 
   # keystone configuration
-  config :keystone_api, :validate => :string, :required => true
+  config :keystone_api_url, :validate => :string, :required => true
+  config :keystone_api_insecure, :validate => :boolean, :required => false,
+    :default => false
   config :project_name, :validate => :string, :required => true
   config :username, :validate => :string, :required => true
   config :password, :validate => :string, :required => true
-  config :domain_id, :validate => :string, :required => true
+  config :user_domain_name, :validate => :string, :required => true
+  config :project_domain_name, :validate => :string, :required => true
 
   # global dimensions
   config :dimensions, :validate => :array, :required => false
@@ -60,11 +63,12 @@ class LogStash::Outputs::MonascaLogApi < LogStash::Outputs::Base
 
   public
   def register
+    check_config
     @mutex = Mutex.new
     @logger.info('Registering keystone user',
       :username => username, :project_name => project_name)
     @monasca_log_api_client = LogStash::Outputs::Monasca::MonascaLogApiClient
-      .new monasca_log_api, monasca_log_api_version
+      .new monasca_log_api_url, monasca_log_api_insecure
     @logs = Hash.new
     @start_time = nil
     init_token
@@ -87,13 +91,12 @@ class LogStash::Outputs::MonascaLogApi < LogStash::Outputs::Base
 
   def init_token
     token = LogStash::Outputs::Keystone::Token.instance
-    token.set_keystone_client(keystone_api)
+    token.set_keystone_client(keystone_api_url, keystone_api_insecure)
     check_token
   end
 
   def encode(event)
     log = generate_log_from_event(event)
-
     log_bytesize = bytesize_of(log)
     logs_bytesize = bytesize_of(@logs)
 
@@ -163,7 +166,8 @@ class LogStash::Outputs::MonascaLogApi < LogStash::Outputs::Base
   def check_token
     token = LogStash::Outputs::Keystone::Token.instance
     token.request_new_token(
-      domain_id, username, password, project_name) unless token.valid?
+      username, user_domain_name, password,
+      project_name, project_domain_name) unless token.valid?
   end
 
   def start_time_check
@@ -213,4 +217,15 @@ class LogStash::Outputs::MonascaLogApi < LogStash::Outputs::Base
     end
   end
 
+  def check_config
+    bad_val = []
+    bad_val << 'num_of_logs' if num_of_logs <= 0
+    bad_val << 'elapsed_time_sec' if elapsed_time_sec <= 0
+    bad_val << 'delay' if delay <= 0
+    bad_val << 'max_data_size_kb' if max_data_size_kb <= 0
+    unless bad_val.empty?
+      err = "Value of #{bad_val.join(', ')} need to be bigger than 0"
+      raise LogStash::ConfigurationError, err
+    end
+  end
 end

data/logstash-output-monasca_log_api.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-output-monasca_log_api'
-  s.version = '0.4'
+  s.version = '0.5.1'
   s.licenses = ['Apache License 2.0']
   s.summary = 'This gem is a logstash output plugin to connect via http to monasca-log-api.'
   s.description = 'This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program'
@@ -22,9 +22,9 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'logstash-core', '~> 2.0'
   s.add_runtime_dependency 'logstash-codec-plain', '~> 2.0'
   s.add_runtime_dependency 'logstash-codec-json', '~> 2.0'
-  s.add_runtime_dependency 'rest-client', '~> 1.8'
   s.add_runtime_dependency 'vine', '~> 0.2'
   s.add_development_dependency 'logstash-devutils', '~> 0.0.14'
   s.add_development_dependency 'simplecov', '~> 0.10'
   s.add_development_dependency 'rubocop', '~> 0.37.2'
+  s.add_development_dependency 'webmock', '~> 2.0'
 end

data/spec/outputs/keystone/keystone_client_spec.rb

@@ -15,17 +15,22 @@
 # encoding: utf-8
 
 require_relative '../spec_helper'
+require 'webmock/rspec'
 
 describe LogStash::Outputs::Keystone::KeystoneClient do
 
+  let (:keystone_url) { 'http://keystone:5000/v3' }
+  let (:keystone_url_post) { keystone_url + '/auth/tokens' }
+  let (:keystone_url_https) { 'https://keystone:5000/v3' }
   let (:valid_date) { DateTime.now + Rational(1, 1440) }
   let (:token) { "f8cdafb7dce94444ad781a53ddaff693" }
-  let (:valid_token) { {:token => token,
-    :expires_at => valid_date } }
-  let (:domain_id) { "default" }
+  let (:valid_token) { {"token" => token,
+    "expires_at" => valid_date } }
   let (:username) { "operator" }
+  let (:user_domain_name) { "Default" }
   let (:password) { "zPrHGl<IJtn=ux;{&T/nfXh=H" }
   let (:project_name) { "monasca" }
+  let (:project_domain_name) { "Default" }
   let (:auth_hash) {
     {
       "auth"=>{
@@ -33,7 +38,7 @@ describe LogStash::Outputs::Keystone::KeystoneClient do
           "methods"=>["password"],
           "password"=>{
             "user"=>{
-              "domain"=>{"id"=>domain_id},
+              "domain"=>{"name"=>user_domain_name},
               "name"=>username,
               "password"=>password
             }
@@ -41,7 +46,7 @@ describe LogStash::Outputs::Keystone::KeystoneClient do
         },
         "scope"=>{
           "project"=>{
-            "domain"=>{"id"=>domain_id},
+            "domain"=>{"name"=>project_domain_name},
             "name"=>project_name
           }
         }
@@ -49,8 +54,7 @@ describe LogStash::Outputs::Keystone::KeystoneClient do
     }.to_json
   }
 
-  let (:ok_response) { stub_response(201,
-    {:x_subject_token => token},
+  let (:ok_response_body) {
     {
       "token"=>{
         "methods"=>["password"],
@@ -84,11 +88,10 @@ describe LogStash::Outputs::Keystone::KeystoneClient do
         "audit_ids"=>["ORap7R56S2S-p6tFVeMkpg"],
         "issued_at"=>"2015-05-26T07:55:36.774146Z"
       }
-    }.to_json)
+    }.to_json
   }
 
-  let (:failed_response) { stub_response(401,
-    {:x_subject_token => ""},
+  let (:failed_response_body) {
     {
       "error"=>{
         "message"=>"Could not find project: f8cdafb7dce94444ad781a53ddaff693 "\
@@ -96,13 +99,13 @@ describe LogStash::Outputs::Keystone::KeystoneClient do
         "code"=>401,
         "title"=>"Unauthorized"
       }
-    }.to_json)
+    }.to_json
   }
 
   context 'when initializing' do
     it 'then it should register without exceptions' do
-      expect {LogStash::Outputs::Keystone::KeystoneClient.new('hostname:8080')}
-        .to_not raise_error
+      expect {LogStash::Outputs::Keystone::KeystoneClient
+        .new(keystone_url)}.to_not raise_error
     end
 
     it "returns a failure if arguments are missing" do
@@ -113,57 +116,73 @@ describe LogStash::Outputs::Keystone::KeystoneClient do
 
   context 'when authenticates' do
     it 'then it should request to keystone' do
-      expect_any_instance_of(RestClient::Resource).to receive(:post)
-        .with(auth_hash, :content_type => 'application/json',
-          :accept => 'application/json').and_return(ok_response)
+      expect_any_instance_of(Net::HTTP).to receive(:request)
+        .with(an_instance_of(Net::HTTP::Post))
 
       keystone_client = LogStash::Outputs::Keystone::KeystoneClient
-        .new('hostname:8080')
-      keystone_client.authenticate(domain_id, username, password, project_name)
+        .new(keystone_url)
+      keystone_client.authenticate(username, user_domain_name, password, project_name, project_domain_name)
     end
 
     it 'then it should return a token' do
-      expect_any_instance_of(RestClient::Resource).to receive(:post)
-        .and_return(ok_response)
+
+      stub_request(:post, keystone_url_post)
+         .to_return(:status => 201,
+                    :body => ok_response_body,
+                    :headers => { 'X-Subject-Token' => token })
+
       keystone_client = LogStash::Outputs::Keystone::KeystoneClient
-        .new('hostname:8080')
+        .new(keystone_url)
       token = keystone_client
-        .authenticate(domain_id, username, password, project_name)
-      expect(token["token"]).to eq(valid_token["token"])
-      expect(token["expires_at"].to_s).to eq(valid_token["expires_at"].to_s)
+        .authenticate(username, user_domain_name, password, project_name, project_domain_name)
+
+      expect(token[:token]).to eq(valid_token["token"])
+      expect(token[:expires_at].to_s).to eq(valid_token["expires_at"].to_s)
     end
   end
 
   context 'when authentication failed' do
     it 'then it should log an information' do
-      expect_any_instance_of(RestClient::Resource).to receive(:post)
-        .and_return(failed_response)
       expect_any_instance_of(Cabin::Channel).to receive(:info)
 
+      stub_request(:post, keystone_url_post)
+         .to_return(:status => 401,
+                    :body => failed_response_body)
+
       keystone_client = LogStash::Outputs::Keystone::KeystoneClient
-        .new('hostname:8080')
-      keystone_client.authenticate(domain_id, username, password, project_name)
+        .new(keystone_url)
+      keystone_client.authenticate(username, user_domain_name, password, project_name, project_domain_name)
     end
 
     it 'then it should return nil' do
-      expect_any_instance_of(RestClient::Resource).to receive(:post)
-        .and_return(failed_response)
       expect_any_instance_of(Cabin::Channel).to receive(:info)
 
+      stub_request(:post, keystone_url_post)
+         .to_return(:status => 401,
+                    :body => failed_response_body)
+
       keystone_client = LogStash::Outputs::Keystone::KeystoneClient
-        .new('hostname:8080')
+        .new(keystone_url)
       expect(keystone_client
-        .authenticate(domain_id, username, password, project_name)).to eq(nil)
+        .authenticate(username, user_domain_name, password, project_name, project_domain_name)).to eq(nil)
     end
   end
 
-  private
+  context 'when using https' do
+    it 'should change use_ssl property' do
+      client = LogStash::Outputs::Keystone::KeystoneClient
+        .new(keystone_url_https)
+      http = client.instance_variable_get(:@http)
+      expect(http.use_ssl?).to be true
+      expect(http.verify_mode).to eq(nil)
+    end
 
-  def stub_response(code, headers, body)
-    response = double
-    allow(response).to receive(:code) { code }
-    allow(response).to receive(:headers) { headers }
-    allow(response).to receive(:body) { body }
-    response
+    it 'in case of insecure mode it should change verify_mode property' do
+      client = LogStash::Outputs::Keystone::KeystoneClient
+        .new(keystone_url_https, true)
+      http = client.instance_variable_get(:@http)
+      expect(http.use_ssl?).to be true
+      expect(http.verify_mode).to eq(OpenSSL::SSL::VERIFY_NONE)
+    end
   end
-end
+end

data/spec/outputs/monasca/monasca_log_api_client_spec.rb

@@ -15,65 +15,117 @@
 # encoding: utf-8
 
 require_relative '../spec_helper'
+require 'webmock/rspec'
 
 describe LogStash::Outputs::Monasca::MonascaLogApiClient do
 
-  let (:version) { '3.0' }
-  let (:valid_date) { DateTime.now + Rational(1, 1440) }
-  let (:token) { LogStash::Outputs::Keystone::Token
-    .instance.set_token('abc', valid_date) }
-  let (:logs) {  }
+  let (:monasca_log_api_url) { 'http://monasca-log-api:5607/v3.0' }
+  let (:monasca_log_api_url_https) { 'https://monasca-log-api:5607/v3.0' }
+  let (:monasca_log_api_url_post) { monasca_log_api_url + "/logs" }
+  let (:token) { "f8cdafb7dce94444ad781a53ddaff693" }
+  let (:logs) {
+    {
+      "dimensions" =>
+        { "hostname" => "monasca",
+          "ip" => "192.168.10.4"
+        },
+      "logs" =>
+        [
+          {
+            "message" => "x-image-meta-min_disk: 0",
+            "dimensions" =>
+              {
+                "path" => "/var/log/monasca/log-api/info.log",
+                "service" => "monasca-log-api",
+                "language" => "python"
+              }
+          }
+        ]
+    }
+  }
+
   let (:header) { header = { 'X-Auth-Token' => token,
     'Content-Type' => 'application/json' } }
 
-  before(:each) do
-    stub_const(
-      "LogStash::Outputs::Monasca::MonascaLogApiClient::SUPPORTED_API_VERSION",
-      [version])
-  end
-
   context 'when initializing' do
     it 'then it should register without exceptions' do
       expect {LogStash::Outputs::Monasca::MonascaLogApiClient
-        .new('hostname:8080', 'v3.0')}.to_not raise_error
+        .new(monasca_log_api_url)}.to_not raise_error
+
+      expect {LogStash::Outputs::Monasca::MonascaLogApiClient
+        .new(monasca_log_api_url, false)}.to_not raise_error
+
+      expect {LogStash::Outputs::Monasca::MonascaLogApiClient
+        .new(monasca_log_api_url, true)}.to_not raise_error
     end
   end
 
   context 'when requesting to monasca-log-api' do
     it 'sends x-auth-token and content-type in header, logs in body' do
+      expect_any_instance_of(Cabin::Channel).to_not receive(:error)
+
+      stub_request(:post, monasca_log_api_url_post)
+        .with(:headers => {
+          'Accept'=>'*/*',
+          'Content-Type'=>'application/json',
+          'User-Agent'=>'Ruby',
+          'X-Auth-Token'=>'f8cdafb7dce94444ad781a53ddaff693'})
+        .to_return(:status => 204)
+
       client = LogStash::Outputs::Monasca::MonascaLogApiClient
-        .new('hostname:8080', 'v3.0')
-      expect_any_instance_of(RestClient::Resource).to receive(:post)
-        .with(logs.to_json, header)
+        .new(monasca_log_api_url)
+
       client.send_logs(logs, token)
     end
   end
 
+  context 'when using https' do
+    it 'should change use_ssl property' do
+      client = LogStash::Outputs::Monasca::MonascaLogApiClient
+        .new(monasca_log_api_url_https)
+      http = client.instance_variable_get(:@http)
+      expect(http.use_ssl?).to be true
+      expect(http.verify_mode).to eq(nil)
+    end
+
+    it 'in case of insecure mode it should change verify_mode property' do
+      client = LogStash::Outputs::Monasca::MonascaLogApiClient
+        .new(monasca_log_api_url_https, true)
+      http = client.instance_variable_get(:@http)
+      expect(http.use_ssl?).to be true
+      expect(http.verify_mode).to eq(OpenSSL::SSL::VERIFY_NONE)
+    end
+  end
+
   context 'when request failed' do
-    it 'rescued the exception and logs a failure' do
+    it 'logs a failure' do
+      expect_any_instance_of(Cabin::Channel).to receive(:error)
+
+      stub_request(:post, monasca_log_api_url_post)
+        .with(:headers => {
+          'Accept'=>'*/*',
+          'Content-Type'=>'application/json',
+          'User-Agent'=>'Ruby',
+          'X-Auth-Token'=>'f8cdafb7dce94444ad781a53ddaff693'})
+        .to_return(:status => 401)
+
       client = LogStash::Outputs::Monasca::MonascaLogApiClient
-        .new('hostname:8080', 'v3.0')
-      expect_any_instance_of(Cabin::Channel).to receive(:warn)
-      expect_any_instance_of(RestClient::Resource).to receive(:post)
-        .and_raise(Errno::ECONNREFUSED)
+        .new(monasca_log_api_url)
+
       client.send_logs(logs, token)
     end
   end
 
-  context 'api version checking' do
-    it 'should pass for correct version' do
-      expect {LogStash::Outputs::Monasca::MonascaLogApiClient
-        .new('hostname:8080', 'v3.0')}.to_not raise_error
-    end
+  context 'when request throws an exception' do
+    it 'rescued the exception and logs a failure' do
+      expect_any_instance_of(Cabin::Channel).to receive(:warn)
 
-    it 'should pass if version does not specify v' do
-      expect {LogStash::Outputs::Monasca::MonascaLogApiClient
-        .new('hostname:8080', '3.0')}.to_not raise_error
-    end
+      stub_request(:post, monasca_log_api_url_post)
+        .to_raise(Errno::ECONNREFUSED)
 
-    it 'should fail for unsupported version' do
-      expect {LogStash::Outputs::Monasca::MonascaLogApiClient
-        .new('hostname:8080', 'v4.0')}.to raise_exception
+      client = LogStash::Outputs::Monasca::MonascaLogApiClient
+        .new(monasca_log_api_url)
+      client.send_logs(logs, token)
     end
   end
 

data/spec/outputs/monasca_log_api_spec.rb

@@ -25,7 +25,7 @@ describe 'outputs/monasca_log_api' do
       '@version' => '1',
       '@timestamp' => '2015-08-13T08:37:00.287Z',
       'path' => '/opt/logstash-2.2.0/test.log',
-      'host' => 'kamil-choroba',
+      'host' => 'monasca',
       'type' => 'test-type',
       'tags' => ['test-service', 'high']
     })
@@ -56,7 +56,7 @@ describe 'outputs/monasca_log_api' do
       '@version' => '1',
       '@timestamp' => '2015-08-13T08:37:00.287Z',
       'path' => '/opt/logstash-2.2.0/test.log',
-      'host' => 'kamil-choroba',
+      'host' => 'monasca',
       'type' => 'test-type',
       'dimensions' => '["[\"service\", \"nova\"]", "[\"priority\", \"high\"]"]',
       'tags' => ['test-service', 'high']
@@ -69,7 +69,7 @@ describe 'outputs/monasca_log_api' do
       '@version' => '1',
       '@timestamp' => '2015-08-13T08:37:00.287Z',
       'path' => '/opt/logstash-2.2.0/test.log',
-      'host' => 'kamil-choroba',
+      'host' => 'monasca',
       'type' => 'test-type',
       'tags' => ['test-service', 'high']
     })
@@ -81,7 +81,7 @@ describe 'outputs/monasca_log_api' do
       '@version' => '1',
       '@timestamp' => '2015-08-13T08:37:00.287Z',
       'path' => '/opt/logstash-2.2.0/test.log',
-      'host' => 'kamil-choroba',
+      'host' => 'monasca',
       'type' => 'test-type',
       'dimensions' => '["service", "nova"]',
       'tags' => ['test-service', 'high']
@@ -94,7 +94,7 @@ describe 'outputs/monasca_log_api' do
       '@version' => '1',
       '@timestamp' => '2015-08-13T08:37:00.287Z',
       'path' => '/opt/logstash-2.2.0/test.log',
-      'host' => 'kamil-choroba',
+      'host' => 'monasca',
       'type' => 'test-type',
       'dimensions' => '["[\"service\", \"nova\"]", "[\"priority\", \"high\"]"]',
       'tags' => ['test-service', 'high']
@@ -102,18 +102,25 @@ describe 'outputs/monasca_log_api' do
   }
 
   let (:project_name) { 'monasca' }
+  let (:project_domain_name) { 'Admin' }
   let (:username) { 'operator' }
+  let (:user_domain_name) { 'Default' }
   let (:password) { 'qweqwe' }
 
+  let (:monasca_log_api_url) { 'http://192.168.10.4:5607/v3.0' }
+  let (:keystone_api_url) { 'http://192.168.10.5:5000/v3' }
+
   let (:complete_config) {
     {
-      'monasca_log_api' => 'http://192.168.10.4:8080',
-      'monasca_log_api_version' => 'v3.0',
-      'keystone_api' => 'http://192.168.10.5:5000',
+      'monasca_log_api_url' => monasca_log_api_url,
+      'monasca_log_api_insecure' => false,
+      'keystone_api_url' => keystone_api_url,
+      'keystone_api_insecure' => false,
       'project_name' => project_name,
+      'project_domain_name' => project_domain_name,
       'username' => username,
+      'user_domain_name' => user_domain_name,
       'password' => password,
-      'domain_id' => 'abadcf984cf7401e88579d393317b0d9',
       'dimensions' => ['service:test'],
       'num_of_logs' => 3,
       'elapsed_time_sec' => 5000,
@@ -124,13 +131,15 @@ describe 'outputs/monasca_log_api' do
 
   let (:complete_config_short_elapsed_time) {
     {
-      'monasca_log_api' => 'http://192.168.10.4:8080',
-      'monasca_log_api_version' => 'v3.0',
-      'keystone_api' => 'http://192.168.10.5:5000',
+      'monasca_log_api_url' => monasca_log_api_url,
+      'monasca_log_api_insecure' => false,
+      'keystone_api_url' => keystone_api_url,
+      'keystone_api_insecure' => false,
       'project_name' => project_name,
+      'project_domain_name' => project_domain_name,
       'username' => username,
+      'user_domain_name' => user_domain_name,
       'password' => password,
-      'domain_id' => 'abadcf984cf7401e88579d393317b0d9',
       'dimensions' => ['service:test'],
       'num_of_logs' => 3,
       'elapsed_time_sec' => 1,
@@ -141,12 +150,29 @@ describe 'outputs/monasca_log_api' do
 
   let (:simple_config) {
     {
-      'monasca_log_api' => 'http://192.168.10.4:8080',
-      'keystone_api' => 'http://192.168.10.5:5000',
+      'monasca_log_api_url' => monasca_log_api_url,
+      'keystone_api_url' => keystone_api_url,
+      'project_name' => project_name,
+      'project_domain_name' => project_domain_name,
+      'username' => username,
+      'user_domain_name' => user_domain_name,
+      'password' => password,
+    }
+  }
+
+  let (:config_negative) {
+    {
+      'monasca_log_api_url' => monasca_log_api_url,
+      'keystone_api_url' => keystone_api_url,
       'project_name' => project_name,
+      'project_domain_name' => project_domain_name,
       'username' => username,
+      'user_domain_name' => user_domain_name,
       'password' => password,
-      'domain_id' => 'abadcf984cf7401e88579d393317b0d9',
+      'num_of_logs' => rand(-999_999..-1),
+      'elapsed_time_sec' => rand(-999_999..-1),
+      'delay' => rand(-999_999..-1),
+      'max_data_size_kb' => rand(-999_999..-1),
     }
   }
 
@@ -179,8 +205,7 @@ describe 'outputs/monasca_log_api' do
       monasca_log_api = LogStash::Plugin.lookup('output', 'monasca_log_api')
         .new(simple_config)
 
-      expect(monasca_log_api.monasca_log_api_version).to be_instance_of(String)
-      expect(monasca_log_api.monasca_log_api_version).not_to be_empty
+      expect(monasca_log_api.monasca_log_api_insecure).to be_falsey
       expect(monasca_log_api.dimensions).to be_nil
       expect(monasca_log_api.num_of_logs).to be_instance_of(Fixnum)
       expect(monasca_log_api.elapsed_time_sec).to be_instance_of(Fixnum)
@@ -192,8 +217,8 @@ describe 'outputs/monasca_log_api' do
       monasca_log_api = LogStash::Plugin.lookup('output', 'monasca_log_api')
         .new(complete_config)
 
-      expect(monasca_log_api.monasca_log_api_version)
-        .to eq(complete_config['monasca_log_api_version'])
+      expect(monasca_log_api.monasca_log_api_insecure)
+        .to eq(complete_config['monasca_log_api_insecure'])
       expect(monasca_log_api.dimensions).to eq(complete_config['dimensions'])
       expect(monasca_log_api.num_of_logs).to eq(complete_config['num_of_logs'])
       expect(monasca_log_api.elapsed_time_sec)
@@ -202,6 +227,14 @@ describe 'outputs/monasca_log_api' do
       expect(monasca_log_api.max_data_size_kb)
         .to eq(complete_config['max_data_size_kb'])
     end
+
+    it 'with negative numbers in configuration, then raise error' do
+      monasca_log_api = LogStash::Plugin.lookup('output', 'monasca_log_api')
+        .new(config_negative)
+
+      expect { monasca_log_api.register }
+        .to raise_error(LogStash::ConfigurationError), config_negative.to_s
+    end
   end
 
   context 'when registering' do
@@ -406,10 +439,11 @@ describe 'outputs/monasca_log_api' do
       expect_any_instance_of(LogStash::Outputs::Monasca::MonascaLogApiClient)
         .to receive(:send_logs)
       expect_any_instance_of(LogStash::Outputs::Keystone::KeystoneClient)
-        .to receive(:authenticate).with(complete_config['domain_id'],
-          complete_config['username'],
+        .to receive(:authenticate).with(complete_config['username'],
+          complete_config['user_domain_name'],
           complete_config['password'],
-          complete_config['project_name'])
+          complete_config['project_name'],
+          complete_config['project_domain_name'])
         .and_return(expired_token, valid_token)
       monasca_log_api = LogStash::Outputs::MonascaLogApi.new(complete_config)
       allow(monasca_log_api).to receive(:start_time_check)

data/spec/outputs/spec_helper.rb

@@ -13,6 +13,7 @@
 # the License.
 
 # encoding: utf-8
+require 'yaml'
 
 require 'simplecov'
 SimpleCov.start do
@@ -26,7 +27,3 @@ require_relative '../../lib/logstash/outputs/monasca_log_api'
 require_relative '../../lib/logstash/outputs/keystone/keystone_client'
 require_relative '../../lib/logstash/outputs/keystone/token'
 require_relative '../../lib/logstash/outputs/monasca/monasca_log_api_client'
-require_relative '../../lib/logstash/outputs/helper/url_helper'
-
-require 'yaml'
-require 'rest-client'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-monasca_log_api
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: 0.5.1
 platform: ruby
 authors:
 - Fujitsu Enabling Software Technology GmbH
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-04-20 00:00:00.000000000 Z
+date: 2016-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-core
@@ -52,20 +52,6 @@ dependencies:
         version: '2.0'
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: rest-client
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.8'
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.8'
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: vine
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,6 +108,20 @@ dependencies:
         version: 0.37.2
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: webmock
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  prerelease: false
+  type: :development
 description: This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program
 email: kamil.choroba@est.fujitsu.com,tomasz.trebski@ts.fujitsu.com
 executables: []
@@ -131,13 +131,11 @@ files:
 - Gemfile
 - LICENSE
 - README.md
-- lib/logstash/outputs/helper/url_helper.rb
 - lib/logstash/outputs/keystone/keystone_client.rb
 - lib/logstash/outputs/keystone/token.rb
 - lib/logstash/outputs/monasca/monasca_log_api_client.rb
 - lib/logstash/outputs/monasca_log_api.rb
 - logstash-output-monasca_log_api.gemspec
-- spec/outputs/helper/url_helper_spec.rb
 - spec/outputs/keystone/keystone_client_spec.rb
 - spec/outputs/keystone/token_spec.rb
 - spec/outputs/monasca/monasca_log_api_client_spec.rb
@@ -170,7 +168,6 @@ signing_key:
 specification_version: 4
 summary: This gem is a logstash output plugin to connect via http to monasca-log-api.
 test_files:
-- spec/outputs/helper/url_helper_spec.rb
 - spec/outputs/keystone/keystone_client_spec.rb
 - spec/outputs/keystone/token_spec.rb
 - spec/outputs/monasca/monasca_log_api_client_spec.rb

data/lib/logstash/outputs/helper/url_helper.rb

@@ -1,29 +0,0 @@
-# Copyright 2016 FUJITSU LIMITED
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not
-# use this file except in compliance with the License. You may obtain a copy of
-# the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations under
-# the License.
-
-# encoding: utf-8
-
-require 'uri'
-
-module LogStash::Outputs
-  module Helper
-    class UrlHelper
-      def self.generate_url(host, path)
-        uri = URI.parse(host)
-        URI::HTTP.new(uri.scheme, nil, uri.host, uri.port, nil, path, nil,
-          nil, nil)
-      end
-    end
-  end
-end

data/spec/outputs/helper/url_helper_spec.rb

@@ -1,43 +0,0 @@
-# Copyright 2016 FUJITSU LIMITED
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not
-# use this file except in compliance with the License. You may obtain a copy of
-# the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations under
-# the License.
-
-# encoding: utf-8
-
-require_relative '../spec_helper'
-
-describe LogStash::Outputs::Helper::UrlHelper do
-
-  describe ".generate_url" do
-    it "generates a URI::HTTP object" do
-      expect(LogStash::Outputs::Helper::UrlHelper
-        .generate_url('http://192.168.10.5:8080', '/v2.0')).to be_a URI::HTTP
-    end
-
-    it "should match a http url" do
-      expect(LogStash::Outputs::Helper::UrlHelper
-        .generate_url('http://192.168.10.5:8080', '/v2.0').to_s)
-      .to eq('http://192.168.10.5:8080/v2.0')
-      expect(LogStash::Outputs::Helper::UrlHelper
-        .generate_url('http://est.fujitsu:40', nil).to_s)
-      .to eq('http://est.fujitsu:40')
-      expect(LogStash::Outputs::Helper::UrlHelper
-        .generate_url('http://est.fujitsu:80', nil).to_s)
-      .to eq('http://est.fujitsu')
-      expect(LogStash::Outputs::Helper::UrlHelper
-        .generate_url('https://192.168.10.5:8080', '/v2.0').to_s)
-      .to eq('https://192.168.10.5:8080/v2.0')
-    end
-  end
-
-end