nagios-promoo 0.1.0 → 1.0.0

data/lib/nagios/promoo/occi/probes/kinds_probe.rb

@@ -36,35 +36,33 @@ class Nagios::Promoo::Occi::Probes::KindsProbe < Nagios::Promoo::Occi::Probes::B
     http://schemas.ogf.org/occi/infrastructure#networkinterface
   )
 
-  def run(options, args = [])
+  def run(args = [])
     kinds = []
     kinds += CORE_KINDS if %w(core all).include?(options[:kinds])
     kinds += INFRA_KINDS if %w(infra all).include?(options[:kinds])
     kinds -= options[:optional] if options[:optional]
 
-    begin
-      Timeout::timeout(options[:timeout]) do
-        kinds.each do |kind|
-          fail "#{kind.inspect} is missing" unless client(options).model.get_by_id(kind, true)
-          next unless options[:check_location] && INFRA_KINDS.include?(kind)
+    Timeout::timeout(options[:timeout]) do
+      kinds.each do |kind|
+        fail "#{kind.inspect} is missing" unless client.model.get_by_id(kind, true)
+        next unless options[:check_location] && INFRA_KINDS.include?(kind)
 
-          # Make sure declared locations are actually available as REST
-          # endpoints. Failure will raise an exception, no need to do
-          # anything here. To keep requirements reasonable, only INFRA
-          # kinds are considered relevant for this part of the check.
-          begin
-            client(options).list(kind)
-          rescue => err
-            fail "Failed to verify declared REST location for #{kind.inspect} (#{err.message})"
-          end
+        # Make sure declared locations are actually available as REST
+        # endpoints. Failure will raise an exception, no need to do
+        # anything here. To keep requirements reasonable, only INFRA
+        # kinds are considered relevant for this part of the check.
+        begin
+          client.list(kind)
+        rescue => err
+          fail "Failed to verify declared REST location for #{kind.inspect} (#{err.message})"
         end
       end
-    rescue => ex
-      puts "KINDS CRITICAL - #{ex.message}"
-      puts ex.backtrace if options[:debug]
-      exit 2
     end
 
     puts 'KINDS OK - All specified OCCI kinds were found'
+  rescue => ex
+    puts "KINDS CRITICAL - #{ex.message}"
+    puts ex.backtrace if options[:debug]
+    exit 2
   end
 end

data/lib/nagios/promoo/occi/probes/mixins_probe.rb

@@ -31,22 +31,20 @@ class Nagios::Promoo::Occi::Probes::MixinsProbe < Nagios::Promoo::Occi::Probes::
     http://schemas.openstack.org/compute/instance#user_data
   )
 
-  def run(options, args = [])
+  def run(args = [])
     mixins = []
     mixins += INFRA_MIXINS if %w(infra all).include?(options[:mixins])
     mixins += CONTEXT_MIXINS if %w(context all).include?(options[:mixins])
     mixins -= options[:optional] if options[:optional]
 
-    begin
-      Timeout::timeout(options[:timeout]) {
-        mixins.each { |mixin| fail "#{mixin.inspect} is missing" unless client(options).model.get_by_id(mixin, true) }
-      }
-    rescue => ex
-      puts "MIXINS CRITICAL - #{ex.message}"
-      puts ex.backtrace if options[:debug]
-      exit 2
+    Timeout::timeout(options[:timeout]) do
+      mixins.each { |mixin| fail "#{mixin.inspect} is missing" unless client.model.get_by_id(mixin, true) }
     end
 
     puts 'MIXINS OK - All specified OCCI mixins were found'
+  rescue => ex
+    puts "MIXINS CRITICAL - #{ex.message}"
+    puts ex.backtrace if options[:debug]
+    exit 2
   end
 end

data/lib/nagios/promoo/occi/version.rb

@@ -1,7 +1,7 @@
 module Nagios
   module Promoo
     module Occi
-      VERSION = "0.1.0"
+      VERSION = "1.0.0"
     end
   end
 end

data/lib/nagios/promoo/opennebula/master.rb

@@ -32,7 +32,7 @@ class Nagios::Promoo::Opennebula::Master < ::Thor
     end
     class_eval %Q^
 def #{probe.declaration}(*args)
-  #{probe}.new.run(options, args)
+  #{probe}.new(options).run(args)
 end
 ^
   end

data/lib/nagios/promoo/opennebula/probes/base_probe.rb

@@ -3,10 +3,16 @@ class Nagios::Promoo::Opennebula::Probes::BaseProbe
     def runnable?; false; end
   end
 
-  def client(options)
-    return @client if @client
+  attr_reader :options
+
+  def initialize(options)
+    @options = options
+  end
+
+  def client
+    return @_client if @_client
 
     token = options[:token].start_with?('file://') ? File.read(options[:token].gsub('file://', '')) : options[:token]
-    @client = OpenNebula::Client.new("#{token}", options[:endpoint])
+    @_client = OpenNebula::Client.new("#{token}", options[:endpoint])
   end
 end

