logstash-output-monasca_log_api 0.3.3 → 0.4

data/spec/outputs/spec_helper.rb

@@ -1,16 +1,16 @@
-=begin
-Copyright 2015 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.
-=end
+# 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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-monasca_log_api
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: '0.4'
 platform: ruby
 authors:
 - Fujitsu Enabling Software Technology GmbH
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-12-03 00:00:00.000000000 Z
+date: 2016-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-core
@@ -16,12 +16,12 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.0'
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -30,12 +30,12 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.6
+        version: '2.0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.6
+        version: '2.0'
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -44,12 +44,12 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.6
+        version: '2.0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.6
+        version: '2.0'
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -108,6 +108,20 @@ dependencies:
         version: '0.10'
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.37.2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.37.2
+  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: []
@@ -126,8 +140,8 @@ 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_api_client_spec.rb
-- spec/outputs/monasca_api_spec.rb
+- spec/outputs/monasca/monasca_log_api_client_spec.rb
+- spec/outputs/monasca_log_api_spec.rb
 - spec/outputs/spec_helper.rb
 homepage: https://github.com/FujitsuEnablingSoftwareTechnologyGmbH/logstash-output-monasca_api
 licenses:
@@ -159,6 +173,6 @@ 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_api_client_spec.rb
-- spec/outputs/monasca_api_spec.rb
+- spec/outputs/monasca/monasca_log_api_client_spec.rb
+- spec/outputs/monasca_log_api_spec.rb
 - spec/outputs/spec_helper.rb

data/spec/outputs/monasca/monasca_api_client_spec.rb

