cloudstack-nagios 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4462047d3995a0bc4a2e347fd3638fff6bf43340
-  data.tar.gz: 6c6b7a70f376373605b2e981e178dc09ee1e9efd
+  metadata.gz: 3c0b8e37946dcb6dd032418c6d73ab56d1c40bd0
+  data.tar.gz: 5f60019260f8410034d62a284ff007d5c08a0529
 SHA512:
-  metadata.gz: 7429635d543cdc83cf13eedda9ccf2e95ef0f3d1419e5e4594d293ac5ef109f249078f846d97fc90e611ca8e6d4cd0a42c36db7b3613933ac6209eb81c2ff0e6
-  data.tar.gz: 9847ab9a65ab09a93225a06c9b41a14cf27f49a2c14b5c6cfde69f1c77e22f56b6ccfca7e1ffce97fa781ff5cdc7f48b3c73a95afd4dc39096e583a7186de064
+  metadata.gz: e0db95dbfa0c23130e7c0783713df8d97fcfd1a4f4ecaaacc3dc91e88b5b7605b660d8740430fec5d8cd3660a7dd809dfa936bd1b828d783b101051d58b31484
+  data.tar.gz: a32712202e84a342102b256e552c0abe9dd68ed879f185e16d757a0c5b3a108e2df5de89055d125454a7399c3819eb2e7eb33c2fccf80246663be8cd9dcd4064

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    cloudstack-nagios (0.5.0)
-      cloudstack_client (~> 0.2.10)
+    cloudstack-nagios (0.6.0)
+      cloudstack_client (~> 0.4, >= 0.4.4)
       erubis (~> 2.7.0)
       highline (~> 1.6.20)
       sshkit (~> 1.1.0)
