nagios-promoo 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a4c97556cd0192da5dc5a9919e453ae268e11b6
-  data.tar.gz: 10753a0c8b874b989c6e1a08d6dcf48dc5275b30
+  metadata.gz: 776caf450626d472aa75ddd72a1cb24ed231b858
+  data.tar.gz: c1833207e57564af55bd7363f7ab0e19872a269a
 SHA512:
-  metadata.gz: fd5cf2d9e47bb4a8ecd46eea83c9e092b2b6411bb20187c5f67b086fc2bd17f18ad3182244ebc5a458e8c5aaf68a4ab31d9ee66fc7819da21ca9806b667a4fc9
-  data.tar.gz: f0131cefac9ffaa2125bcfde5cce57f6dc571eb382b1c4865a53fd03db8f286062e03232c0368c3d49191c6854ff34f45fa8e2aa8dcda3b8169c47587c868ab0
+  metadata.gz: 62f74f848f0de94c5f2b3c78477a0b5fc153c59ed0f8688daee0dc5ea66c307f7e9fc9eb3e4cb3492502d5f1dba011a5ecc58e588b4fbf9db10b9c81769dedd7
+  data.tar.gz: 340a9af73318b73f8c61ee64ca1d0a1fdd4bff45ba58d80eac594273aa635059bb52665a377ed9290c2132d6be0307c1a045d1041215d419ca8191df332170df

data/History.md

@@ -1,4 +1,9 @@
 
+1.7.0 / 2017-11-24
+==================
+
+  * Switching to AppDB IS in AppDB probes
+
 1.6.0 / 2017-11-20
 ==================
 

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

@@ -15,7 +15,16 @@ module Nagios
             end
 
             def options
-              []
+              [
+                [
+                  :vo,
+                  {
+                    type: :string,
+                    required: true,
+                    desc: 'Virtual Organization name (used to select the appropriate set of appliances)'
+                  }
+                ]
+              ]
             end
 
             def declaration
@@ -28,27 +37,18 @@ module Nagios
           end
 
           def run(_args = [])
-            @_count = 0
-
-            Timeout.timeout(options[:timeout]) { check_appliances }
-
-            if @_count < 1
-              puts 'APPLIANCES CRITICAL - No appliances found in AppDB'
+            count = Timeout.timeout(options[:timeout]) { appliances_by_endpoint(options[:vo]).count }
+            if count < 1
+              puts "APPLIANCES CRITICAL - No appliances found for VO #{options[:vo]} in AppDB"
               exit 2
             end
 
-            puts "APPLIANCES OK - Found #{@_count} appliances in AppDB"
+            puts "APPLIANCES OK - Found #{count} appliances for VO #{options[:vo]} in AppDB"
           rescue => ex
             puts "APPLIANCES UNKNOWN - #{ex.message}"
             puts ex.backtrace if options[:debug]
             exit 3
           end
-
-          private
-
-          def check_appliances
-            @_count = [appdb_provider['provider:image']].flatten.compact.count
-          end
         end
       end
     end

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

@@ -12,39 +12,61 @@ module Nagios
             end
           end
 
-          APPDB_PROVIDERS_URL = 'https://appdb.egi.eu/rest/1.0/va_providers?listmode=details'.freeze
+          APPDB_IS_URL = 'http://is.marie.hellasgrid.gr/graphql'.freeze
+          DEFAULT_HEADERS = { 'Content-Type' => 'application/json' }.freeze
+          GQL_SIZES_BY_ENDPOINT = %|
+{
+  siteServiceTemplates(
+    filter: { service: { endpointURL: { eq: "$$ENDPOINT$$" } } }, limit: 1000
+  ) {
+    items { resourceID }
+  }
+}
+|.freeze
+          GQL_APPLIANCES_BY_ENDPOINT = %|
+{
+  siteServiceImages(
+    filter: { imageVoVmiInstanceVO: { eq: "$$VO$$" }, service: { endpointURL: { eq: "$$ENDPOINT$$" } } }, limit: 1000
+  ) {
+    items { applicationEnvironmentRepository applicationEnvironmentAppVersion }
+  }
+}
+|.freeze
 
-          attr_reader :options
+          attr_reader :options, :endpoint
 
           def initialize(options)
             @options = options
+            @endpoint = options[:endpoint].gsub(%r{/+$}, '')
           end
 
-          def appdb_provider
-            return @_provider if @_provider
+          def sizes_by_endpoint
+            return @_sizes if @_sizes
 
-            @_provider = appdb_providers.detect do |prov|
-              prov['provider:endpoint_url'].chomp('/') == options[:endpoint].chomp('/')
-            end
-            raise "Could not locate site by endpoint #{options[:endpoint].inspect} in AppDB" unless @_provider
+            query = GQL_SIZES_BY_ENDPOINT.gsub('$$ENDPOINT$$', endpoint)
+            @_sizes = make(query)['data']['siteServiceTemplates']['items']
+            raise "Could not locate sizes from endpoint #{endpoint.inspect} in AppDB" unless @_sizes
 
-            @_provider
+            @_sizes
           end
 
