cloudstack-nagios 0.17.7 → 0.18.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 4764961945bdf102aadc9cbd3e860e994c50b8ea
+  data.tar.gz: 18567b2c4eb69f3ccd54f75844565bad402ee032
+SHA512:
+  metadata.gz: b0e8256631685fa2866ae53457b6670d9dc00d0f9f16f567f7b88ed2d1a5e9601e701b3977b0e825c67c70ee9409eb3bd72c30ccfbfcc56e24e18d937cf56a78
+  data.tar.gz: 1d51f87dc081d47a6a1b984f38f81fb3c47ef4d39727be096c542e066c5e426a233cdac1445d52d6f823651afc99117260514e9c461e28210341871aa8046234

data/.ruby-version

@@ -1 +1 @@
-1.9.3-p392
+2.0.0-p247

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    cloudstack-nagios (0.17.3)
-      cloudstack_client (~> 0.7, >= 0.7.1)
+    cloudstack-nagios (0.18.0)
+      cloudstack_client (~> 1.0.4)
       erubis (~> 2.7.0)
       highline (~> 1.6.20)
       sshkit (~> 1.3.0)
@@ -11,24 +11,26 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    cloudstack_client (0.7.1)
+    cloudstack_client (1.0.4)
+      msgpack (~> 0.5.11)
     erubis (2.7.0)
     highline (1.6.21)
-    json (1.8.1)
+    json (1.8.3)
+    msgpack (0.5.12)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-ssh (2.9.1)
+    net-ssh (3.0.1)
     rake (10.3.2)
-    rdoc (4.1.2)
+    rdoc (4.2.0)
       json (~> 1.4)
     sshkit (1.3.0)
       net-scp (>= 1.1.2)
       net-ssh
       term-ansicolor
-    term-ansicolor (1.3.0)
+    term-ansicolor (1.3.2)
       tins (~> 1.0)
     thor (0.19.1)
-    tins (1.3.3)
+    tins (1.6.0)
 
 PLATFORMS
   ruby

data/cloudstack-nagios.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |gem|
   gem.homepage      = "https://github.com/swisstxt/cloudstack-nagios"
   gem.license       = 'MIT'
 
-  gem.required_ruby_version = '>= 1.9.3'
+  gem.required_ruby_version = '>= 2.0'
   gem.files         = `git ls-files`.split($/)
   gem.executables   = ['cs-nagios']
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
@@ -23,7 +23,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency('rdoc')
   gem.add_development_dependency('rake', '~> 10.3.1')
 
-  gem.add_dependency('cloudstack_client', '~> 0.7', '>= 0.7.1')
+  gem.add_dependency('cloudstack_client', '~> 1.0.4')
   gem.add_dependency('thor', '~> 0.19.1')
   gem.add_dependency('erubis', '~> 2.7.0')
   gem.add_dependency('sshkit', '~> 1.3.0')

data/lib/cloudstack-nagios/base.rb

@@ -23,12 +23,13 @@ module CloudstackNagios
     no_commands do
       def client(opts = {})
         @config ||= load_configuration
-        @client ||= CloudstackClient::Connection.new(
+        @client ||= CloudstackClient::Client.new(
           @config[:url],
           @config[:api_key],
           @config[:secret_key],
-          opts.merge({debug: options[:debug]})
         )
+        @client.debug = true if options[:debug]
+        @client
       end
 
       def load_configuration(config_file = options[:config], env = options[:environment])
@@ -53,19 +54,6 @@ module CloudstackNagios
         config
       end
 
-      def find_project(project_name = options[:project])
-        return nil unless project_name
-        unless project = client.get_project(project_name)
-          say "Project '#{options[:project]}' not found", :red
-          exit 1
-        end
-        project
-      end
-
-      def filter_by(objects, tag_name, tag)
-        objects.select {|r| r[tag_name].downcase == tag.downcase}
-      end
-
       def sshoptions(ssh_key)
        {
          timeout: 5,

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

@@ -76,7 +76,7 @@ class Check < CloudstackNagios::Base
       default: 10,
       aliases: '-c'
    def async_jobs
-      jobs = client.send_request('command' => 'listAsyncJobs', 'listall' => 'true')['asyncjobs']
+      jobs = client.list_async_jobs(listall: true)
       outstanding_jobs = jobs.select {|job| job['jobstatus'] == 0 }
       if outstanding_jobs.size < options[:warning]
         code = 0
@@ -101,10 +101,11 @@ class Check < CloudstackNagios::Base
       default: 24,
       aliases: '-c'
    def snapshots
-     snapshots = []
-     snapshots << client.send_request('command' => 'listSnapshots', 'projectid' => '-1')['snapshot']
-     snapshots << client.send_request('command' => 'listSnapshots')['snapshot']
-     snapshots.compact!.flatten!
+     snapshots = client.list_snapshots(listall: true)
+     client.list_projects(listall: true).each do |p|
+       snapshots = snapshots.concat(client.list_snapshots(listall: true, project_id: p['id']))
+     end
+
      not_backed_up = snapshots.select{|s| s['state'] != 'BackedUp' }
 
      warnings = []

data/lib/cloudstack-nagios/helper.rb

@@ -38,8 +38,12 @@ module CloudstackNagios
     end
 
     def check_data(total, usage, warning, critical)
-      usage_percent = (100.0 / total.to_f * usage.to_f) || 0.0
-      code = 3
+      usage_percent = 100.0 / total.to_f * usage.to_f
+
+      if usage_percent.nan?
+        usage_percent = 0.0
+      end
+
       if usage_percent < warning
         code = 0
       elsif usage_percent < critical

data/lib/cloudstack-nagios/version.rb

@@ -1,3 +1,3 @@
 module CloudstackNagios
-  VERSION = "0.17.7"
+  VERSION = "0.18.0"
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack-nagios
 version: !ruby/object:Gem::Version
-  version: 0.17.7
-  prerelease: 
+  version: 0.18.0
 platform: ruby
 authors:
 - Nik Wolfgramm
@@ -10,124 +9,104 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-19 00:00:00.000000000 Z
+date: 2015-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 10.3.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 10.3.1
 - !ruby/object:Gem::Dependency
   name: cloudstack_client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 1.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.7'
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 1.0.4
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.19.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.19.1
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: sshkit
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.20
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.20
 description: cloudstack-nagios generates nagios configuration and checks for monitoring
@@ -139,8 +118,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-version
+- ".gitignore"
+- ".ruby-version"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -189,28 +168,27 @@ files:
 homepage: https://github.com/swisstxt/cloudstack-nagios
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
-- --line-numbers
-- --inline-source
+- "--line-numbers"
+- "--inline-source"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: cloudstack-nagios CloudStack monitoring tools for nagios
 test_files: []