cloudstack-nagios 0.4.2 → 0.5.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 4462047d3995a0bc4a2e347fd3638fff6bf43340
+  data.tar.gz: 6c6b7a70f376373605b2e981e178dc09ee1e9efd
+SHA512:
+  metadata.gz: 7429635d543cdc83cf13eedda9ccf2e95ef0f3d1419e5e4594d293ac5ef109f249078f846d97fc90e611ca8e6d4cd0a42c36db7b3613933ac6209eb81c2ff0e6
+  data.tar.gz: 9847ab9a65ab09a93225a06c9b41a14cf27f49a2c14b5c6cfde69f1c77e22f56b6ccfca7e1ffce97fa781ff5cdc7f48b3c73a95afd4dc39096e583a7186de064

data/.gitignore

@@ -1,6 +1,5 @@
 .DS_Store
 results.html
-config/cloudstack.yml
 pkg
 html
 *.gem

data/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in cloudstack-nagios.gemspec
-gemspec
+gemspec

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    cloudstack-nagios (0.4.1)
+    cloudstack-nagios (0.5.0)
+      cloudstack_client (~> 0.2.10)
       erubis (~> 2.7.0)
       highline (~> 1.6.20)
       sshkit (~> 1.1.0)
@@ -10,6 +11,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    cloudstack_client (0.2.10)
     erubis (2.7.0)
     highline (1.6.20)
     json (1.8.1)
@@ -26,7 +28,7 @@ GEM
     term-ansicolor (1.2.2)
       tins (~> 0.8)
     thor (0.18.1)
-    tins (0.12.0)
+    tins (0.13.0)
 
 PLATFORMS
   ruby

data/bin/cs-nagios

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 
-require 'cloudstack_client'
 require 'cloudstack_nagios'
 
-CloudstackNagios::Cli.start(ARGV)
+CloudstackNagios::Cli.start(ARGV)

data/cloudstack-nagios.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |gem|
   gem.version       = CloudstackNagios::VERSION
   gem.authors       = ["Nik Wolfgramm"]
   gem.email         = ["nik.wolfgramm@gmail.com"]
-  gem.description   = %q{cloudstack-nagios generates nagios configuration and checks for monitoring cloudstack with nagios.}
+  gem.description   = %q{cloudstack-nagios generates nagios configuration and checks for monitoring CloudStack with nagios.}
   gem.summary       = %q{cloudstack-nagios CloudStack monitoring tools for nagios}
   gem.homepage      = "https://bitbucket.org/swisstxt/cloudstack-nagios"
   gem.license       = 'MIT'
@@ -23,6 +23,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency('rdoc')
   gem.add_development_dependency('rake', '~> 10.0.4')
   
+  gem.add_dependency('cloudstack_client', '~> 0.2.10')
   gem.add_dependency('thor', '~> 0.18.1')
   gem.add_dependency('erubis', '~> 2.7.0')
   gem.add_dependency('sshkit', '~> 1.1.0')

data/lib/cloudstack-nagios/base.rb

@@ -1,5 +1,6 @@
 require "thor"
 require "yaml"
+require 'cloudstack_client'
 
 module CloudstackNagios 
   class Base < Thor

data/lib/cloudstack-nagios/version.rb

@@ -1,3 +1,3 @@
 module CloudstackNagios
-  VERSION = "0.4.2"
+  VERSION = "0.5.1"
 end

data/lib/cloudstack_nagios.rb

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

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack-nagios
 version: !ruby/object:Gem::Version
-  version: 0.4.2
-  prerelease: 
+  version: 0.5.1
 platform: ruby
 authors:
 - Nik Wolfgramm
@@ -14,23 +13,20 @@ 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
@@ -38,15 +34,27 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 10.0.4
+- !ruby/object:Gem::Dependency
+  name: cloudstack_client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.10
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.10
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +76,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sshkit
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +90,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -94,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,13 +104,12 @@ dependencies:
   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
-  cloudstack with nagios.
+  CloudStack with nagios.
 email:
 - nik.wolfgramm@gmail.com
 executables:
@@ -123,31 +124,6 @@ files:
 - README.md
 - bin/cs-nagios
 - cloudstack-nagios.gemspec
-- lib/cloudstack-client/client.rb
-- lib/cloudstack-client/commands/account.rb
-- lib/cloudstack-client/commands/capacity.rb
-- lib/cloudstack-client/commands/cluster.rb
-- lib/cloudstack-client/commands/disk_offering.rb
-- lib/cloudstack-client/commands/domain.rb
-- lib/cloudstack-client/commands/host.rb
-- lib/cloudstack-client/commands/ip_address.rb
-- lib/cloudstack-client/commands/iso.rb
-- lib/cloudstack-client/commands/job.rb
-- lib/cloudstack-client/commands/load_balancer_rule.rb
-- lib/cloudstack-client/commands/network.rb
-- lib/cloudstack-client/commands/pod.rb
-- lib/cloudstack-client/commands/port_forwarding_rule.rb
-- lib/cloudstack-client/commands/project.rb
-- lib/cloudstack-client/commands/router.rb
-- lib/cloudstack-client/commands/server.rb
-- lib/cloudstack-client/commands/service_offering.rb
-- lib/cloudstack-client/commands/snapshot.rb
-- lib/cloudstack-client/commands/ssh_key_pair.rb
-- lib/cloudstack-client/commands/template.rb
-- lib/cloudstack-client/commands/user.rb
-- lib/cloudstack-client/commands/volume.rb
-- lib/cloudstack-client/commands/zone.rb
-- lib/cloudstack-client/version.rb
 - lib/cloudstack-nagios/base.rb
 - lib/cloudstack-nagios/cli.rb
 - lib/cloudstack-nagios/commands/check.rb
