nagios-promoo 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e735c8510920fe9ed8dd4d200c31aca66a7771f
-  data.tar.gz: c7ca40aa71dbf5291d3b975860518758bce65bee
+  metadata.gz: 03a43d2f650bc5bfa06dc735193c61b22ec16fba
+  data.tar.gz: f07fda7f6d2240c5e140509feeb05ab2b5c405d7
 SHA512:
-  metadata.gz: 2e1ca3d2b6a99c7a34d19b06e2feecdc49e24aecb63c6a57ce526c5ab1858a0ffcb9ec4f9272b80162c801f2002170d1faea6f3bae6cb0b4d445c1b51cc17acd
-  data.tar.gz: 9c15ac5874413491dcd88b478f71f681e71c796550bda663666b3ea38b0e4bd8c559f85513e8b0dbf867e7a00ffe96f4102792085b64d6c347839e56296ad71b
+  metadata.gz: 437c81a1847705426e476d597ed0e7744d463d3158c888db3b402340e374e1644ee74cc67c5782589f2719389e8fd950add0fa8ae2c3a28a73b9029e2b9fe8b4
+  data.tar.gz: 36d059ca5a98c910f570b1ae6ca376f25e104fb618f817f2931ee4f01f5406d77def52f9671ca33cbea62db23357af1a950fb9a84d9b329c75c2ca9388388349

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

@@ -11,8 +11,8 @@ class Nagios::Promoo::Appdb::Probes::VmcatcherProbe < Nagios::Promoo::Appdb::Pro
       [
         [:vo, { type: :string, required: true, desc: 'Virtual Organization name (used to select the appropriate VO-wide image list)' }],
         [:token, { type: :string, required: true, desc: 'AppDB authentication token (used to access the VO-wide image list)' }],
-        [:missing_critical, { type: :numeric, default: 2, desc: 'Number of missing appliances to be considered CRITICAL' }],
-        [:outdated_critical, { type: :numeric, default: 5, desc: 'Number of outdated appliances to be considered CRITICAL' }],
+        [:warning_after, { type: :numeric, default: 24, desc: 'A number of hours after list publication when missing or outdated appliances raise WARNING' }],
+        [:critical_after, { type: :numeric, default: 72, desc: 'A number of hours after list publication when missing or outdated appliances raise CRITICAL' }],
       ]
     end
 
@@ -31,22 +31,25 @@ class Nagios::Promoo::Appdb::Probes::VmcatcherProbe < Nagios::Promoo::Appdb::Pro
 
     Timeout::timeout(options[:timeout]) { check_vmc_sync }
 
-    if @_results[:missing].count >= options[:missing_critical]
-      puts "VMCATCHER CRITICAL - #{@_results[:missing].count} appliance(s) in #{options[:vo].inspect} missing"
-      exit 2
-    end
-
-    if @_results[:outdated].count >= options[:outdated_critical]
-      puts "VMCATCHER CRITICAL - #{@_results[:outdated].count} appliance(s) in #{options[:vo].inspect} outdated"
-      exit 2
-    end
+    wrong = @_results[:missing] + @_results[:outdated]
+    if wrong.any?
+      if (@_last_update + options[:critical_after].hours) < Time.now
+        puts "VMCATCHER CRITICAL - Appliance(s) #{wrong.inspect} missing " \
+             "or outdated in #{options[:vo].inspect} " \
+             "more than #{options[:critical_after]} hours after list publication [#{@_last_update}]"
+        exit 2
+      end
 
-    if @_results[:outdated].count > 0
-      puts "VMCATCHER WARNING - #{@_results[:outdated].count} appliances in #{options[:vo].inspect} outdated"
-      exit 1
+      if (@_last_update + options[:warning_after].hours) < Time.now
+        puts "VMCATCHER WARNING - Appliance(s) #{wrong.inspect} missing " \
+             "or outdated in #{options[:vo].inspect} " \
+             "more than #{options[:warning_after]} hours after list publication [#{@_last_update}]"
+        exit 1
+      end
     end
 
-    puts "VMCATCHER OK - All appliances registered in #{options[:vo].inspect} are available [#{@_results[:expected].count}]"
+    puts "VMCATCHER OK - All appliances registered in #{options[:vo].inspect} " \
+         "are available [#{@_results[:expected].count}]"
   rescue => ex
     puts "VMCATCHER UNKNOWN - #{ex.message}"
     puts ex.backtrace if options[:debug]
@@ -95,10 +98,14 @@ class Nagios::Promoo::Appdb::Probes::VmcatcherProbe < Nagios::Promoo::Appdb::Pro
          "from #{list_url.inspect} [#{response.code}]" unless response.success?
 
     list = JSON.parse OpenSSL::PKCS7.read_smime(response.parsed_response).data
-    fail "AppDB image list #{list_url.inspect} does " \
-         "not contain images" unless list && list['hv:imagelist'] && list['hv:imagelist']['hv:images']
+    fail "AppDB image list #{list_url.inspect} is empty or malformed" unless list && list['hv:imagelist']
+
+    list = list['hv:imagelist']
+    fail "AppDB image list #{list_url.inspect} has expired" unless DateTime.parse(list['dc:date:expires']) > Time.now
+    fail "AppDB image list #{list_url.inspect} doesn't contain images" unless list['hv:images']
 
-    @_hv_images = list['hv:imagelist']['hv:images'].collect { |im| im['hv:image'] }.reject { |im| im.blank? || im['ad:mpuri'].blank? }
+    @_last_update = DateTime.parse list['dc:date:created']
+    @_hv_images = list['hv:images'].collect { |im| im['hv:image'] }.reject { |im| im.blank? || im['ad:mpuri'].blank? }
   end
 
   def normalize_mpuri(mpuri)

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

@@ -1,7 +1,7 @@
 module Nagios
   module Promoo
     module Appdb
-      VERSION = "1.0.0"
+      VERSION = "1.1.0"
     end
   end
 end

data/lib/nagios/promoo/version.rb

@@ -1,5 +1,5 @@
 module Nagios
   module Promoo
-    VERSION = "1.0.0"
+    VERSION = "1.1.0"
   end
 end

data/lib/nagios/promoo.rb

@@ -1,9 +1,11 @@
 # Global deps
+require 'active_support/all'
 require 'thor'
 require 'timeout'
 require 'ox'
 require 'multi_xml'
 require 'httparty'
+require 'date'
 
 # Force multi_xml to use ox
 MultiXml.parser = :ox

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nagios-promoo
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Boris Parak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-27 00:00:00.000000000 Z
+date: 2017-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: occi-api