nagios-promoo 1.1.0 → 1.2.0

data/lib/nagios/promoo/opennebula/probes/xmlrpc_health_probe.rb

@@ -1,31 +1,44 @@
 # Internal deps
 require File.join(File.dirname(__FILE__), 'base_probe')
 
-class Nagios::Promoo::Opennebula::Probes::XmlrpcHealthProbe < Nagios::Promoo::Opennebula::Probes::BaseProbe
-  class << self
-    def description
-      ['xmlrpc-health', 'Run a probe checking OpenNebula\'s XML RPC service']
-    end
+module Nagios
+  module Promoo
+    module Opennebula
+      module Probes
+        # Probe for checking ONe XML RPC2 health.
+        #
+        # @author Boris Parak <parak@cesnet.cz>
+        class XmlrpcHealthProbe < Nagios::Promoo::Opennebula::Probes::BaseProbe
+          class << self
+            def description
+              ['xmlrpc-health', 'Run a probe checking OpenNebula\'s XML RPC service']
+            end
 
-    def options
-      []
-    end
+            def options
+              []
+            end
 
-    def declaration
-      "xmlrpc_health"
-    end
+            def declaration
+              'xmlrpc_health'
+            end
 
-    def runnable?; true; end
-  end
+            def runnable?
+              true
+            end
+          end
 
-  def run(args = [])
-    rc = Timeout::timeout(options[:timeout]) { client.get_version }
-    fail rc.message if OpenNebula.is_error?(rc)
+          def run(_args = [])
+            rc = Timeout.timeout(options[:timeout]) { client.get_version }
+            raise rc.message if OpenNebula.is_error?(rc)
 
-    puts "XMLRPC OK - OpenNebula #{rc} daemon is up and running"
-  rescue => ex
-    puts "XMLRPC CRITICAL - #{ex.message}"
-    puts ex.backtrace if options[:debug]
-    exit 2
+            puts "XMLRPC OK - OpenNebula #{rc} daemon is up and running"
+          rescue => ex
+            puts "XMLRPC CRITICAL - #{ex.message}"
+            puts ex.backtrace if options[:debug]
+            exit 2
+          end
+        end
+      end
+    end
   end
 end

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

@@ -1,7 +1,7 @@
 module Nagios
   module Promoo
     module Opennebula
-      VERSION = "1.0.0"
+      VERSION = '1.0.0'.freeze
     end
   end
 end

data/lib/nagios/promoo/utils.rb

@@ -1,31 +1,53 @@
-module Nagios::Promoo::Utils
-  module Cache
-    CACHE_DIR = '/tmp/nagios-promoo_cache'
+module Nagios
+  module Promoo
+    # Namespace for helpers and aux utilities.
+    #
+    # @author Boris Parak <parak@cesnet.cz>
+    module Utils
+      # Caching helpers for arbitrary use.
+      #
+      # @author Boris Parak <parak@cesnet.cz>
+      module Cache
+        CACHE_DIR = '/tmp/nagios-promoo_cache'.freeze
 
-    def cache_fetch(key, expiration = 3600)
-      fail 'You have to provide a block!' unless block_given?
-      FileUtils.mkdir_p CACHE_DIR
-      filename = File.join(CACHE_DIR, key)
+        def cache_fetch(key, expiration = 3600)
+          raise 'You have to provide a block!' unless block_given?
+          FileUtils.mkdir_p CACHE_DIR
+          filename = File.join(CACHE_DIR, key)
 
-      if cache_valid?(filename, expiration)
-        File.open(filename, 'r') { |file|
-          file.flock(File::LOCK_SH)
-          JSON.parse file.read
-        }
-      else
-        data = yield
-        File.open(filename, File::RDWR|File::CREAT, 0644) { |file|
-          file.flock(File::LOCK_EX)
-          file.write JSON.pretty_generate(data)
-          file.flush
-          file.truncate(file.pos)
-        } unless data.blank?
-        data
-      end
-    end
+          if cache_valid?(filename, expiration)
+            read_cache filename
+          else
+            write_cache filename, yield
+          end
+        end
+
+        def read_cache(filename)
+          File.open(filename, 'r') do |file|
+            file.flock(File::LOCK_SH)
+            JSON.parse file.read
+          end
+        end
+
+        def write_cache(filename, data)
+          return data if data.blank?
 
-    def cache_valid?(filename, expiration)
-      File.exists?(filename) && !File.zero?(filename) && ((Time.now - expiration) < File.stat(filename).mtime)
+          File.open(filename, File::RDWR | File::CREAT, 0o644) do |file|
+            file.flock(File::LOCK_EX)
+            file.write JSON.fast_generate(data)
+            file.flush
+            file.truncate(file.pos)
+          end
+
+          data
+        end
+
+        def cache_valid?(filename, expiration)
+          File.exist?(filename) \
+            && !File.zero?(filename) \
+            && ((Time.now - expiration) < File.stat(filename).mtime)
+        end
+      end
     end
   end
 end

data/lib/nagios/promoo/version.rb

