opennebula_nagios_probe 1.0.0 → 1.0.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmU0ZDE5MTZkYzUyMGVhMjNlNDJhZjU4YTA4MzQ4ZTE5YzI4ODllNQ==
+    YjI0NGIyZjQ4NDM4OTI5YWYwOTUwZjMwOGRjNGUxYmY1YWFmNmJlYg==
   data.tar.gz: !binary |-
-    NjM5MDdmZDUwZTE5MDBhNzBhNzc2NTNmOWZlOTUwZDI3MmQ5OWU4Mg==
+    ZjJhYTM2MTMwM2NiZjc2MGM4ZmQyZGI1ZjYxMDA4NzQzOTBhMjc0NQ==
 SHA512:
   metadata.gz: !binary |-
-    OTg0NjhmMTFmMzFjMWM1OWQyZGM2ZGIxYmY5ODhiOGRkMzBiOGRlZmVmMGMx
-    OTRhYWU3NWMyZDJkOTQ1OTYyMmRkZWMxZWM5YTdmZmMzNGU4NWUzYmFlNWNm
-    YWZjYzg5MDk1OTJhZmUyMTBlYzhmMDU2Yzk3ZDg2NjVkNjFmNGM=
+    YWFkZTM1ZTk3NmI1MmZmYTE3ZTY1NWQ1NTI5YTI4NTNkMzk5YzYwMGYzMTdh
+    ZmFjYmJhNWFiYjE2MGU2NjE1NWFkNjVjMGM0MGM4M2E4YjM2ZGIzYTllMGUz
+    NDViNDgyZGNiZDg0NmQxNmI5YWFmOGQxOWQ2ZWY1MDUzZmU1NmE=
   data.tar.gz: !binary |-
-    ZGVlYzkwOWUyZDQ0YTUzNmFhNTdlODk5Y2YwNDZiZTNjNDM4NjBjNGIzOGNi
-    N2U0NTlhODAzZjEwNTExMWJlMDJjMDhmNWY2OGFkNzZiZWFkZDBlZTM1MjBk
-    MTFiNjYwNzUzODVmMDI1OGY2YzQyMTBlNGRkOGNiOTY1ZDQ5Mjc=
+    NjlkNTI4MDExMzEwNDI3NGIxMDZmNzYxODc5Mjg0ZmU3M2RkNWQ5NzJmMmUz
+    YTFlM2JmODJjZDNmYjhiNWI5ZDVjYzdhMDJmZWYyMmIxZTQwNjZjYjkwNzY0
+    YzY5MGNhZmMyMTJmYjhkNDY1NThkZjM0NTVhNGMxODdkNWI4ZWE=

data/.gitignore

@@ -3,3 +3,4 @@
 .idea/
 .bundle/
 build/
+Gemfile.lock

data/Gemfile

@@ -1,18 +1,12 @@
-##
 source "http://rubygems.org"
-##
 
-gem "nagios-probe"
-gem "log4r"
-gem "amazon-ec2"
-gem "multipart-post"
-gem "rake"
-gem "occi-cli"
-gem "opennebula-oca"
-gem "occi-api", "~> 4.2"
+gemspec
 
-group :test do
-  gem "rspec"
-  gem "vcr"
-  gem "webmock", "~>1.9.3"
+group :development do
+  gem 'rubygems-tasks', :git => 'git://github.com/postmodern/rubygems-tasks.git'
+  gem 'rspec',   '~> 2.14'
+  gem 'webmock', '~> 1.9'
+  gem 'vcr',     '~> 2.8'
+  gem 'rake',    '~> 10.1'
+  gem 'bundler', '~> 1.3'
 end

data/bin/check_opennebula

@@ -19,6 +19,7 @@
 require 'bundler/setup'
 require 'log4r'
 
+# include proxy
 require File.expand_path('..', __FILE__) +'/../lib/opennebula_nagios_probe'
 
 begin
@@ -28,13 +29,13 @@ begin
   # instantiate a probe
   case options.service
   when :oned
-    probe = OpenNebulaOnedProbe.new(options)
+    probe = OpennebulaOnedProbe.new(options)
     logger = Log4r::Logger.new 'OpenNebulaOnedProbe'
   when :occi, :rocci
-    probe = OpenNebulaOcciProbe.new(options)
+    probe = OpennebulaOcciProbe.new(options)
     logger = Log4r::Logger.new 'OpenNebulaOcciProbe'
   when :econe
-    probe = OpenNebulaEconeProbe.new(options)
+    probe = OpennebulaEconeProbe.new(options)
     logger = Log4r::Logger.new 'OpenNebulaEconeProbe'
   end
 