data/lib/nagios/promoo/opennebula/probes/virtual_machine_probe.rb

@@ -24,74 +24,72 @@ class Nagios::Promoo::Opennebula::Probes::VirtualMachineProbe < Nagios::Promoo::
 
   VM_NAME_PREFIX = "nagios-promoo"
 
-  def run(options, args = [])
+  def run(args = [])
     fail "Timeout (#{options[:timeout]}) must be higher than "\
          "vm-timeout (#{options[:vm_timeout]}) " if options[:timeout] <= options[:vm_timeout]
 
-    vm = nil
+    @_virtual_machine = nil
+
+    Timeout::timeout(options[:timeout]) {
+      cleanup if options[:cleanup]
+      create
+      wait4running
+    }
+
+    puts "VirtualMachine OK - Instance #{@_virtual_machine.id.inspect} of template "\
+         "#{options[:template].inspect} successfully created & cleaned up"
+  rescue => ex
+    puts "VirtualMachine CRITICAL - #{ex.message}"
+    puts ex.backtrace if options[:debug]
+    exit 2
+  ensure
     begin
-      Timeout::timeout(options[:timeout]) {
-        cleanup(options) if options[:cleanup]
-        vm = create(options)
-        wait4running(options, vm)
-      }
+      cleanup @_virtual_machine unless @_virtual_machine.blank?
     rescue => ex
-      puts "VirtualMachine CRITICAL - #{ex.message}"
-      puts ex.backtrace if options[:debug]
-      exit 2
-    ensure
-      begin
-        cleanup(options, vm) unless vm.blank?
-      rescue => ex
-        ## ignoring
-      end
+      ## ignoring
     end
-
-    puts "VirtualMachine OK - Instance #{vm.id.inspect} of template "\
-         "#{options[:template].inspect} successfully created & cleaned up"
   end
 
   private
 
-  def cleanup(options, vm = nil)
-    (vm && vm.id) ? shutdown_or_delete(vm) : search_and_destroy(options)
+  def cleanup(virtual_machine = nil)
+    virtual_machine ? shutdown_or_delete(virtual_machine) : search_and_destroy
   end
 
-  def create(options)
-    template_pool = OpenNebula::TemplatePool.new(client(options))
+  def create
+    template_pool = OpenNebula::TemplatePool.new(client)
     rc = template_pool.info_all
     fail rc.message if OpenNebula.is_error?(rc)
 
     template = template_pool.select { |tpl| tpl.name == options[:template] }.first
     fail "Template #{options[:template].inspect} could not be found" unless template
+
     vm_id = template.instantiate("#{VM_NAME_PREFIX}-#{Time.now.to_i}")
     fail vm_id.message if OpenNebula.is_error?(vm_id)
 
-    vm = OpenNebula::VirtualMachine.new(OpenNebula::VirtualMachine.build_xml(vm_id), client(options))
-    rc = vm.info
+    virtual_machine = OpenNebula::VirtualMachine.new(OpenNebula::VirtualMachine.build_xml(vm_id), client)
+    rc = virtual_machine.info
     fail rc.message if OpenNebula.is_error?(rc)
 
-    vm
+    @_virtual_machine = virtual_machine
   end
 
-  def wait4running(options, vm)
-    begin
-      Timeout::timeout(options[:vm_timeout]) {
-        while vm.lcm_state_str != 'RUNNING' do
-          fail 'Instance deployment failed (resulting state is "FAILED")' if vm.state_str == 'FAILED'
-          rc = vm.info
-          fail rc.message if OpenNebula.is_error?(rc)
-        end
-      }
-    rescue Timeout::Error => ex
-      puts "VirtualMachine WARNING - Execution timed out while waiting for "\
-           "the instance to become active [#{options[:vm_timeout]}s]"
-      exit 1
-    end
+  def wait4running
+    Timeout::timeout(options[:vm_timeout]) {
+      while @_virtual_machine.lcm_state_str != 'RUNNING' do
+        fail 'Instance deployment failed (resulting state is "*_FAILED")' if @_virtual_machine.lcm_state_str.include?('FAILURE')
+        rc = @_virtual_machine.info
+        fail rc.message if OpenNebula.is_error?(rc)
+      end
+    }
+  rescue Timeout::Error => ex
+    puts "VirtualMachine WARNING - Execution timed out while waiting for " \
+         "the instance to become active [#{options[:vm_timeout]}s]"
+    exit 1
   end
 
-  def search_and_destroy(options)
-    vm_pool = OpenNebula::VirtualMachinePool.new(client(options))
+  def search_and_destroy
+    vm_pool = OpenNebula::VirtualMachinePool.new(client)
     rc = vm_pool.info_mine
     fail rc.message if OpenNebula.is_error?(rc)
 
@@ -101,8 +99,8 @@ class Nagios::Promoo::Opennebula::Probes::VirtualMachineProbe < Nagios::Promoo::
     candidates.count
   end
 
