nagios-promoo 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78d3db9f61b715786ba4c92aa9765abb039dce86
-  data.tar.gz: 26182500e7ebf442b5d11dfc16a4f6e628d0378e
+  metadata.gz: a2c15e3b9d6a452b5b7972c715f6e7ac5cbfcbea
+  data.tar.gz: d592f809c7b003a0ea38dfc9b17ea2293c7ca356
 SHA512:
-  metadata.gz: d266be6dd777758936c001037c3e9b0b688a6010dc5805355ca1ebdfa5c7e0cd8c18dbdaad9be0a99d4e2e66c0f0330eea6c1a52864968e5aa0e5fdeb6e6dceb
-  data.tar.gz: 0d88c5bcf26929ffe30d981ea3ec64f977ea40efabe8062f902dced1bcc5b322d5646adf615931202eae3d5be74618e16f1d2bf18b8d7742c4a3610c29a36fa2
+  metadata.gz: 47dff019a4bb3d36e8235ac3afa16eda38c14fb6abe0f26d2e502e52bf97275a0cb2c5ffd2f1637cf3380c1655dcdb85710e37f7a27d1656ec43f82547e78e21
+  data.tar.gz: 5b5eab6dee2fb3fd60725e4a312cf494a733fe78e804e87563be31e2315e748c9c191d0751a60bea025dc89f48ac820e4f0e1a59457a282e9b28a1cd81c21db2

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

@@ -12,13 +12,7 @@ module Nagios
             end
           end
 
-          APPDB_PROXY_URL = 'https://appdb.egi.eu/api/proxy'.freeze
-          APPDB_REQUEST_FORM = 'version=1.0&resource=broker&data=%3Cappdb%3Abroker%20xmlns%3Axs%3D%22http%3A%2F%2F' \
-                               'www.w3.org%2F2001%2FXMLSchema%22%20xmlns%3Axsi%3D%22http%3A%2F%2Fwww.w3.org%2F2001%2F' \
-                               'XMLSchema-instance%22%20xmlns%3Aappdb%3D%22http%3A%2F%2Fappdb.egi.eu%2Fapi%2F1.0%2F' \
-                               'appdb%22%3E%3Cappdb%3Arequest%20id%3D%22vaproviders%22%20method%3D%22GET%22%20' \
-                               'resource%3D%22va_providers%22%3E%3Cappdb%3Aparam%20name%3D%22listmode%22%3Edetails' \
-                               '%3C%2Fappdb%3Aparam%3E%3C%2Fappdb%3Arequest%3E%3C%2Fappdb%3Abroker%3E'.freeze
+          APPDB_PROVIDERS_URL = 'https://appdb.egi.eu/rest/1.0/va_providers?listmode=details'.freeze
 
           attr_reader :options
 
@@ -40,20 +34,17 @@ module Nagios
           private
 
           def appdb_providers
-            response = HTTParty.post(APPDB_PROXY_URL, body: APPDB_REQUEST_FORM)
+            response = HTTParty.get(APPDB_PROVIDERS_URL)
             raise "Could not get site details from AppDB [HTTP #{response.code}]" unless response.success?
             raise 'Response from AppDB has unexpected structure' unless valid_response?(response.parsed_response)
 
-            providers = response.parsed_response['appdb:broker']['appdb:reply']\
-                                                ['appdb:appdb']['virtualization:provider']
+            providers = response.parsed_response['appdb:appdb']['virtualization:provider']
             providers.delete_if { |prov| prov['provider:endpoint_url'].blank? }
           end
 
           def valid_response?(response)
-            response['appdb:broker'] \
-            && response['appdb:broker']['appdb:reply'] \
-            && response['appdb:broker']['appdb:reply']['appdb:appdb'] \
-            && response['appdb:broker']['appdb:reply']['appdb:appdb']['virtualization:provider']
+            response['appdb:appdb'] \
+            && response['appdb:appdb']['virtualization:provider']
           end
         end
       end

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

@@ -1,7 +1,7 @@
 module Nagios
   module Promoo
     module Appdb
-      VERSION = '1.2.0'.freeze
+      VERSION = '1.2.1'.freeze
     end
   end
 end

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