@@ -1,5 +1,5 @@
 module Nagios
   module Promoo
-    VERSION = "1.1.0"
+    VERSION = '1.2.0'.freeze
   end
 end

data/nagios-promoo.gemspec

@@ -1,4 +1,5 @@
 # coding: utf-8
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'nagios/promoo/version'
@@ -8,9 +9,9 @@ Gem::Specification.new do |spec|
   spec.version       = Nagios::Promoo::VERSION
   spec.authors       = ['Boris Parak']
   spec.email         = ['parak@cesnet.cz']
-  spec.summary       = %q{Nagios Probes for Monitoring OpenNebula and OCCI}
-  spec.description   = %q{Nagios Probes for Monitoring OpenNebula and OCCI}
-  spec.homepage      = 'https://github.com/EGI-FCTF/nagios-promoo'
+  spec.summary       = 'Nagios Probes for Monitoring OpenNebula and OCCI'
+  spec.description   = 'Nagios Probes for Monitoring OpenNebula and OCCI'
+  spec.homepage      = 'https://github.com/arax/nagios-promoo'
   spec.license       = 'Apache License, Version 2.0'
 
   spec.files         = `git ls-files -z`.split("\x0")
@@ -34,5 +35,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubocop', '>= 0.47', '< 1'
   spec.add_development_dependency 'pry', '>= 0.10', '< 1'
 
-  spec.required_ruby_version = '>= 1.9.3'
+  spec.required_ruby_version = '>= 2.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nagios-promoo
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Boris Parak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-30 00:00:00.000000000 Z
+date: 2017-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: occi-api
@@ -299,6 +299,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -311,7 +314,7 @@ files:
 - lib/nagios/promoo/appdb/probes/appliances_probe.rb
 - lib/nagios/promoo/appdb/probes/base_probe.rb
 - lib/nagios/promoo/appdb/probes/sizes_probe.rb
-- lib/nagios/promoo/appdb/probes/vmcatcher_probe.rb
+- lib/nagios/promoo/appdb/probes/sync_probe.rb
 - lib/nagios/promoo/appdb/version.rb
 - lib/nagios/promoo/master.rb
 - lib/nagios/promoo/occi/.keep
@@ -334,7 +337,7 @@ files:
 - lib/nagios/promoo/version.rb
 - nagios-promoo.gemspec
 - test/.keep
-homepage: https://github.com/EGI-FCTF/nagios-promoo
+homepage: https://github.com/arax/nagios-promoo
 licenses:
 - Apache License, Version 2.0
 metadata: {}
@@ -346,7 +349,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -354,7 +357,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Nagios Probes for Monitoring OpenNebula and OCCI

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

@@ -1,118 +0,0 @@
-# Internal deps
-require File.join(File.dirname(__FILE__), 'base_probe')
-
-class Nagios::Promoo::Appdb::Probes::VmcatcherProbe < Nagios::Promoo::Appdb::Probes::BaseProbe
-  class << self
-    def description
-      ['vmcatcher', 'Run a probe checking consistency between a vmcatcher image list and available appliances (via AppDB)']
-    end
-
-    def options
-      [
-        [: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)' }],
-        [: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
-
-    def declaration
-      "vmcatcher"
-    end
-
-    def runnable?; true; end
-  end
-
-  IMAGE_LIST_TEMPLATE = "https://$$TOKEN$$:x-oauth-basic@vmcaster.appdb.egi.eu/store/vo/$$VO$$/image.list"
-  IMAGE_LIST_BOUNDARY_REGEXP = /boundary="(?<prefix>-+)(?<id>[[:alnum:]]+)"/
-
-  def run(args = [])
-    @_results = { found: [], outdated: [], missing: [], expected: [] }
-
-    Timeout::timeout(options[:timeout]) { check_vmc_sync }
-
-    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 (@_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}]"
-  rescue => ex
-    puts "VMCATCHER UNKNOWN - #{ex.message}"
-    puts ex.backtrace if options[:debug]
-    exit 3
-  end
-
-  private
-
-  def check_vmc_sync
-    vo_list.each do |hv_image|
-      mpuri_versionless = versionless_mpuri(hv_image['ad:mpuri'])
-      @_results[:expected] << mpuri_versionless
-
-      matching = provider_appliances.select { |appl| appl['mp_uri'] == mpuri_versionless }.first
-
-      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? }
-
-    @_appliances.each do |appliance|
-      appliance['mp_uri'] = versionless_mpuri(appliance['mp_uri'])
-    end
-
-    @_appliances
-  end
-
-  def vo_list
-    return @_hv_images if @_hv_images
-
-    list_url = IMAGE_LIST_TEMPLATE.gsub('$$TOKEN$$', options[:token]).gsub('$$VO$$', options[:vo])
-    response = HTTParty.get list_url
-    fail "Could not get a VO-wide image list" \
-         "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} 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']
-
-    @_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)
-    mpuri.gsub(/\/+$/, '')
-  end
-
-  def versionless_mpuri(mpuri)
-    normalize_mpuri(mpuri).gsub(/:\d+$/, '')
-  end
-end