@@ -1,105 +0,0 @@
-=begin
-Copyright 2015 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.
-=end
-
-# encoding: utf-8
-
-require_relative '../spec_helper'
-
-describe LogStash::Outputs::Monasca::MonascaLogApiClient do
-  let (:version) { "v2.0" }
-
-  let (:auth_hash) { "{\"auth\":{\"identity\":{\"methods\":[\"password\"],\"password\":{\"user\":{\"domain\":{\"id\":\"1051bd27b9394120b26d8b08847325c0\"},\"name\":\"csi-operator\",\"password\":\"password\"}}},\"scope\":{\"project\":{\"domain\":{\"id\":\"1051bd27b9394120b26d8b08847325c0\"},\"name\":\"csi\"}}}}" }
-
-  let (:ok_response) { stub_response(201, {:x_subject_token => "f8cdafb7dce94444ad781a53ddaff693"}, "{\"token\":{\"methods\":[\"password\"],\"roles\":[{\"id\":\"9fe2ff9ee4384b1894a90878d3e92bab\",\"name\":\"_member_\"},{\"id\":\"4e9ef1ffe73446c6b02f8fce0585c307\",\"name\":\"monasca-user\"}],\"expires_at\":\"2015-05-26T08:55:36.774122Z\",\"project\":{\"domain\":{\"id\":\"default\",\"name\":\"Default\"},\"id\":\"1051bd27b9394120b26d8b08847325c0\",\"name\":\"mini-mon\"},\"user\":{\"domain\":{\"id\":\"default\",\"name\":\"Default\"},\"id\":\"06ecc9869b8e4846b2fce3e5759ba4af\",\"name\":\"mini-mon\"},\"audit_ids\":[\"ORap7R56S2S-p6tFVeMkpg\"],\"issued_at\":\"2015-05-26T07:55:36.774146Z\"}}") }
-
-  let (:failed_response) { stub_response(401, {:x_subject_token => "f8cdafb7dce94444ad781a53ddaff693"}, "{\"error\": {\"message\": \"Could not find project: f8cdafb7dce94444ad781a53ddaff693 (Disable debug mode to suppress these details.)\", \"code\": 401, \"title\": \"Unauthorized\"}}") }
-
-  let (:data) { LogStash::Event.new({'message' => '2015-08-13 08:36:59,316 INFO monasca_notification.main Received signal 17, beginning graceful shutdown.',
-                                      '@version' => '1',
-                                      '@timestamp' => '2015-08-13T08:37:00.287Z',
-                                      'type' => 'notification',
-                                      'service' => 'notification',
-                                      'host' => 'monasca',
-                                      'path' => '/var/log/monasca/notification/notification.log'}) }
-
-  let (:token) { LogStash::Outputs::Keystone::Token.new('abc', DateTime.now + Rational(5, 1440)) }
-
-  let (:dimensions) { { 'hostname' => 'monasca' } }
-
-  context 'when initializing' do
-    it 'then it should register without exceptions' do
-      expect {LogStash::Outputs::Monasca::MonascaLogApiClient.new('hostname:8080', version)}.to_not raise_error
-    end
-
-    it "returns a failure if arguments are missing" do
-      # noinspection RubyArgCount
-      expect {LogStash::Outputs::Monasca::MonascaLogApiClient.new}.to raise_exception(ArgumentError)
-    end
-  end
-
-  context 'when sending events' do
-  	it 'with dimensions then it should request monasca' do
-      expect_any_instance_of(RestClient::Resource).to receive(:post)
-        .with(data, :x_auth_token => token, :content_type => 'application/json', :x_dimensions => dimensions)
-      monasca_log_api_client = LogStash::Outputs::Monasca::MonascaLogApiClient.new('hostname:8080', version)
-      monasca_log_api_client.send_event(nil, data, token, dimensions)
-  	end
-
-  	it 'without dimensions then it should request monasca' do
-      expect_any_instance_of(RestClient::Resource).to receive(:post)
-        .with(data, :x_auth_token => token, :content_type => 'application/json')
-      monasca_log_api_client = LogStash::Outputs::Monasca::MonascaLogApiClient.new('hostname:8080', version)
-      monasca_log_api_client.send_event(nil, data, token, nil)
-    end
-
-    it 'with application_type then it should request monasca with that value' do
-      app_type = 'someapp'
-      expect_any_instance_of(RestClient::Resource).to receive(:post)
-        .with(data, :x_auth_token => token, :content_type => 'application/json', :x_application_type => app_type)
-      monasca_log_api_client = LogStash::Outputs::Monasca::MonascaLogApiClient.new('hostname:8080', version)
-      monasca_log_api_client.send_event(nil, data, token, nil, app_type)
-    end
-  end
-
-  context 'when sending events failes' do
-  	it 'then it should be rescued and a warn log printed' do
-  	  expect_any_instance_of(Cabin::Channel).to receive(:warn)
-      monasca_log_api_client = LogStash::Outputs::Monasca::MonascaLogApiClient.new('hostname:8080', version)
-      allow(monasca_log_api_client).to receive(:request).and_raise('an_error')
-      monasca_log_api_client.send_event(nil, data, token, dimensions)
-  	end
-  end
-
-  context 'api version checking' do
-
-    let (:supported_version) { %w(v2.0) }
-
-    it 'should pass for correct version' do
-      supported_version.each { |ver|
-        expect {LogStash::Outputs::Monasca::MonascaLogApiClient.new('hostname:8080', ver)}.to_not raise_error
-      }
-    end
-
-    it 'should pass if version does not specify v' do
-      ver = '2.0'
-      expect {LogStash::Outputs::Monasca::MonascaLogApiClient.new('hostname:8080', ver)}.to_not raise_error
-    end
-
-    it 'should fail for unsupported version' do
-      ver = 'v4.0'
-      expect {LogStash::Outputs::Monasca::MonascaLogApiClient.new('hostname:8080', ver)}.to raise_exception
-    end
-  end
-
-end

data/spec/outputs/monasca_api_spec.rb

@@ -1,131 +0,0 @@
-=begin
-Copyright 2015 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.
-=end
-
-# encoding: utf-8
-
-require_relative 'spec_helper'
-
-describe 'outputs/monasca_log_api' do
-
-  let (:expected_application_type) { 'notification' }
-
-  let (:event) { LogStash::Event.new({'message' => '2015-08-13 08:36:59,316 INFO monasca_notification.main Received signal 17, beginning graceful shutdown.',
-                                      '@version' => '1',
-                                      '@timestamp' => '2015-08-13T08:37:00.287Z',
-                                      'type' => expected_application_type,
-                                      'service' => 'notification',
-                                      'host' => 'monasca',
-                                      'path' => '/var/log/monasca/notification/notification.log'}) }
-
-  let (:shutdown_event) { LogStash::SHUTDOWN }
-
-  let (:simple_config) { {'monasca_log_api' => 'http://192.168.10.4:8080',
-      'keystone_api' => 'http://192.168.10.5:5000',
-      'domain_id' => 'abadcf984cf7401e88579d393317b0d9',
-      'username' => 'username',
-      'password' => 'password',
-      'project_name' => 'project_name'} }
-
-  let (:token_id) { LogStash::Outputs::Keystone::Token.new('abc', DateTime.now + Rational(5, 1440)) }
-
-  let (:old_token_id) { LogStash::Outputs::Keystone::Token.new('def', DateTime.now - Rational(5, 1440)) }
-
-  context 'when initializing' do
-    it 'then it should register without exceptions' do
-      monasca_log_api = LogStash::Plugin.lookup('output', 'monasca_log_api').new(simple_config)
-      allow(monasca_log_api).to receive(:get_token).and_return(token_id)
-      expect {monasca_log_api.register}.to_not raise_error
-    end
-
-    it "should set a default application_type_key to \"type\"" do
-      monasca_log_api = LogStash::Plugin.lookup('output', 'monasca_log_api').new(simple_config)
-      expect(monasca_log_api.instance_variable_get('@application_type_key')).to eq("type")
-    end
-
-    it 'should use passed variable from config as application_type_key' do
-      expected_key = 'mountain_dew'
-      simple_config_copy = simple_config.clone
-      simple_config_copy['application_type_key'] = expected_key
-      monasca_log_api = LogStash::Plugin.lookup('output', 'monasca_log_api').new(simple_config_copy)
-
-      expect(monasca_log_api.instance_variable_get('@application_type_key')).to eq(expected_key)
-    end
-
-  end
-
-  context 'when receiving messages' do
-    it 'then it should be send to monasca-log-api' do
-      expect_any_instance_of(LogStash::Outputs::Monasca::MonascaLogApiClient).to receive(:send_event)
-        .with(event, event.to_hash.to_json, token_id.id, nil, expected_application_type)
-      monasca_log_api = LogStash::Outputs::MonascaLogApi.new(simple_config)
-
-      allow(monasca_log_api).to receive(:get_token).and_return(token_id)
-      allow(monasca_log_api).to receive(:get_application_type).and_call_original
-
-      monasca_log_api.register
-      monasca_log_api.receive(event)
-    end
-
-    it 'then it should check the token_id and renew it when its deprecated' do
-      expect_any_instance_of(LogStash::Outputs::Keystone::KeystoneClient).to receive(:authenticate)
-        .with(simple_config['domain_id'], simple_config['username'], simple_config['password'], simple_config['project_name'])
-      monasca_log_api = LogStash::Outputs::MonascaLogApi.new(simple_config)
-      allow(monasca_log_api).to receive(:get_token).and_return(old_token_id)
-      monasca_log_api.register
-      allow(monasca_log_api).to receive(:get_token).and_call_original
-      allow(monasca_log_api).to receive(:send_event)
-      monasca_log_api.receive(event)
-    end
-  end
-
-  context 'when given dictionary as type in received message' do
-    it 'should read application_type from it properly' do
-      type_dict = {
-          "application_type" => 'notification'
-      }
-      config = simple_config.merge({"application_type_key" => 'type.application_type'})
-
-      event = LogStash::Event.new({"message" => '2015-08-13 08:36:59,316 INFO monasca_notification.main Received signal 17, beginning graceful shutdown.',
-                                   "@version" => '1',
-                                   "@timestamp" => '2015-08-13T08:37:00.287Z',
-                                   "type" => type_dict,
-                                   "service" => 'notification',
-                                   "host" => 'monasca',
-                                   "path" => '/var/log/monasca/notification/notification.log',
-                                  })
-      expect_any_instance_of(LogStash::Outputs::Monasca::MonascaLogApiClient).to receive(:send_event)
-        .with(event, event.to_hash.to_json, token_id.id, nil, expected_application_type)
-      monasca_log_api = LogStash::Outputs::MonascaLogApi.new(config)
-
-      allow(monasca_log_api).to receive(:get_token).and_return(token_id)
-      allow(monasca_log_api).to receive(:get_application_type).and_call_original
-
-      monasca_log_api.register
-      monasca_log_api.receive(event)
-    end
-
-  end
-
-  context 'when receiving SHUTDOWN message' do
-    it 'then it should be send to monasca-log-api' do
-      expect_any_instance_of(LogStash::Outputs::Monasca::MonascaLogApiClient).to_not receive(:send_event)
-        .with(shutdown_event, nil, token_id.id, nil)
-      monasca_log_api = LogStash::Outputs::MonascaLogApi.new(simple_config)
-      allow(monasca_log_api).to receive(:get_token).and_return(token_id)
-      monasca_log_api.register
-      monasca_log_api.receive(shutdown_event)
-    end
-  end
-
-end