@@ -43,8 +44,6 @@ begin
   probe.logger = logger
 
   case options.debug_level
-  when 0
-    logger.level = Log4r::FATAL
   when 1
     logger.level = Log4r::ERROR
   when 2

data/lib/opennebula_nagios_probe.rb

@@ -26,4 +26,8 @@ require 'opennebula_probe'
 require 'optparse_nagios_probe'
 require 'opennebula_oned_probe'
 require 'opennebula_occi_probe'
-require 'opennebula_econe_probe'
+require 'opennebula_econe_probe'
+
+module OpennebulaNagiosProbe
+  VERSION = "1.0.1" unless defined?(::OpennebulaNagiosProbe::VERSION)
+end

data/lib/probe/opennebula_econe_probe.rb

@@ -17,9 +17,9 @@ require 'opennebula_probe'
 require 'AWS'
 require 'digest/sha1'
 
-# OpenNebulaEconeProbe - Econe client query service implementation.
+# OpennebulaEconeProbe - Econe client query service implementation.
 
-class OpenNebulaEconeProbe < OpennebulaProbe
+class OpennebulaEconeProbe < OpennebulaProbe
   def initialize(opts)
     super(opts)
 

data/lib/probe/opennebula_occi_probe.rb

@@ -16,9 +16,9 @@
 require 'opennebula_probe'
 require 'occi/client'
 
-# OpenNebulaOcciProbe - OCCI client query service implementation.
+# OpennebulaOcciProbe - OCCI client query service implementation.
 
-class OpenNebulaOcciProbe < OpennebulaProbe
+class OpennebulaOcciProbe < OpennebulaProbe
   def initialize(opts)
     super(opts)
 

data/lib/probe/opennebula_oned_probe.rb

@@ -18,9 +18,9 @@ require 'opennebula'
 
 include OpenNebula
 
-# OpenNebulaOnedProbe - XML-RPC ONED client query service implementation.
+# OpennebulaOnedProbe - XML-RPC ONED client query service implementation.
 
-class OpenNebulaOnedProbe < OpennebulaProbe
+class OpennebulaOnedProbe < OpennebulaProbe
   FAILED_CONNECTIVITY = 'Failed to check connectivity: '
   FAILED_RESOURCE = 'Failed to check resource availability: '
 

data/lib/probe/optparse_nagios_probe.rb

@@ -19,7 +19,6 @@ require 'ostruct'
 # OptparseNagiosProbe - opennebula-nagios probes ARGV parser class.
 
 class OptparseNagiosProbe
-  VERSION = 0.99
 
   def self.parse(args)
     options = OpenStruct.new
@@ -151,7 +150,7 @@ class OptparseNagiosProbe
       end
 
       opts.on_tail('--version', 'Show version') do
-        puts VERSION
+        puts OpennebulaNagiosProbe::VERSION
         exit!
       end
 

data/opennebula_nagios_probe.gemspec

@@ -1,8 +1,11 @@
 # coding: utf-8
+lib = File.expand_path('../lib/', __FILE__)
+$:.unshift lib unless $:.include?(lib)
+require 'opennebula_nagios_probe'
 
 Gem::Specification.new do |gem|
   gem.name          = 'opennebula_nagios_probe'
-  gem.version       = '1.0.0'
+  gem.version       = OpennebulaNagiosProbe::VERSION
   gem.authors       = ['Boris Parak', 'Filip Hubik', 'Michal Kimle' ]
   gem.email         = ['parak@cesnet.cz', 'hubik@ics.muni.cz', 'kimle.michal@gmail.com']
   gem.description   = %q{This gem is collection of nagios probes (one, econe, occi, rocci) for OpenNebula cloud platform}
@@ -15,18 +18,12 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
   gem.executables   = ['check_opennebula']
 
-  gem.add_dependency 'nagios-probe',	'~> 0.1'
-  gem.add_dependency 'log4r',		'~> 1.1'
-  gem.add_dependency 'amazon-ec2',	'~> 0.9'
-  gem.add_dependency 'occi-cli',	'~> 4.2'
+  gem.add_dependency 'nagios-probe',    '~> 0.1'
+  gem.add_dependency 'log4r',           '~> 1.1'
+  gem.add_dependency 'amazon-ec2',      '~> 0.9'
+  gem.add_dependency 'occi-cli',        '~> 4.2'
   gem.add_dependency 'opennebula-oca',  '~> 4.4'
-  gem.add_dependency 'occi-api', 	'~> 4.2'
+  gem.add_dependency 'occi-api',        '~> 4.2'
 