-          private
+          def appliances_by_endpoint(vo)
+            return @_appliances if @_appliances
 
-          def appdb_providers
-            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)
+            query = GQL_APPLIANCES_BY_ENDPOINT.gsub('$$ENDPOINT$$', endpoint).gsub('$$VO$$', vo)
+            @_appliances = make(query)['data']['siteServiceImages']['items']
+            raise "Could not locate appliances from endpoint #{endpoint.inspect} in AppDB" unless @_appliances
 
-            providers = response.parsed_response['appdb:appdb']['virtualization:provider']
-            providers.delete_if { |prov| prov['provider:endpoint_url'].blank? }
+            @_appliances
           end
 
-          def valid_response?(response)
-            response['appdb:appdb'] \
-            && response['appdb:appdb']['virtualization:provider']
+          private
+
+          def make(query)
+            response = HTTParty.post(APPDB_IS_URL, body: { query: query }.to_json, headers: DEFAULT_HEADERS)
+            raise "#{query.inspect} failed to get data from AppDB [HTTP #{response.code}]" unless response.success?
+
+            response.parsed_response
           end
         end
       end

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

@@ -28,27 +28,18 @@ module Nagios
           end
 
           def run(_args = [])
-            @_count = 0
-
-            Timeout.timeout(options[:timeout]) { check_sizes }
-
-            if @_count < 1
+            count = Timeout.timeout(options[:timeout]) { sizes_by_endpoint.count }
+            if count < 1
               puts 'SIZES CRITICAL - No size/flavor/resource templates found in AppDB'
               exit 2
             end
 
-            puts "SIZES OK - Found #{@_count} size/flavor/resource templates in AppDB"
+            puts "SIZES OK - Found #{count} size/flavor/resource templates in AppDB"
           rescue => ex
             puts "SIZES UNKNOWN - #{ex.message}"
             puts ex.backtrace if options[:debug]
             exit 3
           end
-
-          private
-
-          def check_sizes
-            @_count = [appdb_provider['provider:template']].flatten.compact.count
-          end
         end
       end
     end

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

@@ -104,42 +104,34 @@ module Nagios
               mpuri_versionless = versionless_mpuri(hv_image['ad:mpuri'])
               @_results[:expected] << mpuri_versionless
 
-              matching = provider_appliances.detect { |appl| appl['mp_uri'] == mpuri_versionless }
+              matching = appliances_by_endpoint(options[:vo]).detect do |appl|
+                versionless_mpuri(appl['applicationEnvironmentRepository']) == mpuri_versionless
+              end
+
               unless matching
                 @_results[:missing] << mpuri_versionless
                 next
               end
 
-              @_results[:outdated] << mpuri_versionless if hv_image['hv:version'] != matching['vmiversion']
-              @_results[:found] << mpuri_versionless
-            end
-          end
-
-          def provider_appliances
-            return @_appliances if @_appliances
-
-            @_appliances = [appdb_provider['provider:image']].flatten.compact
-            @_appliances.keep_if { |appliance| appliance['voname'] == options[:vo] }
-            @_appliances.reject { |appliance| appliance['mp_uri'].blank? }
+              unless hv_image['hv:version'] == matching['applicationEnvironmentAppVersion']
+                @_results[:outdated] << mpuri_versionless
+              end
 
-            @_appliances.each do |appliance|
-              appliance['mp_uri'] = versionless_mpuri(appliance['mp_uri'])
+              @_results[:found] << mpuri_versionless
             end
-
-            @_appliances
           end
 
           def vo_list
             return @_hv_images if @_hv_images
 
-            list = JSON.parse pkcs7_data
-            raise "AppDB image list #{list_url.inspect} is empty or malformed" unless list && list['hv:imagelist']
+            list = JSON.parse(pkcs7_data)
+            raise 'AppDB image list is empty or malformed' unless list && list['hv:imagelist']
 
             list = list['hv:imagelist']
             unless Time.parse(list['dc:date:expires']) > Time.now
-              raise "AppDB image list #{list_url.inspect} has expired"
+              raise 'AppDB image list has expired'
             end
-            raise "AppDB image list #{list_url.inspect} doesn't contain images" unless list['hv:images']
+            raise "AppDB image list doesn't contain images" unless list['hv:images']
             @_last_update = Time.parse(list['dc:date:created'])
 
             @_hv_images = list['hv:images'].collect { |im| im['hv:image'] }
@@ -153,11 +145,9 @@ module Nagios
           end
 
           def retrieve_list
-            response = HTTParty.get list_url
-            unless response.success?
-              raise 'Could not get a VO-wide image list' \
-                   "from #{list_url.inspect} [#{response.code}]"
-            end
+            response = HTTParty.get(list_url)
+            raise "Could not get an image list from AppDB [HTTP #{response.code}]" unless response.success?
+
             response.parsed_response
           end
 

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

@@ -1,7 +1,7 @@
 module Nagios
   module Promoo
     module Appdb
-      VERSION = '1.2.1'.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.6.0'.freeze
+    VERSION = '1.7.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nagios-promoo
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Boris Parak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-20 00:00:00.000000000 Z
+date: 2017-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport