nagios-promoo 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 776caf450626d472aa75ddd72a1cb24ed231b858
-  data.tar.gz: c1833207e57564af55bd7363f7ab0e19872a269a
+  metadata.gz: cc2cd6e6e2a3d9a76c0172908761abaea1ee0048
+  data.tar.gz: 68593940462b359328c6987d9ea9bc30bfe48889
 SHA512:
-  metadata.gz: 62f74f848f0de94c5f2b3c78477a0b5fc153c59ed0f8688daee0dc5ea66c307f7e9fc9eb3e4cb3492502d5f1dba011a5ecc58e588b4fbf9db10b9c81769dedd7
-  data.tar.gz: 340a9af73318b73f8c61ee64ca1d0a1fdd4bff45ba58d80eac594273aa635059bb52665a377ed9290c2132d6be0307c1a045d1041215d419ca8191df332170df
+  metadata.gz: 07f8e8873d47018aa85c6ba1b128e0f087eba95a1d744237f0981fca96a013cd054bdcffa52d9df268c4a38dc2f65b457bef070ec5ee2943485a282f24ecc75d
+  data.tar.gz: 1a7498d407f73530ca96d68630c0c48727f5c160f2c74fcc8f1230b4411bae1aca3f805cd66a0199b661f936c73295f835e7a8745246da2e331b234c0a04a2e9

data/History.md

@@ -1,4 +1,9 @@
 
+1.7.1 / 2017-11-25
+==================
+
+  * Fixed endpoint matching (no normalization)
+
 1.7.0 / 2017-11-24
 ==================
 

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

@@ -37,13 +37,13 @@ module Nagios
           end
 
           def run(_args = [])
-            count = Timeout.timeout(options[:timeout]) { appliances_by_endpoint(options[:vo]).count }
+            count = Timeout.timeout(options[:timeout]) { appliances_by_endpoint.count }
             if count < 1
-              puts "APPLIANCES CRITICAL - No appliances found for VO #{options[:vo]} in AppDB"
+              puts "APPLIANCES CRITICAL - No appliances found for VO #{vo} in AppDB"
               exit 2
             end
 
-            puts "APPLIANCES OK - Found #{count} appliances for VO #{options[:vo]} in AppDB"
+            puts "APPLIANCES OK - Found #{count} appliances for VO #{vo} in AppDB"
           rescue => ex
             puts "APPLIANCES UNKNOWN - #{ex.message}"
             puts ex.backtrace if options[:debug]

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

@@ -33,15 +33,17 @@ module Nagios
 }
 |.freeze
 
-          attr_reader :options, :endpoint
+          attr_reader :options, :endpoint, :vo
 
           def initialize(options)
             @options = options
-            @endpoint = options[:endpoint].gsub(%r{/+$}, '')
+            @endpoint = options.fetch(:endpoint)
+            @vo = options.fetch(:vo, nil)
           end
 
           def sizes_by_endpoint
             return @_sizes if @_sizes
+            raise '`endpoint` is a mandatory argument' if endpoint.blank?
 
             query = GQL_SIZES_BY_ENDPOINT.gsub('$$ENDPOINT$$', endpoint)
             @_sizes = make(query)['data']['siteServiceTemplates']['items']
@@ -50,8 +52,9 @@ module Nagios
             @_sizes
           end
 
-          def appliances_by_endpoint(vo)
+          def appliances_by_endpoint
             return @_appliances if @_appliances
+            raise '`endpoint` and `vo` are mandatory arguments' if endpoint.blank? || vo.blank?
 
             query = GQL_APPLIANCES_BY_ENDPOINT.gsub('$$ENDPOINT$$', endpoint).gsub('$$VO$$', vo)
             @_appliances = make(query)['data']['siteServiceImages']['items']

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

@@ -76,20 +76,20 @@ module Nagios
             if wrong.any?
               if (@_last_update + options[:critical_after].hours) < Time.now
                 puts "SYNC CRITICAL - Appliance(s) #{wrong.inspect} missing " \
-                     "or outdated in #{options[:vo].inspect} " \
+                     "or outdated in #{vo.inspect} " \
                      "more than #{options[:critical_after]} hours after list publication [#{@_last_update}]"
                 exit 2
               end
 
               if (@_last_update + options[:warning_after].hours) < Time.now
                 puts "SYNC WARNING - Appliance(s) #{wrong.inspect} missing " \
-                     "or outdated in #{options[:vo].inspect} " \
+                     "or outdated in #{vo.inspect} " \
                      "more than #{options[:warning_after]} hours after list publication [#{@_last_update}]"
                 exit 1
               end
             end
 
-            puts "SYNC OK - All appliances registered in #{options[:vo].inspect} " \
+            puts "SYNC OK - All appliances registered in #{vo.inspect} " \
                  "are available [#{@_results[:expected].count}]"
           rescue => ex
             puts "SYNC UNKNOWN - #{ex.message}"
@@ -104,7 +104,7 @@ module Nagios
               mpuri_versionless = versionless_mpuri(hv_image['ad:mpuri'])
               @_results[:expected] << mpuri_versionless
 
-              matching = appliances_by_endpoint(options[:vo]).detect do |appl|
+              matching = appliances_by_endpoint.detect do |appl|
                 versionless_mpuri(appl['applicationEnvironmentRepository']) == mpuri_versionless
               end
 
@@ -152,7 +152,7 @@ module Nagios
           end
 
           def list_url
-            IMAGE_LIST_TEMPLATE.gsub('$$TOKEN$$', options[:token]).gsub('$$VO$$', options[:vo])
+            IMAGE_LIST_TEMPLATE.gsub('$$TOKEN$$', options[:token]).gsub('$$VO$$', vo)
           end
 
           def normalize_mpuri(mpuri)

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

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

data/lib/nagios/promoo/version.rb

@@ -1,5 +1,5 @@
 module Nagios
   module Promoo
-    VERSION = '1.7.0'.freeze
+    VERSION = '1.7.1'.freeze
   end
 end

metadata

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