@@ -11,24 +11,24 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    cloudstack_client (0.2.10)
+    cloudstack_client (0.4.4)
     erubis (2.7.0)
     highline (1.6.20)
     json (1.8.1)
     net-scp (1.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (2.7.0)
+    net-ssh (2.8.0)
     rake (10.0.4)
-    rdoc (4.0.1)
+    rdoc (4.1.1)
       json (~> 1.4)
     sshkit (1.1.0)
       net-scp
       net-ssh
       term-ansicolor
-    term-ansicolor (1.2.2)
-      tins (~> 0.8)
+    term-ansicolor (1.3.0)
+      tins (~> 1.0)
     thor (0.18.1)
-    tins (0.13.0)
+    tins (1.0.0)
 
 PLATFORMS
   ruby

data/README.md

@@ -1,26 +1,34 @@
 # Cloudstack Nagios
 
 Cloudstack Nagios helps you monitoring your Cloudstack environment with Nagios.
-Cloudstack Nagios uses the Cloudsdtack API to collect information about system vm's and cloudstack ressources.
+Cloudstack Nagios uses the Cloudstack API to collect information about system vm's and ressources.
+
+The following checks are supported:
+  * system and network checks for virtual routers
+  * storage pool capacity checks
+  * global zone capacities
 
 ## Prerequisites
 
-  * Cloudstack Root Admin keys must be used.
-  * In order to connect to system vms the private ssh key found on the Cloudstack management server under /var/lib/cloud/management/.ssh/id_rsa must be used.
-  * The system vms must be reachable over SSH (default port 3922) from the nagios server executing the checks.
-    * check with 'ssh -i /var/lib/cloud/management/.ssh/id_rsa -p 3922 <router_mgmt_ip>'
+  * Cloudstack Root Admin keys have to be used.
+  * In order to connect to system VMs the private ssh key found on the Cloudstack management server under /var/lib/cloud/management/.ssh/id_rsa are required.
+  * The system vms must be reachable over SSH (default port 3922) from the nagios server executing the checks (check with 'ssh -i /var/lib/cloud/management/.ssh/id_rsa -p 3922 <router_mgmt_ip>').
 
 ## Installation
 
 Install the cloudstack-cli gem:
 
-    $ gem install cloudstack-nagios
+```bash
+$ gem install cloudstack-nagios
+```
 
 ## Setup
 
 Create the initial configuration:
 
-    $ cs setup
+```bash
+$ cs setup
+```
 
 cloudstack-nagios expects to find a configuartion file with the API URL and your CloudStack credentials in your home directory named .cloudstack-cli.yml. If the file is located elsewhere you can specify the loaction using the --config option.
 
@@ -28,14 +36,16 @@ cloudstack-nagios supports multiple environments using the --environment option.
 
 Example content of the configuration file:
 
-    :url:         "https://my-cloudstack-server/client/api/"
-    :api_key:     "cloudstack-api-key"
-    :secret_key:  "cloudstack-api-secret"
+```yaml
+:url:         "https://my-cloudstack-server/client/api/"
+:api_key:     "cloudstack-api-key"
+:secret_key:  "cloudstack-api-secret"
 
-    test:
-      :url:         "http://my-cloudstack-testserver/client/api/"
-      :api_key:     "cloudstack-api-key"
-      :secret_key:  "cloudstack-api-secret"
+test:
+  :url:         "http://my-cloudstack-testserver/client/api/"
+  :api_key:     "cloudstack-api-key"
+  :secret_key:  "cloudstack-api-secret"
+```
 
 ## Usage
 
@@ -43,21 +53,49 @@ Example content of the configuration file:
 
 See the help screen:
 
-    $ cs-nagios
+```bash
+$ cs-nagios
+```
 
 ### Generate Nagios configuration files
 
+Note that you can also use your own ERB templates using the '--template' option to generate the nagios confifuration files.
+
 Generate nagios host configuration for virtual routers:
 
-    $ cs-nagios nagios_config host
+```bash
+$ cs-nagios nagios_config router_hosts
+```
 
 Generate nagios host configuration for virtual routers:
 
-    $ cs-nagios nagios_config service
+```bash
+$ cs-nagios nagios_config router_services
+```
 
-Note that you can also use your own ERB templates using the '--template' option to generate the nagios confifuration files.
+Generate nagios host configuration api hosts (one pseudo host per Cloudstack zone):
+
+```bash
+$ cs-nagios nagios_config api_hosts
+```
+
+Generate nagios service configuration for storage pool checks:
+
+```bash
+$ cs-nagios nagios_config storage_pool_services
+```
+
+Generate nagios service configuration for capacity checks:
+
+```bash
+$ cs-nagios nagios_config capacity_services
+```
+
+### System VM checks
+
+For all vm checks access to the cloudstack management network is required in order to run the ckecks via ssh or snmp.
 
-### Check system vms over ssh
+#### Check system vms over ssh
 
 The following checks are available:
   
@@ -66,17 +104,44 @@ The following checks are available:
    * network - measure network usage
    * rootfs_rw - check if the root file system is writeable
 
-### Enabling snmpd checks
+Example:
 
-If you want to check your system vms with standard snmp checks instead of checking over SSH, there are commands to configure snmpd on the machines and open the firewall.
+```bash
+$ cs-nagios check system_vm network --host 10.100.9.161
+```
+
+#### Enabling snmpd checks for system vms
+
+If you want to check your system vms with standard Nagios snmp checks instead of checking over SSH, there are commands to configure snmpd on the machines and open the firewall.
 
    * snmpd_config enable - goes to all the routers and configure snmpd
    * snmpd_config check - test if port TCP 161 is reachable on routers
 
 Note: If you want to use snmp checks, you have to adapt the nagios configuration files accordingly.
 
+### Capacity checks
+
+Checks various global capacity values.
+
+Example:
+
+```bash
+$ cs-nagios check capacity memory --zone ZUERICH_IX
+```
+
+### Storage Pool checks
+
+Checks the available disk space on Cloudstack storage pools.
+
+Example:
+
+```bash
+$ cs-nagios check storage_pool --pool_name fs_cs_zone01_pod01
+```
+
 ## References
--  [Cloudstack API documentation](http://cloudstack.apache.org/docs/api/apidocs-4.2/TOC_Root_Admin.html)
+
+  * [Cloudstack API documentation](http://cloudstack.apache.org/docs/api/apidocs-4.2/TOC_Root_Admin.html)
 
 ## Contributing
 

data/Rakefile

@@ -0,0 +1,3 @@
+require 'bundler'  
+
+Bundler::GemHelper.install_tasks

data/cloudstack-nagios.gemspec

@@ -23,7 +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('cloudstack_client', '~> 0.4', '>= 0.4.4')
   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/commands/capacity.rb

@@ -0,0 +1,32 @@
+class Capacity < CloudstackNagios::Base
+
+  CAPACITY_TYPES = {
+    0 => {name: "Memory", method_name: "memory"},
+    1 => {name: "CPU", method_name: "cpu"},
+    2 => {name: "Storage", method_name: "storage"},
+    3 => {name: "Primary Storage", method_name: "primary_storage"},
+    4 => {name: "Public IP's", method_name: "public_ips"},
+    5 => {name: "Private IP's", method_name: "private_ips"},
+    6 => {name: "Secondary Storage", method_name: "secondary_storage"},
+    7 => {name: "VLANs", method_name: "vlans"},
+    8 => {name: "Direct Attached Public IP's", method_name: "direct_attached_public_ips"},
+    9 => {name: "Local Storage", method_name: "local_storage"}
+  }
+
+  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]) { 
+      capacity_check(options[:zone], type)
+    }
+  end
+
+  no_commands do
+    def capacity_check(zone, type)
+      cap = client.list_capacity(type: type, zone: zone).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']}"
+      exit data[0]
+    end
+  end
+end

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

@@ -1,151 +1,53 @@
-require 'sshkit/dsl'
+require "cloudstack-nagios/commands/router"
+require "cloudstack-nagios/commands/capacity"
 
 class Check < CloudstackNagios::Base
+   default_task :help
 
-  RETURN_CODES = {0 => 'ok', 1 => 'warning', 2 => 'critical'}
-
-  class_option :host,
+   class_option :host,
       desc: 'hostname or ipaddress',
-      required: true,
+      default: '127.0.0.1',
       aliases: '-H'
 
-  class_option :warning,
+   class_option :warning,
       desc: 'warning level',
       type: :numeric,
       default: 90,
       aliases: '-w'
 
-  class_option :critical,
+   class_option :critical,
       desc: 'critical level',
       type: :numeric,
       default: 95,
       aliases: '-c'
 
-  class_option :ssh_key,
+   class_option :ssh_key,
       desc: 'ssh private key to use',
       default: '/var/lib/cloud/management/.ssh/id_rsa'
 
-  class_option :port,
+   class_option :port,
       desc: 'ssh port to use',
       type: :numeric,
       default: 3922,
       aliases: '-p'
 
-  desc "memory HOST", "check memory on host"
-  def memory
-    begin
-      host = systemvm_host
-      free_output = ""
-      on host do |h|
-        free_output = capture(:free)
-      end
-      values = free_output.scan(/\d+/)
-      total = values[0].to_i
-      free = values[2].to_i
-      free_b = values[7].to_i
-      data = check_data(total, total - free_b, options[:warning], options[:critical])
-      puts "MEMORY #{RETURN_CODES[data[0]]} - usage = #{data[1]}% | usage=#{data[1]}% total=#{total}M free=#{free}M free_wo_buffers=#{free_b}M"
-      exit data[0]
-    rescue => e
-      exit_with_failure(e)
-    end
-  end
+   desc "router SUBCOMMAND ...ARGS", "router checks"
+   subcommand :router, Router
 
-  desc "cpu", "check memory on host"
-  def cpu
-    begin
-      host = systemvm_host
-      mpstat_output = ""
-      on host do |h|
-        mpstat_output = capture(:mpstat)
-      end
-      values = mpstat_output.scan(/\d+\.\d+/)
-      usage = 100 - values[-1].to_f 
-      data = check_data(100, usage, options[:warning], options[:critical])
-      puts "CPU #{RETURN_CODES[data[0]]} - usage = #{data[1]}% | usage=#{data[1]}%"
-      exit data[0]
-    rescue => e
-      exit_with_failure(e)
-    end
-  end
+   desc "capacity SUBCOMMAND ...ARGS", "capacity checks"
+   subcommand :capacity, Capacity
 
-  desc "rootfs_rw", "check if the rootfs is read/writeable on host"
-  def rootfs_rw
-    begin
-      host = systemvm_host
-      proc_out = ""
-      on host do |h|
-        proc_out = capture(:cat, '/proc/mounts')
-      end
-      rootfs_rw = proc_out.match(/rootfs\srw\s/)
-      status = rootfs_rw ? 0 : 2
-      puts "ROOTFS_RW #{rootfs_rw ? 'OK - rootfs writeable' : 'CRITICAL - rootfs NOT writeable'}"
-      exit status
-    rescue => e
-      exit_with_failure(e)
-    end
-  end
+   desc "stoarge_pool SUBCOMMAND ...ARGS", "storage_pool checks"
+   subcommand :capacity, Capacity
 
-  desc "network", "check network usage on host"
-  option :interface,
-      desc: 'network interface to probe',
-      default: 'eth0',
-      aliases: '-i'
-  option :if_speed,
-      desc: 'network interface speed in bits per second',
-      type: :numeric,
-      default: 1000000000,
-      aliases: '-s'
-  def network
-    begin
-      host = systemvm_host
-      stats_path = "/sys/class/net/#{options[:interface]}/statistics"
-      rx_bytes, tx_bytes = ""
-      on host do |h|
-        rx_bytes = capture("cat #{stats_path}/rx_bytes;sleep 1;cat #{stats_path}/rx_bytes").lines.to_a
-        tx_bytes = capture("cat #{stats_path}/tx_bytes;sleep 1;cat #{stats_path}/tx_bytes").lines.to_a
-      end
-      rbps = (rx_bytes[1].to_i - rx_bytes[0].to_i) * 8
-      tbps = (tx_bytes[1].to_i - tx_bytes[0].to_i) * 8
-      data = check_data(options[:if_speed], rbps, options[:warning], options[:critical])
-      puts "NETWORK #{RETURN_CODES[data[0]]} - usage = #{data[1]}% | usage=#{data[1]}% rxbps=#{rbps.round(0)} txbps=#{tbps.round(0)}"
+   desc "storage_pool", "check capacity of storage_pool"
+   option :pool_name, required: true
+   option :zone
+   def storage_pool
+      pool = client.list_storage_pools(name: options[:pool_name], zone: options[:zone]).first
+      data = check_data(pool['disksizetotal'].to_f, pool['disksizeused'].to_f, options[:warning], options[:critical])
+      puts "storage_pool #{options[:pool_name]} #{RETURN_CODES[data[0]]} - usage = #{data[1]}% | usage=#{pool['disksizeused']}"
       exit data[0]
-    rescue => e
-      exit_with_failure(e)
-    end
-  end
-
-  no_commands do
-
-    def systemvm_host
-      host = SSHKit::Host.new("root@#{options[:host]}")
-      host.ssh_options = sshoptions(options[:ssh_key])
-      host.port = options[:port]
-      host
-    end
-
-    def exit_with_failure(exception)
-      say 'ERROR: command execution failed!', :red
-      say "Message: ", :magenta
-      say exception.message
-      say "Backtrace:", :magenta
-      say exception.backtrace
-      exit 3
-    end
-
-    def check_data(total, usage, warning, critical)
-      usage_percent = 100.0 / total.to_f * usage.to_f
-      code = 3
-      if usage_percent < warning
-        code = 0
-      elsif usage_percent < critical
-        code = 1
-      else 
-        code = 2
-      end
-      [code, usage_percent.round(0)]
-    end
-
-  end
+   end
 
-end
+end

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

@@ -1,11 +1,11 @@
 class NagiosConfig < CloudstackNagios::Base
 
-  desc "hosts", "generate nagios hosts configuration for virtual routers"
+  desc "router_hosts", "generate nagios hosts configuration for virtual routers"
   option :template,
     desc: "path of ERB template to use",
-    default: File.join(File.dirname(__FILE__), '..', 'templates', 'cloudstack_routers_hosts.cfg.erb'),
+    default: File.join(File.dirname(__FILE__), '..', 'templates', 'cloudstack_router_hosts.cfg.erb'),
     aliases: '-t'
-  def hosts
+  def router_hosts
   	host_template = load_template(options[:template])
     puts host_template.result(
       routers: cs_routers,
@@ -13,19 +13,65 @@ class NagiosConfig < CloudstackNagios::Base
     )
   end
 
-  desc "services", "generate nagios services configuration for virtual routers"
+  desc "router_services", "generate nagios services configuration for system vms"
   option :template,
     desc: "path of ERB template to use",
-    default: File.join(File.dirname(__FILE__), '..', 'templates', 'cloudstack_routers_services.cfg.erb'),
+    default: File.join(File.dirname(__FILE__), '..', 'templates', 'cloudstack_router_services.cfg.erb'),
     aliases: '-t'
-  def services
-    bin_path = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'bin'))
-    config_file = options[:config]
+  def router_services
   	service_template = load_template(options[:template])
     puts service_template.result(
       routers: cs_routers,
       bin_path: bin_path,
-      config_file: config_file,
+      config_file: options[:config],
+      date: date_string
+    )
+  end
+
+  desc "api_hosts", "generate nagios api host configuration"
+  option :template,
+    desc: "path of ERB template to use",
+    default: File.join(File.dirname(__FILE__), '..', 'templates', 'cloudstack_api_hosts.cfg.erb'),
+    aliases: '-t'
+  def api_hosts
+    service_template = load_template(options[:template])
+    puts service_template.result(
+      zones: client.list_zones,
+      bin_path: bin_path,
+      config_file: options[:config],
+      date: date_string
+    )
+  end
+
+  desc "storage_pool_services", "generate nagios storage pool services configuration"
+  option :template,
+    desc: "path of ERB template to use",
+    default: File.join(File.dirname(__FILE__), '..', 'templates', 'cloudstack_storage_pool_services.cfg.erb'),
+    aliases: '-t'
+  def storage_pool_services
+    service_template = load_template(options[:template])
+    storage_pools = client.list_storage_pools.select do |pool| 
+      pool['state'].downcase == 'up'
+    end
+    puts service_template.result(
+      storage_pools: storage_pools,
+      bin_path: bin_path,
+      config_file: options[:config],
+      date: date_string
+    )
+  end
+
+  desc "capacity_services", "generate nagios capacity services configuration"
+  option :template,
+    desc: "path of ERB template to use",
+    default: File.join(File.dirname(__FILE__), '..', 'templates', 'cloudstack_capacity_services.cfg.erb'),
+    aliases: '-t'
+  def capacity_services
+    service_template = load_template(options[:template])
+    puts service_template.result(
+      capacity_types: Capacity::CAPACITY_TYPES,
+      bin_path: bin_path,
+      config_file: options[:config],
       date: date_string
     )
   end
