nagios-promoo 0.0.6 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76dff93f07782caaba45b356e3aeef9861565a29
-  data.tar.gz: 11f4809f563ca467f4d6010eb1771faf00d5f0f7
+  metadata.gz: 1787169d8cb255b046e890de4ff5916b6d43a548
+  data.tar.gz: 402a454be9941e1133c7ee3c65bbb973ab27623e
 SHA512:
-  metadata.gz: f335f41c43a7c827935c8c5eb4a5ab6a72b4d2989d99ec84d1b2d6155180ff78456f7b0e8269958b6e3421299fad652ebb986478fa80cbb12a38ca6b1dafcc1e
-  data.tar.gz: 0090b8d4b2f7685f451a2714d47cc430dbe6072a1d29d9a977dec8a449b615b2f8abb8a5d5ed1f969c5f9ea6b0e09c911b1ea9ac92596a50e73686a21f61cc37
+  metadata.gz: 4fb8f36c9fa1f65a67c4360f2f50d6bf5efc956368ac55cc96d9802b7efa9496524236bbc496df393aab30ad1fa795a7291aca3cff15e1be172d456d7274b265
+  data.tar.gz: 5ed803935e772f15a3ea1e4da16d96c3d960ac286dd0b5c05e706b60f0e7437f7fda00fc6341bd8d43c56e1810a8010690930dd90206c90e8f8267f936634204

data/lib/nagios/promoo.rb

@@ -1,10 +1,13 @@
 # Global deps
 require 'thor'
 require 'timeout'
+require 'ox'
 require 'multi_xml'
-require 'multi_json'
 require 'httparty'
 
+# Force multi_xml to use ox
+MultiXml.parser = :ox
+
 # Define modules
 module Nagios; end
 module Nagios::Promoo; end

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

@@ -11,7 +11,8 @@ class Nagios::Promoo::Occi::Probes::CategoriesProbe < Nagios::Promoo::Occi::Prob
 
     def options
       [
-        [:optional, { type: :array, default: [], desc: 'Identifiers of optional categories (optional by force)' }]
+        [:optional, { type: :array, default: [], desc: 'Identifiers of optional categories (optional by force)' }],
+        [:check_location, { type: :boolean, default: false, desc: 'Verify declared REST locations for INFRA resources' }],
       ]
     end
 
@@ -27,9 +28,22 @@ class Nagios::Promoo::Occi::Probes::CategoriesProbe < Nagios::Promoo::Occi::Prob
     categories -= options[:optional] if options[:optional]
 
     begin
-      Timeout::timeout(options[:timeout]) {
-        categories.each { |cat| fail "#{cat.inspect} is missing" unless client(options).model.get_by_id(cat, true) }
-      }
+      Timeout::timeout(options[:timeout]) do
+        categories.each do |cat|
+          fail "#{cat.inspect} is missing" unless client(options).model.get_by_id(cat, true)
+          next unless options[:check_location] && Nagios::Promoo::Occi::Probes::KindsProbe::INFRA_KINDS.include?(cat)
+
+          # 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(cat)
+          rescue => err
+            fail "Failed to verify declared REST location for #{cat.inspect} (#{err.message})"
+          end
+        end
+      end
     rescue => ex
       puts "CATEGORIES CRITICAL - #{ex.message}"
       puts ex.backtrace if options[:debug]

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

@@ -10,9 +10,8 @@ class Nagios::Promoo::Occi::Probes::ComputeProbe < Nagios::Promoo::Occi::Probes:
     def options
       [
         [:mpuri, { type: :string, required: true, desc: 'AppDB MPURI referencing a virtual appliance' }],
+        [:with_storage, { type: :boolean, default: false, desc: 'Run test attaching a storage instance to compute instance' }],
         [:cache_expiration, { type: :numeric, default: 7200, desc: 'AppDB cache expiration (in seconds)' }],
-        [:compute_timeout, { type: :numeric, default: 359, desc: 'Timeout for compute instantiation (in seconds)' }],
-        [:appdb_timeout, { type: :numeric, default: 359, desc: 'Timeout for AppDB queries (in seconds)' }],
         [:cleanup, { type: :boolean, default: true, desc: 'Perform clean-up before launching a new instance' }],
       ]
     end
@@ -24,53 +23,97 @@ class Nagios::Promoo::Occi::Probes::ComputeProbe < Nagios::Promoo::Occi::Probes:
     def runnable?; true; end
   end
 
+  READY_STATES = %w(active online).freeze
+  NONREADY_STATES = %w(inactive offline).freeze
+  ERROR_STATES = %w(error).freeze
+
   CPU_SUM_WEIGHT = 1000
   COMPUTE_NAME_PREFIX = "sam-nagios-promoo"