@@ -16,7 +16,15 @@ module Nagios
 
             def options
               [
-                [:mpuri, { type: :string, required: true, desc: 'AppDB MPURI referencing a virtual appliance' }],
+                [:appid, { type: :string, required: true, desc: 'AppDB ID referencing a virtual appliance' }],
+                [
+                  :vo,
+                  {
+                    type: :string,
+                    required: true,
+                    desc: 'Virtual Organization name used to select the appropriate virtual appliance'
+                  }
+                ],
                 [
                   :with_storage,
                   {
@@ -45,15 +53,8 @@ module Nagios
           CPU_SUM_WEIGHT = 1000
           COMPUTE_NAME_PREFIX = 'sam-nagios-promoo'.freeze
           DEFAULT_STORAGE_SIZE = 1 # GB
-          APPDB_PROXY_URL = 'https://appdb.egi.eu/api/proxy'.freeze
-          APPDB_REQUEST_FORM = 'version=1.0&resource=broker&data=%3Cappdb%3Abroker%20xmlns' \
-                               '%3Axs%3D%22http%3A%2F%2Fwww.w3.org%2F2001%2FXMLSchema%22%20' \
-                               'xmlns%3Axsi%3D%22http%3A%2F%2Fwww.w3.org%2F2001%2FXML' \
-                               'Schema-instance%22%20xmlns%3Aappdb%3D%22http%3A%2F%2F' \
-                               'appdb.egi.eu%2Fapi%2F1.0%2Fappdb%22%3E%3Cappdb%3Arequest%20' \
-                               'id%3D%22vaproviders%22%20method%3D%22GET%22%20resource%3D%22' \
-                               'va_providers%22%3E%3Cappdb%3Aparam%20name%3D%22listmode%22%3E' \
-                               'details%3C%2Fappdb%3Aparam%3E%3C%2Fappdb%3Arequest%3E%3C%2Fappdb%3Abroker%3E'.freeze
+
+          APPDB_PROVIDERS_URL = 'https://appdb.egi.eu/rest/1.0/va_providers?listmode=details'.freeze
 
           def run(_args = [])
             @_links = {}
@@ -181,14 +182,14 @@ module Nagios
 
           def appdb_appliance
             appliances = [appdb_provider['provider:image']].flatten.compact
-            appliances.delete_if { |appl| appl['mp_uri'].blank? }
+            appliances.delete_if { |appl| appl['appid'].blank? }
 
             appliance = appliances.detect do |appl|
-              normalize_mpuri(appl['mp_uri']) == normalize_mpuri(options[:mpuri])
+              appl['appid'] == options[:appid] && appl['voname'] == options[:vo]
             end
             if appliance.blank?
-              raise 'Site does not have an appliance with MPURI '\
-                   "#{normalize_mpuri(options[:mpuri]).inspect} published in AppDB"
+              raise 'Site does not have an appliance with AppID '\
+                   "#{options[:appid]} published in AppDB for VO #{options[:vo]}"
             end
 
             appliance['va_provider_image_id'].split('#').last
@@ -224,15 +225,14 @@ module Nagios
 
           def appdb_providers
             parsed_response = cache_fetch('appdb-sites', options[:cache_expiration]) do
-              response = HTTParty.post(APPDB_PROXY_URL, body: APPDB_REQUEST_FORM)
+              response = HTTParty.get(APPDB_PROVIDERS_URL)
               raise "Could not get appliance details from AppDB [#{response.code}]" unless response.success?
               raise 'Response from AppDB has unexpected structure' unless valid_response?(response.parsed_response)
 
               response.parsed_response
             end
 
-            providers = parsed_response['appdb:broker']['appdb:reply']\
-                                       ['appdb:appdb']['virtualization:provider']
+            providers = parsed_response['appdb:appdb']['virtualization:provider']
             providers.delete_if { |prov| prov['provider:endpoint_url'].blank? }
           end
 
@@ -241,10 +241,8 @@ module Nagios
           end
 
           def valid_response?(response)
-            response['appdb:broker'] \
-            && response['appdb:broker']['appdb:reply'] \
-            && response['appdb:broker']['appdb:reply']['appdb:appdb'] \
-            && response['appdb:broker']['appdb:reply']['appdb:appdb']['virtualization:provider']
+            response['appdb:appdb'] \
+            && response['appdb:appdb']['virtualization:provider']
           end
 
           include Nagios::Promoo::Utils::Cache

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

@@ -1,7 +1,7 @@
 module Nagios
   module Promoo
     module Occi
-      VERSION = '1.2.0'.freeze
+      VERSION = '1.3.0'.freeze
     end
   end
 end

data/lib/nagios/promoo/version.rb

@@ -1,5 +1,5 @@
 module Nagios
   module Promoo
-    VERSION = '1.3.1'.freeze
+    VERSION = '1.4.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nagios-promoo
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Boris Parak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-14 00:00:00.000000000 Z
+date: 2017-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: occi-api
@@ -359,7 +359,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Nagios Probes for Monitoring OpenNebula and OCCI