nagios-promoo 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37eb72c6a72643b3f6cbd46813aefd70cc7ba0dc
-  data.tar.gz: 15040ffff6884f1a2520cdaae33bcbcbe0a6bfd8
+  metadata.gz: 9043be237dc97ac7bdb31cfd4be73029353dc2c3
+  data.tar.gz: f172f315b3aad9bea0485b85ab96a2ab0a4b3933
 SHA512:
-  metadata.gz: 21dc3378b775714ae7821dd33662361502ef80e65a1e3fd961b3d57298cb259839ba0fb9b818fd4a5e70a43b4c4e7f04cc98ce1677971e9856209ba1f73cd3b3
-  data.tar.gz: 23a0400d4f4f12aa26f429da56bb1effe143eec86defbd87aa5c147a345490b6c5d42a7db4ae03154eae290488527055ea7c224cead96def6de38e5276e9cc29
+  metadata.gz: 22c9ff0527e02594d5091bb55ed3300a827b83b898041950440db851b7c7db659134858232ef26af7c164129cdd7fb6eebfdc9b1d0364957e93a4792e5ab39fd
+  data.tar.gz: 8c83796b632e84e248d1cccdf8f32c17a3078a41cc10996a9021c4e6c0c5deec24b21527902d2491d5cfd86f90ea44b603967f8b97086005de5b870c02841a63

data/README.md

@@ -1,4 +1,4 @@
-# Nagios Probes for Monitoring OpenNebula and OCCI
+# Nagios Probes for Monitoring OpenNebula and OCCI-enabled clouds
 
 ## Installation
 

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

@@ -24,6 +24,7 @@ class Nagios::Promoo::Occi::Probes::ComputeProbe < Nagios::Promoo::Occi::Probes:
     def runnable?; true; end
   end
 
+  CPU_SUM_WEIGHT = 1000
   COMPUTE_NAME_PREFIX = "sam-nagios-promoo"
   CACHE_DIR = '/tmp/nagios-promoo_cache'
   APPDB_PROXY_URL = 'https://appdb.egi.eu/api/proxy'
@@ -53,8 +54,8 @@ class Nagios::Promoo::Occi::Probes::ComputeProbe < Nagios::Promoo::Occi::Probes:
       compute = client(options).get_resource('compute')
       compute.title = compute.hostname = "#{COMPUTE_NAME_PREFIX}-#{Time.now.to_i}"
 
-      compute.mixins << client(options).get_mixin(os_tpl, 'os_tpl', true)
-      compute.mixins << client(options).get_mixin(resource_tpl, 'resource_tpl', true)
+      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)
@@ -73,6 +74,12 @@ class Nagios::Promoo::Occi::Probes::ComputeProbe < Nagios::Promoo::Occi::Probes:
     link
   end
 
+  def get_mixin(term, type, options)
+    mxn = client(options).get_mixin(term, type, true)
+    fail "Mixin #{term.inspect} of type #{type.inspect} not found at the site" unless mxn
+    mxn
+  end
+
   def wait4compute(link, options)
     state = 'inactive'
 
@@ -103,10 +110,12 @@ class Nagios::Promoo::Occi::Probes::ComputeProbe < Nagios::Promoo::Occi::Probes:
   end
 
   def appdb_appliance(options)
+    appliance = nil
     appliance = appdb_provider(options)['image'].select do |image|
       image['mp_uri'] && (normalize_mpuri(image['mp_uri']) == normalize_mpuri(options[:mpuri]))
-    end.first
-    fail "No such appliance is published in AppDB" if appliance.blank?
+    end.first if appdb_provider(options)['image']
+    fail "Site does not have an appliance with MPURI "\
+         "#{normalize_mpuri(options[:mpuri]).inspect} published in AppDB" if appliance.blank?
 
     appliance['va_provider_image_id'].split('#').last
   end
@@ -116,9 +125,9 @@ class Nagios::Promoo::Occi::Probes::ComputeProbe < Nagios::Promoo::Occi::Probes:
     appdb_provider(options)['template'].each do |template|
       sizes << [
         template['resource_name'].split('#').last,
-        template['main_memory_size'].to_i + template['physical_cpus'].to_i
+        template['main_memory_size'].to_i + (template['physical_cpus'].to_i * CPU_SUM_WEIGHT)
       ]
-    end
+    end if appdb_provider(options)['template']
     fail "No appliance sizes available in AppDB" if sizes.blank?
     sizes.sort! { |x,y| x.last <=> y.last }
 

data/lib/nagios/promoo/version.rb

@@ -1,5 +1,5 @@
 module Nagios
   module Promoo
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nagios-promoo
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Boris Parak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-02 00:00:00.000000000 Z
+date: 2016-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: occi-api