@@ -34,6 +80,10 @@ class NagiosConfig < CloudstackNagios::Base
     def date_string
       Time.new.strftime("%d.%m.%Y - %H:%M:%S")
     end
+
+    def bin_path
+      File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'bin'))
+    end
   end
 
- end
+ end

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

@@ -0,0 +1,100 @@
+require 'sshkit/dsl'
+
+class Router < CloudstackNagios::Base
+
+  desc "memory HOST", "check memory on host"
+  def memory
+    begin
+      host = systemvm_host
+      free_output = ""
+      on host do |h|
+        free_output = capture(:free)
+      end
+      values = free_output.scan(/\d+/)
+      total = values[0].to_i
+      free = values[2].to_i
+      free_b = values[7].to_i
+      data = check_data(total, total - free_b, options[:warning], options[:critical])
+      puts "MEMORY #{RETURN_CODES[data[0]]} - usage = #{data[1]}% | usage=#{data[1]}% total=#{total}M free=#{free}M free_wo_buffers=#{free_b}M"
+      exit data[0]
+    rescue => e
+      exit_with_failure(e)
+    end
+  end
+
+  desc "cpu", "check memory on host"
+  def cpu
+    begin
+      host = systemvm_host
+      mpstat_output = ""
+      on host do |h|
+        mpstat_output = capture(:mpstat)
+      end
+      values = mpstat_output.scan(/\d+\.\d+/)
+      usage = 100 - values[-1].to_f 
+      data = check_data(100, usage, options[:warning], options[:critical])
+      puts "CPU #{RETURN_CODES[data[0]]} - usage = #{data[1]}% | usage=#{data[1]}%"
+      exit data[0]
+    rescue => e
+      exit_with_failure(e)
+    end
+  end
+
+  desc "rootfs_rw", "check if the rootfs is read/writeable on host"
+  def rootfs_rw
+    begin
+      host = systemvm_host
+      proc_out = ""
+      on host do |h|
+        proc_out = capture(:cat, '/proc/mounts')
+      end
+      rootfs_rw = proc_out.match(/rootfs\srw\s/)
+      status = rootfs_rw ? 0 : 2
+      puts "ROOTFS_RW #{rootfs_rw ? 'OK - rootfs writeable' : 'CRITICAL - rootfs NOT writeable'}"
+      exit status
+    rescue => e
+      exit_with_failure(e)
+    end
+  end
+
+  desc "network", "check network usage on host"
+  option :interface,
+      desc: 'network interface to probe',
+      default: 'eth0',
+      aliases: '-i'
+  option :if_speed,
+      desc: 'network interface speed in bits per second',
+      type: :numeric,
+      default: 1000000,
+      aliases: '-s'
+  def network
+    begin
+      host = systemvm_host
+      stats_path = "/sys/class/net/#{options[:interface]}/statistics"
+      rx_bytes, tx_bytes = ""
+      on host do |h|
+        rx_bytes = capture("cat #{stats_path}/rx_bytes;sleep 1;cat #{stats_path}/rx_bytes").lines.to_a
+        tx_bytes = capture("cat #{stats_path}/tx_bytes;sleep 1;cat #{stats_path}/tx_bytes").lines.to_a
+      end
+      rbps = (rx_bytes[1].to_i - rx_bytes[0].to_i) * 8
+      tbps = (tx_bytes[1].to_i - tx_bytes[0].to_i) * 8
+      data = check_data(options[:if_speed], rbps, options[:warning], options[:critical])
+      puts "NETWORK #{RETURN_CODES[data[0]]} - usage = #{data[1]}% | usage=#{data[1]}% rxbps=#{rbps.round(0)} txbps=#{tbps.round(0)}"
+      exit data[0]
+    rescue => e
+      exit_with_failure(e)
+    end
+  end
+
+  no_commands do
+
+    def systemvm_host
+      host = SSHKit::Host.new("root@#{options[:host]}")
+      host.ssh_options = sshoptions(options[:ssh_key])
+      host.port = options[:port]
+      host
+    end
+
+  end
+
+end

