cloudstack-nagios 0.18.4 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03aab332e26ad104d0abe4d3ca7c58b00d0aab63
-  data.tar.gz: 22dbd6393c61eb42b7a8282072ba3dfc7367f185
+  metadata.gz: efe4c4038a1f73e7b1e6f2717eaf4ae88ce1d1d4
+  data.tar.gz: 921ca41d297b792c211a9147d72ce62c048c0beb
 SHA512:
-  metadata.gz: c9508adac25ac4871d401b302e69354106138512c9a674a95ffc377d97c27ae3ea18b8a0f67227cb2fd420e8217f8b68a5c2edacc6582fd7cea1ffc6d43f2ed3
-  data.tar.gz: 2f434f8892cc624df89db64497829efbf8a9bb164d5fd4916bb4ef3c8b9b67d54219ea854722591ebb760da284b9867b6829677509e632b111c3ed974d5a7bd4
+  metadata.gz: 53b5d45771194b938d598f48dfd9da9fd223be7b43cf2607e1fcd51c3bbc491652388a3ce034ebf216d085030fdcb028593f25c771f8498d3cd76fd5512e9204
+  data.tar.gz: 8a2aa486abf30158c47b6f4c7aed53071b1ebe0db4bbc17d0719260e18a65cfee7e1a934cddedf2e628a40232e3b673d3b5a3f7d9d47733a72ad2ff789d7ef79

data/.ruby-version

@@ -1 +1 @@
-2.0.0-p247
+2.3.3

data/Gemfile.lock

@@ -1,35 +1,36 @@
 PATH
   remote: .
   specs:
-    cloudstack-nagios (0.18.2)
-      cloudstack_client (~> 1.3)
+    cloudstack-nagios (0.19.0)
+      cloudstack_client (~> 1.5)
       erubis (~> 2.7)
       highline (~> 1.7)
-      sshkit (~> 1.9)
-      thor (~> 0.19)
+      sshkit (~> 1.14.0)
+      thor (~> 0.19.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    cloudstack_client (1.3.1)
+    cloudstack_client (1.5.3)
     erubis (2.7.0)
     highline (1.7.8)
-    json (1.8.3)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-ssh (3.1.1)
-    rake (11.1.2)
-    rdoc (4.2.2)
-      json (~> 1.4)
-    sshkit (1.9.0)
+    net-ssh (4.1.0)
+    rake (12.0.0)
+    rdoc (5.1.0)
+    sshkit (1.14.0)
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
-    thor (0.19.1)
+    thor (0.19.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   cloudstack-nagios!
-  rake (~> 11.1)
+  rake (~> 12.0)
   rdoc
+
+BUNDLED WITH
+   1.13.7

data/cloudstack-nagios.gemspec

@@ -21,11 +21,11 @@ Gem::Specification.new do |gem|
   gem.rdoc_options  = %w[--line-numbers --inline-source]
 
   gem.add_development_dependency('rdoc')
-  gem.add_development_dependency('rake', '~> 11.1')
+  gem.add_development_dependency('rake', '~> 12.0')
 
-  gem.add_dependency('cloudstack_client', '~> 1.3')
-  gem.add_dependency('thor', '~> 0.19')
+  gem.add_dependency('cloudstack_client', '~> 1.5')
+  gem.add_dependency('thor', '~> 0.19.4')
   gem.add_dependency('erubis', '~> 2.7')
-  gem.add_dependency('sshkit', '~> 1.9')
+  gem.add_dependency('sshkit', '~> 1.14.0')
   gem.add_dependency('highline', '~> 1.7')
 end

data/lib/cloudstack-nagios/cli.rb

@@ -5,7 +5,15 @@ module CloudstackNagios
     include Thor::Actions
 
     package_name "cloudstack-nagios"
-    map %w(-v --version) => :version
+
+    # rescue error globally
+    def self.start(given_args=ARGV, config={})
+      super
+    rescue => e
+      error_class = e.class.name.split('::')
+      puts "\e[31mERROR\e[0m: #{error_class.last} - #{e.message}"
+      puts e.backtrace if ARGV.include? "--debug"
+    end
 
     class_option :config,
       default: ENV['HOME'] ?
@@ -21,6 +29,7 @@ module CloudstackNagios
       desc: 'enable debug output',
       type: :boolean
 
+    map %w(-v --version) => :version
     desc "version", "outputs the cloudstack-nagios version"
     def version
       say "cloudstack-nagios v#{CloudstackNagios::VERSION}"

data/lib/cloudstack-nagios/commands/capacity.rb

@@ -16,17 +16,20 @@ class Capacity < CloudstackNagios::Base
   CAPACITY_TYPES.each do |type, value|
     desc value[:method_name], "check #{value[:name].downcase} on host"
     option :zone, required: true
-    define_method(value[:method_name]) { 
+    define_method(value[:method_name]) {
       capacity_check(options[:zone], type)
     }
   end
 
   no_commands do
     def capacity_check(zone, type)
-      cap = client.list_capacity(type: type, zone: zone).first
+      unless res_zone = client.list_zones(name: zone).first
+        raise CloudstackNagios::InputError, "zone '#{zone}' not found."
+      end
+      cap = client.list_capacity(type: type, zoneid: res_zone['id']).first
       data = check_data(cap['capacitytotal'].to_f, cap['capacityused'].to_f, options[:warning], options[:critical])
       puts "#{CAPACITY_TYPES[type][:name]} #{RETURN_CODES[data[0]]} - usage = #{data[1]}% | usage=#{cap['capacityused']} usage_perc=#{data[1]}%"
       exit data[0]
     end
   end
-end
+end

data/lib/cloudstack-nagios/error.rb

@@ -0,0 +1,4 @@
+module CloudstackNagios
+  class Error < StandardError; end
+  class InputError < Error; end
+end

data/lib/cloudstack-nagios/version.rb

@@ -1,3 +1,3 @@
 module CloudstackNagios
-  VERSION = "0.18.4"
+  VERSION = "0.19.0"
 end

data/lib/cloudstack_nagios.rb

@@ -2,4 +2,5 @@
 require "cloudstack-nagios/version"
 require "cloudstack-nagios/helper"
 require "cloudstack-nagios/base"
-require "cloudstack-nagios/cli"
+require "cloudstack-nagios/error"
+require "cloudstack-nagios/cli"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack-nagios
 version: !ruby/object:Gem::Version
-  version: 0.18.4
+  version: 0.19.0
 platform: ruby
 authors:
 - Nik Wolfgramm
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-08 00:00:00.000000000 Z
+date: 2017-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -31,42 +31,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: cloudstack_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: 0.19.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: 0.19.4
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
@@ -87,14 +87,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: 1.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: 1.14.0
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -138,6 +138,7 @@ files:
 - lib/cloudstack-nagios/commands/router.rb
 - lib/cloudstack-nagios/commands/snmpd_config.rb
 - lib/cloudstack-nagios/commands/system_vm.rb
+- lib/cloudstack-nagios/error.rb
 - lib/cloudstack-nagios/files/create_cs_router_config.sh
 - lib/cloudstack-nagios/files/snmpd.conf
 - lib/cloudstack-nagios/helper.rb
@@ -189,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: cloudstack-nagios CloudStack monitoring tools for nagios