@@ -158,11 +134,11 @@ files:
 - lib/cloudstack-nagios/templates/cloudstack_routers_hosts.cfg.erb
 - lib/cloudstack-nagios/templates/cloudstack_routers_services.cfg.erb
 - lib/cloudstack-nagios/version.rb
-- lib/cloudstack_client.rb
 - lib/cloudstack_nagios.rb
 homepage: https://bitbucket.org/swisstxt/cloudstack-nagios
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --line-numbers
@@ -170,21 +146,19 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 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: []

data/lib/cloudstack-client/client.rb

@@ -1,136 +0,0 @@
-require 'base64'
-require 'openssl'
-require 'uri'
-require 'cgi'
-require 'net/http'
-require 'net/https'
-require 'json'
-require 'yaml'
-
-module CloudstackClient
-  class Connection
-
-    @@async_poll_interval = 2.0
-    @@async_timeout = 400
-
-    # include all commands
-    Dir.glob(File.dirname(__FILE__) + "/commands/*.rb").each do |file| 
-      require file
-      module_name = File.basename(file, '.rb').split('_').map{|f| f.capitalize}.join
-      include Object.const_get("CloudstackClient").const_get(module_name)
-    end
-
-    attr_accessor :verbose
-
-    def initialize(api_url, api_key, secret_key, opts = {})
-      @api_url = api_url
-      @api_key = api_key
-      @secret_key = secret_key
-      @use_ssl = api_url.start_with? "https"
-      @verbose = opts[:quiet] ? false : true
-      @debug = opts[:debug] ? true : false
-    end
-
-    ##
-    # Sends a synchronous request to the CloudStack API and returns the response as a Hash.
-    #
-    # The wrapper element of the response (e.g. mycommandresponse) is discarded and the
-    # contents of that element are returned.
-
-    def send_request(params)
-      params['response'] = 'json'
-      params['apiKey'] = @api_key
-
-      params_arr = []
-      params.sort.each { |elem|
-        params_arr << elem[0].to_s + '=' + CGI.escape(elem[1].to_s).gsub('+', '%20').gsub(' ','%20')
-      }
-
-      debug_output JSON.pretty_generate(params) if @debug
-
-      data = params_arr.join('&')
-      signature = OpenSSL::HMAC.digest('sha1', @secret_key, data.downcase)
-      signature = Base64.encode64(signature).chomp
-      signature = CGI.escape(signature)
-
-      url = "#{@api_url}?#{data}&signature=#{signature}"
-
-      uri = URI.parse(url)
-      http = Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = @use_ssl
-      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-
-      begin
-        response = http.request(Net::HTTP::Get.new(uri.request_uri))
-      rescue
-        puts "Error connecting to API:"
-        puts "#{@api_url} is not reachable"
-        exit 1
-      end
-
-      if !response.is_a?(Net::HTTPOK)
-        puts "Error #{response.code}: #{response.message}"
-        puts JSON.pretty_generate(JSON.parse(response.body))
-        puts "URL: #{url}"
-        exit 1
-      end
-
-      begin 
-        json = JSON.parse(response.body)
-      rescue JSON::ParserError
-        puts "Error parsing response from server."
-        exit 1
-      end
-      json[params['command'].downcase + 'response']
-    end
-
-    ##
-    # Sends an asynchronous request and waits for the response.
-    #
-    # The contents of the 'jobresult' element are returned upon completion of the command.
-
-    def send_async_request(params)
-
-      json = send_request(params)
-
-      params = {
-          'command' => 'queryAsyncJobResult',
-          'jobId' => json['jobid']
-      }
-
-      max_tries = (@@async_timeout / @@async_poll_interval).round
-      max_tries.times do
-        json = send_request(params)
-        status = json['jobstatus']
-
-        print "." if @verbose
-
-        if status == 1
-          return json['jobresult']
-        elsif status == 2
-          puts
-          puts "Request failed (#{json['jobresultcode']}): #{json['jobresult']}"
-          exit 1
-        end
-
-        STDOUT.flush
-        sleep @@async_poll_interval
-      end
-
-      print "\n"
-      puts "Error: Asynchronous request timed out"
-      exit 1
-    end
-
-    private
-
-    def debug_output(output, seperator = '-' * 80)
-      puts
-      puts seperator 
-      puts output
-      puts seperator
-      puts
-    end
-
-  end # class
-end

data/lib/cloudstack-client/commands/account.rb

@@ -1,22 +0,0 @@
-module CloudstackClient
-
-	module Account
-
-		##
-    # Lists accounts.
-
-    def list_accounts(args = { :name => nil })
-      params = {
-        'command' => 'listAccounts',
-        'listall' => 'true',
-        'isrecursive' => 'true'
-      }
-      params['name'] = args[:name] if args[:name]
-
-      json = send_request(params)
-      json['account'] || []
-    end
-
-	end
-
-end