+  DEFAULT_STORAGE_SIZE = 1 # GB
   APPDB_PROXY_URL = 'https://appdb.egi.eu/api/proxy'
   APPDB_REQUEST_FORM = 'version=1.0&resource=broker&data=%3Cappdb%3Abroker%20xmlns%3Axs%3D%22http%3A%2F%2Fwww.w3.org%2F2001%2FXMLSchema%22%20xmlns%3Axsi%3D%22http%3A%2F%2Fwww.w3.org%2F2001%2FXMLSchema-instance%22%20xmlns%3Aappdb%3D%22http%3A%2F%2Fappdb.egi.eu%2Fapi%2F1.0%2Fappdb%22%3E%3Cappdb%3Arequest%20id%3D%22vaproviders%22%20method%3D%22GET%22%20resource%3D%22va_providers%22%3E%3Cappdb%3Aparam%20name%3D%22listmode%22%3Edetails%3C%2Fappdb%3Aparam%3E%3C%2Fappdb%3Arequest%3E%3C%2Fappdb%3Abroker%3E'
 
   def run(options, args = [])
-    fail "Timeout (#{options[:timeout]}) must be higher than compute-timeout (#{options[:compute_timeout]}) "\
-         "+ appdb-timeout (#{options[:appdb_timeout]})" if options[:timeout] <= (options[:compute_timeout] + options[:appdb_timeout])
-
-    link = begin
-             Timeout::timeout(options[:timeout]) { compute_create(*appdb_information(options), options) }
-           rescue Timeout::Error => ex
-             puts "COMPUTE CRITICAL - Probe execution timed out [#{options[:timeout]}s]"
-             exit 2
-           end
-
-    puts "COMPUTE OK - Instance #{link.inspect} created & cleaned up"
+    links = begin
+              Timeout::timeout(options[:timeout]) { compute_provision(options) }
+            rescue Timeout::Error => ex
+              puts "COMPUTE CRITICAL - Probe execution timed out [#{options[:timeout]}s]"
+              exit 2
+            end
+
+    puts "COMPUTE OK - Instance(s) #{links[:compute].inspect} created & cleaned up"
   end
 
   private
 
-  def compute_create(os_tpl, resource_tpl, options)
-    link = nil
-
-    begin
-      2.times { client(options).delete('compute') } if options[:cleanup]
-      compute = client(options).get_resource('compute')
-      compute.title = compute.hostname = "#{COMPUTE_NAME_PREFIX}-#{Time.now.to_i}"
-
-      compute.mixins << get_mixin(os_tpl, 'os_tpl', options)
-      compute.mixins << get_mixin(resource_tpl, 'resource_tpl', options)
-
-      link = client(options).create(compute)
-      wait4compute(link, options)
-    rescue => ex
-      puts "COMPUTE CRITICAL - #{ex.message}"
-      puts ex.backtrace if options[:debug]
-      exit 2
-    ensure
-      begin
-        client(options).delete(link) unless link.blank?
-      rescue => ex
-        ## ignoring
-      end
+  def compute_provision(options)
+    links = {}
+
+    compute_link = compute_create(options)
+    links[:compute] = compute_link
+    wait4ready(compute_link, options)
+
+    if options[:with_storage]
+      storage_link = storage_create(options)
+      links[:storage] = storage_link
+      wait4ready(storage_link, options)
+
+      slink = link_instances(compute_link, storage_link, options)
+      links[:storagelink] = slink
+      wait4ready(slink, options)
     end
 
-    link
+    links
+  rescue => ex
+    puts "COMPUTE CRITICAL - #{ex.message}"
+    puts ex.backtrace if options[:debug]
+    exit 2
+  ensure
+    mandatory_cleanup links, options
+  end
+
+  def compute_create(options)
+    client(options).delete('compute') if options[:cleanup]
+
+    compute = client(options).get_resource('compute')
+    compute.title = compute.hostname = "#{COMPUTE_NAME_PREFIX}-#{Time.now.to_i}"
+
+    os_tpl, resource_tpl = appdb_information(options)
+    compute.mixins << get_mixin(os_tpl, 'os_tpl', options)
+    compute.mixins << get_mixin(resource_tpl, 'resource_tpl', options)
+
+    client(options).create compute
+  end
+
+  def storage_create(options)
+    client(options).delete('storage') if options[:cleanup]
+
+    storage = client(options).get_resource('storage')
+    storage.title = "#{COMPUTE_NAME_PREFIX}-block-#{Time.now.to_i}"
+    storage.size = DEFAULT_STORAGE_SIZE # GB
+
+    client(options).create storage
+  end
+
+  def link_instances(compute_link, storage_link, options)
+    slink = client(options).get_link('storagelink')
+    slink.source = compute_link
+    slink.target = storage_link
+
+    client(options).create slink
+  end
+
+  def mandatory_cleanup(links, options)
+    mandatory_cleanup_part links[:storagelink], true, options
+    mandatory_cleanup_part links[:storage], false, options
+    mandatory_cleanup_part links[:compute], false, options
+  end
+
+  def mandatory_cleanup_part(link, wait4inactive, options)
+    client(options).delete link
+    wait4inactive(link, options) if wait4inactive
+  rescue => ex
+    # ignore
   end
 
   def get_mixin(term, type, options)