data/lib/cloudstack-nagios/helper.rb

@@ -1,5 +1,7 @@
 module CloudstackNagios
   module Helper
+    RETURN_CODES = {0 => 'ok', 1 => 'warning', 2 => 'critical'}
+    
     def load_template(template_path)
       if File.file?(template_path)
         templ = Erubis::Eruby.new(File.read template_path)
@@ -15,5 +17,28 @@ module CloudstackNagios
       routers = client.list_routers(status: 'Running')
       routers += client.list_routers(projectid: -1, status: 'Running')
     end
+
+    def exit_with_failure(exception)
+      say 'ERROR: command execution failed!', :red
+      say "Message: ", :magenta
+      say exception.message
+      say "Backtrace:", :magenta
+      say exception.backtrace
+      exit 3
+    end
+
+    def check_data(total, usage, warning, critical)
+      usage_percent = 100.0 / total.to_f * usage.to_f
+      code = 3
+      if usage_percent < warning
+        code = 0
+      elsif usage_percent < critical
+        code = 1
+      else 
+        code = 2
+        usage_percent = 0
+      end
+      [code, usage_percent.round(0)]
+    end
   end
 end

data/lib/cloudstack-nagios/templates/cloudstack_api_hosts.cfg.erb

@@ -0,0 +1,39 @@
+###############################################################################
+#
+# Cloudstack API Host configuration file
+#
+# Created by: cloudstack-nagios
+# Date:       <%= date %>
+# Version:    Nagios 3.x config file
+#
+# --- DO NOT EDIT THIS FILE BY HAND ---
+# cloudstack-nagios will overwite all manual settings during the next update
+#
+###############################################################################
+
+define hostgroup {
+  hostgroup_name  Cloudstack-SystemVM
+  alias           Cloudstack-SystemVM
+  register        1
+}
+
+<% zones.each do |zone| -%>
+define host {
+  host_name      Cloudstack_<%= zone['name'] %>
+  display_name   Cloudstack_<%= zone['name'] %>
+  address        localhost
+  use            Linux-Host,host-pnp
+  hostgroups     Cloudstack-Base
+  check_command  check-host-alive
+  register       1
+}
+
+<% end -%>
+
+###############################################################################
+#
+# Host configuration file
+#
+# END OF FILE
+#
+###############################################################################

