nagios-promoo 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 586b15304cbf0325aa52571802a4eecb4c2375f7
-  data.tar.gz: ed96a9964cfd2d7ffba0e293437d14965a7d88a6
+  metadata.gz: 76dff93f07782caaba45b356e3aeef9861565a29
+  data.tar.gz: 11f4809f563ca467f4d6010eb1771faf00d5f0f7
 SHA512:
-  metadata.gz: 08cbefb1c033f2f00a30efcb71b8de286616b25ccca8dbd4be05caec6a136450adebb7fd8cee7cf8a98c5d5fce258d9745b7487aecbaa3fb11cdec25b2f09014
-  data.tar.gz: e4eec066e5cde62dcfe199772217965f8b800139583103a0f77a3b532b7cf7b2bb522cec32674045ebf4f141ee3ae2f6bdd209e60312cf9e8f2991a715e86a31
+  metadata.gz: f335f41c43a7c827935c8c5eb4a5ab6a72b4d2989d99ec84d1b2d6155180ff78456f7b0e8269958b6e3421299fad652ebb986478fa80cbb12a38ca6b1dafcc1e
+  data.tar.gz: 0090b8d4b2f7685f451a2714d47cc430dbe6072a1d29d9a977dec8a449b615b2f8abb8a5d5ed1f969c5f9ea6b0e09c911b1ea9ac92596a50e73686a21f61cc37

data/lib/nagios/promoo/appdb/probes/appliances_probe.rb

@@ -35,6 +35,6 @@ class Nagios::Promoo::Appdb::Probes::AppliancesProbe < Nagios::Promoo::Appdb::Pr
   private
 
   def check_appliances(options)
-    [appdb_provider(options)['image']].flatten.compact.count
+    [appdb_provider(options)['provider:image']].flatten.compact.count
   end
 end

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

@@ -13,8 +13,8 @@ class Nagios::Promoo::Appdb::Probes::BaseProbe
     fail "Could not get site"\
          "details from AppDB [#{response.code}]" unless response.success?
 
-    @provider = response.parsed_response['broker']['reply']['appdb']['provider'].select do |prov|
-      prov['endpoint_url'] && (prov['endpoint_url'].chomp('/') == options[:endpoint].chomp('/'))
+    @provider = response.parsed_response['appdb:broker']['appdb:reply']['appdb:appdb']['virtualization:provider'].select do |prov|
+      prov['provider:endpoint_url'] && (prov['provider:endpoint_url'].chomp('/') == options[:endpoint].chomp('/'))
     end.first
     fail "Could not locate site by endpoint #{options[:endpoint].inspect} in AppDB" unless @provider
 

data/lib/nagios/promoo/appdb/probes/sizes_probe.rb

@@ -35,6 +35,6 @@ class Nagios::Promoo::Appdb::Probes::SizesProbe < Nagios::Promoo::Appdb::Probes:
   private
 
   def check_sizes(options)
-    [appdb_provider(options)['template']].flatten.compact.count
+    [appdb_provider(options)['provider:template']].flatten.compact.count
   end
 end

data/lib/nagios/promoo/appdb/probes/vmcatcher_probe.rb

@@ -79,7 +79,7 @@ class Nagios::Promoo::Appdb::Probes::VmcatcherProbe < Nagios::Promoo::Appdb::Pro
   end
 
   def provider_appliances(options)
-    images = [appdb_provider(options)['image']].flatten.compact
+    images = [appdb_provider(options)['provider:image']].flatten.compact
     images.collect { |image| image['mp_uri'] }.reject { |mpuri| mpuri.blank? }
   end
 

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

@@ -6,7 +6,7 @@ require File.join(File.dirname(__FILE__), 'mixins_probe')
 class Nagios::Promoo::Occi::Probes::CategoriesProbe < Nagios::Promoo::Occi::Probes::BaseProbe
   class << self
     def description
-      ['categories', 'Run a probe checking for mandatory OCCI categories definitions']
+      ['categories', 'Run a probe checking for mandatory OCCI category definitions']
     end
 
     def options

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

@@ -110,7 +110,7 @@ class Nagios::Promoo::Occi::Probes::ComputeProbe < Nagios::Promoo::Occi::Probes:
 
   def appdb_appliance(options)
     appliance = nil
-    appliance = [appdb_provider(options)['image']].flatten.compact.select do |image|
+    appliance = [appdb_provider(options)['provider:image']].flatten.compact.select do |image|
       image['mp_uri'] && (normalize_mpuri(image['mp_uri']) == normalize_mpuri(options[:mpuri]))
     end.first
     fail "Site does not have an appliance with MPURI "\
@@ -121,10 +121,10 @@ class Nagios::Promoo::Occi::Probes::ComputeProbe < Nagios::Promoo::Occi::Probes:
 
   def appdb_smallest_size(options)
     sizes = []
-    [appdb_provider(options)['template']].flatten.compact.each do |template|
+    [appdb_provider(options)['provider:template']].flatten.compact.each do |template|
       sizes << [
-        template['resource_name'].split('#').last,
-        template['main_memory_size'].to_i + (template['physical_cpus'].to_i * CPU_SUM_WEIGHT)
+        template['provider_template:resource_name'].split('#').last,
+        template['provider_template:main_memory_size'].to_i + (template['provider_template:physical_cpus'].to_i * CPU_SUM_WEIGHT)
       ]
     end
     fail "No appliance sizes available in AppDB" if sizes.blank?
@@ -143,8 +143,8 @@ class Nagios::Promoo::Occi::Probes::ComputeProbe < Nagios::Promoo::Occi::Probes:
                         response.parsed_response
                       end
 
-    @provider = parsed_response['broker']['reply']['appdb']['provider'].select do |prov|
-      prov['endpoint_url'] && (prov['endpoint_url'].chomp('/') == options[:endpoint].chomp('/'))
+    @provider = parsed_response['appdb:broker']['appdb:reply']['appdb:appdb']['virtualization:provider'].select do |prov|
+      prov['provider:endpoint_url'] && (prov['provider:endpoint_url'].chomp('/') == options[:endpoint].chomp('/'))
     end.first
     fail "Could not locate site by endpoint #{options[:endpoint].inspect} in AppDB" unless @provider
 

data/lib/nagios/promoo/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nagios-promoo
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Boris Parak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-08 00:00:00.000000000 Z
+date: 2016-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: occi-api
@@ -284,7 +284,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Nagios Probes for Monitoring OpenNebula and OCCI