-  gem.add_development_dependency 'rspec',          '~> 2.14'
-  gem.add_development_dependency 'webmock',        '~> 1.9'
-  gem.add_development_dependency 'vcr',            '~> 2.8'
-  gem.add_development_dependency 'rake', 	   '~> 10.1'
-  gem.add_development_dependency 'bundler', 	   '~> 1.3'  
-
-  gem.required_ruby_version     = '>= 1.9.3'
+  gem.required_ruby_version = '>= 1.9.3'
 end

data/spec/probe/opennebula_econe_probe_spec.rb

@@ -27,7 +27,7 @@ require 'ostruct'
 
 require 'opennebula_econe_probe'
 
-RSpec::Core::DSL.describe OpenNebulaEconeProbe do
+RSpec::Core::DSL.describe OpennebulaEconeProbe do
   before do
     WebMock.disable_net_connect! allow: 'localhost'
 
@@ -55,7 +55,7 @@ RSpec::Core::DSL.describe OpenNebulaEconeProbe do
 
   context 'with no resources' do
     before :each do
-      @probe = OpenNebulaEconeProbe.new(@options)
+      @probe = OpennebulaEconeProbe.new(@options)
       @probe.logger = @logger
     end
 
@@ -88,7 +88,7 @@ RSpec::Core::DSL.describe OpenNebulaEconeProbe do
       @options.storage = %w(ami-00000006 ami-00000007)
       @options.compute = %w(11)
 
-      @probe = OpenNebulaEconeProbe.new(@options)
+      @probe = OpennebulaEconeProbe.new(@options)
       @probe.logger = @logger
     end
 
@@ -121,7 +121,7 @@ RSpec::Core::DSL.describe OpenNebulaEconeProbe do
       @options.storage = %w(ami-00000126 ami-00000127)
       @options.compute = %w(22)
 
-      @probe = OpenNebulaEconeProbe.new(@options)
+      @probe = OpennebulaEconeProbe.new(@options)
       @probe.logger = @logger
     end
 

data/spec/probe/opennebula_occi_probe_spec.rb

@@ -25,7 +25,7 @@ require 'ostruct'
 
 require 'opennebula_occi_probe'
 
-RSpec::Core::DSL.describe OpenNebulaOcciProbe do
+RSpec::Core::DSL.describe OpennebulaOcciProbe do
   before do
     WebMock.disable_net_connect! allow: 'localhost'
 
@@ -52,7 +52,7 @@ RSpec::Core::DSL.describe OpenNebulaOcciProbe do
 
   context 'with no resources' do
     before :each do
-      @probe = OpenNebulaOcciProbe.new(@options)
+      @probe = OpennebulaOcciProbe.new(@options)
       @probe.logger = @logger
     end
 
@@ -86,7 +86,7 @@ RSpec::Core::DSL.describe OpenNebulaOcciProbe do
       @options.storage = %w(6 7)
       @options.compute = %w(11)
 
-      @probe = OpenNebulaOcciProbe.new(@options)
+      @probe = OpennebulaOcciProbe.new(@options)
       @probe.logger = @logger
     end
 
@@ -120,7 +120,7 @@ RSpec::Core::DSL.describe OpenNebulaOcciProbe do
       @options.storage = %w(126 127)
       @options.compute = %w(22)
 
-      @probe = OpenNebulaOcciProbe.new(@options)
+      @probe = OpennebulaOcciProbe.new(@options)
       @probe.logger = @logger
     end
 

data/spec/probe/opennebula_oned_probe_spec.rb

@@ -26,7 +26,7 @@ require 'opennebula'
 
 require 'opennebula_oned_probe'
 
-RSpec::Core::DSL.describe OpenNebulaOnedProbe do
+RSpec::Core::DSL.describe OpennebulaOnedProbe do
   before do
     WebMock.disable_net_connect! allow: 'localhost'
 
@@ -57,7 +57,7 @@ RSpec::Core::DSL.describe OpenNebulaOnedProbe do
 
   context 'with no resources' do
     before :each do
-      @probe = OpenNebulaOnedProbe.new(@options)
+      @probe = OpennebulaOnedProbe.new(@options)
       @probe.logger = @logger
     end
 
@@ -91,7 +91,7 @@ RSpec::Core::DSL.describe OpenNebulaOnedProbe do
       @options.storage = %w(6 7)
       @options.compute = %w(11)
 
-      @probe = OpenNebulaOnedProbe.new(@options)
+      @probe = OpennebulaOnedProbe.new(@options)
       @probe.logger = @logger
     end
 
@@ -125,7 +125,7 @@ RSpec::Core::DSL.describe OpenNebulaOnedProbe do
       @options.storage = %w(126 127)
       @options.compute = %w(22)
 
-      @probe = OpenNebulaOnedProbe.new(@options)
+      @probe = OpennebulaOnedProbe.new(@options)
       @probe.logger = @logger
     end
 

data/spec/probe/opennebula_rocci_probe_spec.rb

@@ -26,7 +26,7 @@ require 'ostruct'
 
 require 'opennebula_occi_probe'
 
-RSpec::Core::DSL.describe OpenNebulaOcciProbe do
+RSpec::Core::DSL.describe OpennebulaOcciProbe do
   before do
     WebMock.disable_net_connect! allow: 'localhost'
 
@@ -54,7 +54,7 @@ RSpec::Core::DSL.describe OpenNebulaOcciProbe do
 
   context 'with no resources' do
     before :each do
-      @probe = OpenNebulaOcciProbe.new(@options)
+      @probe = OpennebulaOcciProbe.new(@options)
       @probe.logger = @logger
     end
 
@@ -92,7 +92,7 @@ RSpec::Core::DSL.describe OpenNebulaOcciProbe do
       # @options.storage = []
       @options.compute = %w(4016)
 
-      @probe = OpenNebulaOcciProbe.new(@options)
+      @probe = OpennebulaOcciProbe.new(@options)
       @probe.logger = @logger
     end
 
@@ -127,7 +127,7 @@ RSpec::Core::DSL.describe OpenNebulaOcciProbe do
       # @options.storage = ['126', '127']
       @options.compute = %w(8192)
 
-      @probe = OpenNebulaOcciProbe.new(@options)
+      @probe = OpennebulaOcciProbe.new(@options)
       @probe.logger = @logger
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opennebula_nagios_probe
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Boris Parak
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-03 00:00:00.000000000 Z
+date: 2014-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nagios-probe
@@ -96,76 +96,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '4.2'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.14'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.14'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.9'
-- !ruby/object:Gem::Dependency
-  name: vcr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.8'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '10.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '10.1'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
 description: This gem is collection of nagios probes (one, econe, occi, rocci) for
   OpenNebula cloud platform
 email:
@@ -181,7 +111,6 @@ files:
 - .rubocop.yml
 - .travis.yml
 - Gemfile
-- Gemfile.lock
 - README.md
 - Rakefile
 - bin/check_opennebula

data/Gemfile.lock

@@ -1,87 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activesupport (4.0.2)
-      i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
-      thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    addressable (2.3.5)
-    amazon-ec2 (0.9.17)
-      xml-simple (>= 1.0.12)
-    atomic (1.1.14)
-    crack (0.4.2)
-      safe_yaml (~> 1.0.0)
-    diff-lcs (1.2.5)
-    hashie (2.0.5)
-    highline (1.6.20)
-    httparty (0.13.0)
-      json (~> 1.8)
-      multi_xml (>= 0.5.2)
-    i18n (0.6.9)
-    json (1.8.1)
-    log4r (1.1.10)
-    mini_portile (0.5.2)
-    minitest (4.7.5)
-    multi_json (1.8.4)
-    multi_xml (0.5.5)
-    multipart-post (2.0.0)
-    nagios-probe (0.1.2)
-    nokogiri (1.6.1)
-      mini_portile (~> 0.5.0)
-    occi-api (4.2.0)
-      httparty
-      json
-      occi-core (~> 4.2.10)
-    occi-cli (4.2.0)
-      highline
-      json
-      occi-api (~> 4.2.0)
-    occi-core (4.2.10)
-      activesupport (~> 4.0.0)
-      hashie
-      json
-      settingslogic
-      uuidtools (>= 2.1.3)
-    opennebula (4.4.0)
-      json
-      nokogiri
-    opennebula-oca (4.4.0)
-      opennebula (= 4.4.0)
-    rake (10.1.1)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.7)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.5)
-    safe_yaml (1.0.1)
-    settingslogic (2.0.9)
-    thread_safe (0.1.3)
-      atomic
-    tzinfo (0.3.38)
-    uuidtools (2.1.4)
-    vcr (2.8.0)
-    webmock (1.9.3)
-      addressable (>= 2.2.7)
-      crack (>= 0.3.2)
-    xml-simple (1.1.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  amazon-ec2
-  log4r
-  multipart-post
-  nagios-probe
-  occi-api (~> 4.2)
-  occi-cli
-  opennebula-oca
-  rake
-  rspec
-  vcr
-  webmock (~> 1.9.3)