@@ -79,35 +122,34 @@ class Nagios::Promoo::Occi::Probes::ComputeProbe < Nagios::Promoo::Occi::Probes:
     mxn
   end
 
-  def wait4compute(link, options)
-    state = 'inactive'
-
-    begin
-      Timeout::timeout(options[:compute_timeout]) {
-        while state != 'active' do
-          state = client(options).describe(link).first.state
-          fail 'Failed to deploy an instance (resulting OCCI state was "error")' if state == 'error'
-          sleep 5
-        end
-      }
-    rescue Timeout::Error => ex
-      puts "COMPUTE WARNING - Execution timed out while waiting for the instance to become active [#{options[:compute_timeout]}s]"
-      exit 1
+  def wait4ready(link, options)
+    state = nil
+
+    while !READY_STATES.include?(state) do
+      state = client(options).describe(link).first.state
+      fail "Provisioning failure on #{link.inspect}" if ERROR_STATES.include?(state)
+      sleep 5
     end
   end
 
-  def appdb_information(options)
-    begin
-      Timeout::timeout(options[:appdb_timeout]) {
-        [appdb_appliance(options), appdb_smallest_size(options)]
-      }
-    rescue => ex
-      puts "COMPUTE UNKNOWN - #{ex.message}"
-      puts ex.backtrace if options[:debug]
-      exit 3
+  def wait4inactive(link, options)
+    state = nil
+
+    while !NONREADY_STATES.include?(state) do
+      state = client(options).describe(link).first.state
+      fail "De-provisioning failure on #{link.inspect}" if ERROR_STATES.include?(state)
+      sleep 5
     end
   end
 
+  def appdb_information(options)
+    [appdb_appliance(options), appdb_smallest_size(options)]
+  rescue => ex
+    puts "COMPUTE UNKNOWN - #{ex.message}"
+    puts ex.backtrace if options[:debug]
+    exit 3
+  end
+
   def appdb_appliance(options)
     appliance = nil
     appliance = [appdb_provider(options)['provider:image']].flatten.compact.select do |image|
@@ -138,7 +180,7 @@ class Nagios::Promoo::Occi::Probes::ComputeProbe < Nagios::Promoo::Occi::Probes:
 
     parsed_response = cache_fetch('appdb-sites', options[:cache_expiration]) do
                         response = HTTParty.post(APPDB_PROXY_URL, { :body => APPDB_REQUEST_FORM })
-                        fail "Could not get appliance"\
+                        fail "Could not get appliance "\
                              "details from AppDB [#{response.code}]" unless response.success?
                         response.parsed_response
                       end

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

@@ -10,7 +10,8 @@ class Nagios::Promoo::Occi::Probes::KindsProbe < Nagios::Promoo::Occi::Probes::B
     def options
       [
         [:kinds, { type: :string, enum: %w(core infra all), default: 'all', desc: 'Collection of mandatory kinds to check' }],
-        [:optional, { type: :array, default: [], desc: 'Identifiers of optional kinds (optional by force)' }]
+        [:optional, { type: :array, default: [], desc: 'Identifiers of optional kinds (optional by force)' }],
+        [:check_location, { type: :boolean, default: false, desc: 'Verify declared REST locations for INFRA resources' }],
       ]
     end
 
@@ -42,9 +43,22 @@ class Nagios::Promoo::Occi::Probes::KindsProbe < Nagios::Promoo::Occi::Probes::B
     kinds -= options[:optional] if options[:optional]
 
     begin
-      Timeout::timeout(options[:timeout]) {
-        kinds.each { |kind| fail "#{kind.inspect} is missing" unless client(options).model.get_by_id(kind, true) }
-      }
+      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)
+
+          # 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
+        end
+      end
     rescue => ex
       puts "KINDS CRITICAL - #{ex.message}"
       puts ex.backtrace if options[:debug]

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

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

data/lib/nagios/promoo/version.rb

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

data/nagios-promoo.gemspec

@@ -18,14 +18,13 @@ 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'
+  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     'multi_xml'
-  spec.add_runtime_dependency     'multi_json'
+  spec.add_runtime_dependency     'ox'
 
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake', '~> 10.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nagios-promoo
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
 platform: ruby
 authors:
 - Boris Parak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-07 00:00:00.000000000 Z
+date: 2017-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: occi-api
@@ -17,6 +17,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.3.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.3.7
 - !ruby/object:Gem::Dependency
   name: opennebula
   requirement: !ruby/object:Gem::Requirement
@@ -95,21 +101,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: multi_xml
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: multi_json
+  name: ox
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="