data/lib/cloudstack-nagios/templates/cloudstack_capacity_services.cfg.erb

@@ -0,0 +1,41 @@
+
+###############################################################################
+#
+# Cloudstack capcity services configuration file
+#
+# Created by: cloudstack-nagios
+# Date:       <%= date %>
+# Version:    Nagios 3.x config file
+#
+# --- DO NOT EDIT THIS FILE BY HAND ---
+# cloudstack-nagios will overwite all manual settings during the next update
+#
+###############################################################################
+
+<% capacity_types.each do |cap_type, cap_values| -%>
+define command {
+        command_name                   cs-nagios_check-capacity_<%= cap_values[:method_name] %>
+        command_line                   <%= bin_path -%>/cs-nagios check capacity <%= cap_values[:method_name] %> -w $ARG1$ -c $ARG2$ --config <%= config_file %>
+        register                       1
+}
+
+<% end -%>
+
+<% capacity_types.each do |cap_type, cap_values| -%>
+define service {
+        hostgroup_name                  Cloudstack-SystemVM
+        service_description             <%= cap_values[:name] %>
+        display_name                    <%= cap_values[:method_name] %>
+        use                             Generic-Service,service-pnp
+        check_command                   cs-nagios_check-capacity_<%= cap_values[:method_name] -%>!80!90
+        register                        1
+}
+
+<% end -%>
+###############################################################################
+#
+# Service configuration file
+#
+# END OF FILE
+#
+###############################################################################