-  def shutdown_or_delete(vm)
-    rc = (vm.lcm_state_str == 'RUNNING') ? vm.shutdown(true) : vm.delete
+  def shutdown_or_delete(virtual_machine)
+    rc = virtual_machine.terminate true
     fail rc.message if OpenNebula.is_error?(rc)
   end
 end

data/lib/nagios/promoo/opennebula/probes/xmlrpc_health_probe.rb

@@ -18,17 +18,14 @@ class Nagios::Promoo::Opennebula::Probes::XmlrpcHealthProbe < Nagios::Promoo::Op
     def runnable?; true; end
   end
 
-  def run(options, args = [])
-    rc = nil
-    begin
-      rc = Timeout::timeout(options[:timeout]) { client(options).get_version }
-      fail rc.message if OpenNebula.is_error?(rc)
-    rescue => ex
-      puts "XMLRPC CRITICAL - #{ex.message}"
-      puts ex.backtrace if options[:debug]
-      exit 2
-    end
+  def run(args = [])
+    rc = Timeout::timeout(options[:timeout]) { client.get_version }
+    fail rc.message if OpenNebula.is_error?(rc)
 
     puts "XMLRPC OK - OpenNebula #{rc} daemon is up and running"
+  rescue => ex
+    puts "XMLRPC CRITICAL - #{ex.message}"
+    puts ex.backtrace if options[:debug]
+    exit 2
   end
 end

data/lib/nagios/promoo/opennebula/version.rb

@@ -1,7 +1,7 @@
 module Nagios
   module Promoo
     module Opennebula
-      VERSION = "0.0.1"
+      VERSION = "1.0.0"
     end
   end
 end

data/lib/nagios/promoo/version.rb

@@ -1,5 +1,5 @@
 module Nagios
   module Promoo
-    VERSION = "0.1.0"
+    VERSION = "1.0.0"
   end
 end

data/nagios-promoo.gemspec

@@ -18,21 +18,21 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency     'occi-api', '~> 4.3', '>= 4.3.7'
-  spec.add_runtime_dependency     'opennebula', '~> 4.14'
-  spec.add_runtime_dependency     'thor'
-  spec.add_runtime_dependency     'yell'
-  spec.add_runtime_dependency     'activesupport'
-  spec.add_runtime_dependency     'httparty'
-  spec.add_runtime_dependency     'ox'
+  spec.add_runtime_dependency     'occi-api', '>= 4.3.8', '< 5'
+  spec.add_runtime_dependency     'opennebula', '>= 5.2.1', '< 6'
+  spec.add_runtime_dependency     'thor', '>= 0.19.4', '< 1'
+  spec.add_runtime_dependency     'yell', '>= 2.0.7', '< 3'
+  spec.add_runtime_dependency     'activesupport', '>= 4.0', '< 5'
+  spec.add_runtime_dependency     'httparty', '>= 0.14', '< 1'
+  spec.add_runtime_dependency     'ox', '>= 2.4.9', '< 3'
 
-  spec.add_development_dependency 'bundler', '~> 1.7'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'simplecov', '~> 0.9'
-  spec.add_development_dependency 'rubygems-tasks', '~> 0.2'
-  spec.add_development_dependency 'rubocop', '~> 0.32'
-  spec.add_development_dependency 'pry', '~> 0.10'
+  spec.add_development_dependency 'bundler', '>= 1.8', '< 2'
+  spec.add_development_dependency 'rake', '>= 10.0', '< 13'
+  spec.add_development_dependency 'rspec', '>= 3.0', '< 4'
+  spec.add_development_dependency 'simplecov', '>= 0.13', '< 1'
+  spec.add_development_dependency 'rubygems-tasks', '>= 0.2.4', '< 1'
+  spec.add_development_dependency 'rubocop', '>= 0.47', '< 1'
+  spec.add_development_dependency 'pry', '>= 0.10', '< 1'
 
   spec.required_ruby_version = '>= 1.9.3'
 end

metadata

@@ -1,217 +1,295 @@
 --- !ruby/object:Gem::Specification
 name: nagios-promoo
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Boris Parak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-24 00:00:00.000000000 Z
+date: 2017-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: occi-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.3.7
+        version: 4.3.8
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.3.7
+        version: 4.3.8
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: opennebula
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.2.1
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4.14'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.2.1
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4.14'
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.19.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.19.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: yell
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.7
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.7
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.14'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.14'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: ox
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.4.9
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.4.9
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.8'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.8'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '13'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.13'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.13'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: rubygems-tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.2.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.4
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.47'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.32'
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.32'
+        version: '0.47'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.10'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.10'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1'
 description: Nagios Probes for Monitoring OpenNebula and OCCI
 email:
 - parak@cesnet.cz
@@ -276,7 +354,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Nagios Probes for Monitoring OpenNebula and OCCI