data/lib/cloudstack-nagios/templates/{cloudstack_routers_hosts.cfg.erb → cloudstack_router_hosts.cfg.erb}

@@ -12,21 +12,21 @@
 ###############################################################################
 
 define hostgroup {
-        hostgroup_name                 Cloudstack-SystemVM
-        alias                          Cloudstack-SystemVM
-        register                       1
+  hostgroup_name  Cloudstack-SystemVM
+  alias           Cloudstack-SystemVM
+  register        1
 }
+
 <% routers.each do |router| -%>
   <% if router['linklocalip'] -%>
-
 define host {
-        host_name                     <%= router['name'] %>
-        display_name                  <%= router['name'] %> (<%= router['linklocalip'] %>)<%= " - #{router['project']}" if router['project'] %> - <%= router['zonename'] %>
-        address                       <%= router['linklocalip'] %>
-        use			                  Linux-Host,host-pnp
-        hostgroups                    Cloudstack-SystemVM
-        check_command                 check-host-alive
-        register                      1
+  host_name      <%= router['name'] %>
+  display_name   <%= router['name'] %> (<%= router['linklocalip'] %>)<%= " - #{router['project']}" if router['project'] %> - <%= router['zonename'] %>
+  address        <%= router['linklocalip'] %>
+  use			       Linux-Host,host-pnp
+  hostgroups     Cloudstack-SystemVM
+  check_command  check-host-alive
+  register       1
 }
   <% end -%>
 <% end -%>

data/lib/cloudstack-nagios/templates/{cloudstack_routers_services.cfg.erb → cloudstack_router_services.cfg.erb}

@@ -14,25 +14,25 @@
 
 define command {
         command_name                   cs-nagios_check-memory
-        command_line                   <%= bin_path -%>/cs-nagios check memory -H $HOSTADDRESS$ -w $ARG1$ -c $ARG2$ --config <%= config_file %>
+        command_line                   <%= bin_path -%>/cs-nagios check router memory -H $HOSTADDRESS$ -w $ARG1$ -c $ARG2$ --config <%= config_file %>
         register                       1
 }
 
 define command {
         command_name                   cs-nagios_check-cpu
-        command_line                   <%= bin_path -%>/cs-nagios check cpu -H $HOSTADDRESS$ -w $ARG1$ -c $ARG2$ --config <%= config_file %>
+        command_line                   <%= bin_path -%>/cs-nagios check router cpu -H $HOSTADDRESS$ -w $ARG1$ -c $ARG2$ --config <%= config_file %>
         register                       1
 }
 
 define command {
         command_name                   cs-nagios_check-network
-        command_line                   <%= bin_path -%>/cs-nagios check network -H $HOSTADDRESS$ -w $ARG1$ -c $ARG2$ --config <%= config_file %>
+        command_line                   <%= bin_path -%>/cs-nagios check router network -H $HOSTADDRESS$ -w $ARG1$ -c $ARG2$ --config <%= config_file %>
         register                       1
 }
 
 define command {
         command_name                   cs-nagios_check-rootfsrw
-        command_line                   <%= bin_path -%>/cs-nagios check rootfs_rw -H $HOSTADDRESS$ -w $ARG1$ -c $ARG2$ --config <%= config_file %>
+        command_line                   <%= bin_path -%>/cs-nagios check router rootfs_rw -H $HOSTADDRESS$ -w $ARG1$ -c $ARG2$ --config <%= config_file %>
         register                       1
 }
 

data/lib/cloudstack-nagios/templates/cloudstack_storage_pool_services.cfg.erb

@@ -0,0 +1,39 @@
+
+###############################################################################
+#
+# Cloudstack storage_pool services configuration file
+#
+# Created by: cloudstack-nagios
+# Date:       <%= date %>
+# Version:    Nagios 3.x config file
+#
+# --- DO NOT EDIT THIS FILE BY HAND ---
+# cloudstack-nagios will overwite all manual settings during the next update
+#
+###############################################################################
+
+<% storage_pools.each do |storage_pool| -%>
+define command {
+  command_name  cs-nagios_check-storage_pool
+  command_line  <%= bin_path -%>/cs-nagios check storage_pool --name <%= storage_pool['name'] -%> --zone <%= storage_pool['zonename'] -%> -w $ARG1$ -c $ARG2$ --config <%= config_file %>
+  register      1
+}
+
+<% end -%>
+
+define service {
+  hostgroup_name        Cloudstack-SystemVM
+  service_description   Cloudstack Storage Pool
+  display_name          Cloudstack Storage Pool
+  use                   Generic-Service,service-pnp
+  check_command         cs-nagios_check-storage_pool!80!90
+  register              1
+}
+
+###############################################################################
+#
+# Service configuration file
+#
+# END OF FILE
+#
+###############################################################################

data/lib/cloudstack-nagios/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack-nagios
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Nik Wolfgramm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-08 00:00:00.000000000 Z
+date: 2014-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -44,14 +44,20 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.10
+        version: '0.4'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.10
+        version: '0.4'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.4
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -122,17 +128,23 @@ files:
 - Gemfile.lock
 - LICENSE.txt
 - README.md
+- Rakefile
 - bin/cs-nagios
 - cloudstack-nagios.gemspec
 - lib/cloudstack-nagios/base.rb
 - lib/cloudstack-nagios/cli.rb
+- lib/cloudstack-nagios/commands/capacity.rb
 - lib/cloudstack-nagios/commands/check.rb
 - lib/cloudstack-nagios/commands/nagios_config.rb
+- lib/cloudstack-nagios/commands/router.rb
 - lib/cloudstack-nagios/commands/snmpd_config.rb
 - lib/cloudstack-nagios/files/snmpd.conf
 - lib/cloudstack-nagios/helper.rb
-- lib/cloudstack-nagios/templates/cloudstack_routers_hosts.cfg.erb
-- lib/cloudstack-nagios/templates/cloudstack_routers_services.cfg.erb
+- lib/cloudstack-nagios/templates/cloudstack_api_hosts.cfg.erb
+- lib/cloudstack-nagios/templates/cloudstack_capacity_services.cfg.erb
+- lib/cloudstack-nagios/templates/cloudstack_router_hosts.cfg.erb
+- lib/cloudstack-nagios/templates/cloudstack_router_services.cfg.erb
+- lib/cloudstack-nagios/templates/cloudstack_storage_pool_services.cfg.erb
 - lib/cloudstack-nagios/version.rb
 - lib/cloudstack_nagios.rb
 homepage: https://bitbucket.org/swisstxt/cloudstack-nagios