cloudstack-nagios 0.14.2 → 0.15.0

data/.ruby-version

@@ -0,0 +1 @@
+1.9.3-p392

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    cloudstack-nagios (0.14.2)
-      cloudstack_client (~> 0.5, >= 0.5.0)
+    cloudstack-nagios (0.15.0)
+      cloudstack_client (~> 0.7, >= 0.7.1)
       erubis (~> 2.7.0)
       highline (~> 1.6.20)
       sshkit (~> 1.3.0)
@@ -11,7 +11,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    cloudstack_client (0.6.4)
+    cloudstack_client (0.7.1)
     erubis (2.7.0)
     highline (1.6.21)
     json (1.8.1)
@@ -19,7 +19,7 @@ GEM
       net-ssh (>= 2.6.5)
     net-ssh (2.9.1)
     rake (10.3.2)
-    rdoc (4.1.1)
+    rdoc (4.1.2)
       json (~> 1.4)
     sshkit (1.3.0)
       net-scp (>= 1.1.2)
@@ -28,7 +28,7 @@ GEM
     term-ansicolor (1.3.0)
       tins (~> 1.0)
     thor (0.19.1)
-    tins (1.3.2)
+    tins (1.3.3)
 
 PLATFORMS
   ruby

data/README.md

@@ -76,6 +76,8 @@ hostgroups
 zone_hosts
 router_hosts
 router_services
+system_vm_hosts
+system_vm_services
 capacities
 async_jobs
 storage_pools
@@ -85,22 +87,33 @@ storage_pools
 
 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
+#### Types
+
+cloudstack-nagios differentiates between 2 different types of system vm's:
+   * routers: `cs-nagios check router`
+   * secondary storage vms and console proxies: `cs-nagios check system_vm`
+
+#### Checks
 
 The following checks are available:
 
+General Checks
    * memory - measure memory usage in percents
    * cpu - measure cpu usage in percent
    * network - measure network usage
-   * rootfs_rw - check if the root file system is writeable
+   * fs_rw - check if the root file system is writeable
+   * rootfs_rw - check if the root file system is writeable (wrapper for fs_rw with mount point /)
    * disk_usage - check the diks space usage of the root volume
+
+Checks for routers
    * conntrack_connections, check the number of conntrack connections and set proper limits if needed
    * active_ftp - make sure conntrack_ftp and nf_nat_ftp modules are loaded and enable it if needed
 
-Example:
+Examples:
 
 ```sh
 $ cs-nagios check system_vm network --host 10.100.9.161
+$ cs-nagios check router active_ftp --host 10.100.9.177
 ```
 
 #### Enabling snmpd checks for system vms

data/cloudstack-nagios.gemspec

@@ -22,10 +22,10 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency('rdoc')
   gem.add_development_dependency('rake', '~> 10.3.1')
-  
-  gem.add_dependency('cloudstack_client', '~> 0.5', '>= 0.5.0')
+
+  gem.add_dependency('cloudstack_client', '~> 0.7', '>= 0.7.1')
   gem.add_dependency('thor', '~> 0.19.1')
   gem.add_dependency('erubis', '~> 2.7.0')
   gem.add_dependency('sshkit', '~> 1.3.0')
   gem.add_dependency('highline', '~> 1.6.20')
-end
+end

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

@@ -1,3 +1,4 @@
+require "cloudstack-nagios/commands/system_vm"
 require "cloudstack-nagios/commands/router"
 require "cloudstack-nagios/commands/capacity"
 
@@ -33,13 +34,13 @@ class Check < CloudstackNagios::Base
    desc "router SUBCOMMAND ...ARGS", "router checks"
    subcommand :router, Router
 
-   desc "capacity SUBCOMMAND ...ARGS", "capacity checks"
-   subcommand :capacity, Capacity
+   desc "system_vm SUBCOMMAND ...ARGS", "system vm checks"
+   subcommand :system_vm, SystemVm
 
-   desc "storage_pool SUBCOMMAND ...ARGS", "storage_pool checks"
+   desc "capacity SUBCOMMAND ...ARGS", "capacity checks"
    subcommand :capacity, Capacity
 
-   desc "capacity", "check capacity of storage_pool"
+   desc "storage_pool", "check capacity of storage_pool"
    option :pool_name, required: true
    option :zone
    option :over_provisioning, type: :numeric, default: 1.0,
@@ -81,9 +82,9 @@ class Check < CloudstackNagios::Base
         code = 0
       elsif outstanding_jobs.size < options[:critical]
         code = 1
-      else 
+      else
         code = 2
-      end 
+      end
       puts "async_jobs #{RETURN_CODES[code]} - jobs = #{outstanding_jobs.size} | jobs=#{outstanding_jobs.size}"
    end
-end
+end

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

@@ -31,6 +31,7 @@ class NagiosConfig < CloudstackNagios::Base
     end
 
     routers = configs.include?("router_hosts") ? cs_routers : nil
+    system_vms = configs.include?("system_vm_hosts") ? cs_system_vms : nil
     pools = configs.include?("storage_pools") ? storage_pools : nil
     zones = client.list_zones
     config_name = configs.size == 1 ?
@@ -51,6 +52,7 @@ class NagiosConfig < CloudstackNagios::Base
       template = load_template(tmpl_file)
       output += template.result(
         routers: routers,
+        system_vms: system_vms,
         bin_path: bin_path,
         if_speed: options[:if_speed],
         config_file: options[:config],
@@ -78,7 +80,7 @@ class NagiosConfig < CloudstackNagios::Base
   no_commands do
 
     def get_configs(configs = [])
-      all_configs = %w(hostgroups zone_hosts router_hosts router_services capacities async_jobs storage_pools)
+      all_configs = %w(hostgroups zone_hosts router_hosts router_services system_vm_hosts system_vm_services capacities async_jobs storage_pools)
       if configs.size == 0
         return all_configs
       else
@@ -102,4 +104,4 @@ class NagiosConfig < CloudstackNagios::Base
     end
   end
 
- end
+ end

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

@@ -1,117 +1,10 @@
-require 'sshkit/dsl'
+require "cloudstack-nagios/commands/system_vm"
 
-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]}% (#{((total - free_b)/1024.0).round(0)}/#{(total/1024.0).round(0)}MB) | \
-            usage=#{data[1]}% total=#{total}M free=#{free}M free_wo_buffers=#{free_b}M".gsub(/\s+/, " ")
-      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
+class Router < SystemVm
 
   desc "rootfs_rw", "check if the rootfs is read/writeable on host"
   def rootfs_rw
-    begin
-      host = systemvm_host
-      test_file = '/rootdiskcheck.txt'
-      rootfs_rw = false
-      on host do |h|
-        rootfs_rw = execute(:touch, test_file)
-        execute(:rm, '-f', test_file)
-      end
-    rescue SSHKit::Command::Failed
-      rootfs_rw = false
-    rescue => e
-      exit_with_failure(e)
-    end
-    status = rootfs_rw ? 0 : 2
-    puts "ROOTFS_RW #{rootfs_rw ? 'OK - rootfs writeable' : 'CRITICAL - rootfs NOT writeable'}"
-    exit status
-  end
-
-  desc "disk_usage", "check the disk space usage of the root volume"
-  option :partition, desc: "The partition to check", default: '/', aliases: '-P'
-  def disk_usage
-    begin
-      host = systemvm_host
-      partition = options[:partition]
-      proc_out = ""
-      on host do |h|
-        proc_out = capture(:df, '-l', partition)
-      end
-      match = proc_out.match(/.*\s(\d+)%\s.*/)
-      if match
-        usage = match[1]
-        data = check_data(100, usage, options[:warning], options[:critical])
-        puts "DISK_USAGE #{RETURN_CODES[data[0]]} (Partition #{options[:partition]}) - usage = #{data[1]}% | usage=#{data[1]}%"
-        exit data[0]
-      else
-        puts "DISK_USAGE UNKNOWN"
-      end
-    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
+    invoke :fs_rw
   end
 
   desc "conntrack_connections", "check the number of conntrack connections"
@@ -168,21 +61,4 @@ class Router < CloudstackNagios::Base
     exit status
   end
 
-  no_commands do
-
-    def systemvm_host
-      unless options[:host]
-        say "Error: --host/-H option is required for this check.", :red
-        exit 1
-      end
-      # suppress sshkit output to stdout
-      SSHKit.config.output_verbosity = Logger::FATAL
-      host = SSHKit::Host.new("root@#{options[:host]}")
-      host.ssh_options = sshoptions(options[:ssh_key])
-      host.port = options[:ssh_port]
-      host
-    end
-
-  end
-
 end

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

@@ -0,0 +1,191 @@
+require 'sshkit/dsl'
+
+class SystemVm < 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]}% (#{((total - free_b)/1024.0).round(0)}/#{(total/1024.0).round(0)}MB) | \
+            usage=#{data[1]}% total=#{total}M free=#{free}M free_wo_buffers=#{free_b}M".gsub(/\s+/, " ")
+      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 "fs_rw", "check if the rootfs is read/writeable on host"
+  option :mount_point, desc: "The mount point to check", default: '/', aliases: '-m'
+  def fs_rw
+    begin
+      host = systemvm_host
+      test_file = File.join(options[:mount_point], 'rootdiskcheck.txt')
+      fs_rw = false
+      on host do |h|
+        fs_rw = execute(:touch, test_file)
+        execute(:rm, '-f', test_file)
+      end
+    rescue SSHKit::Command::Failed
+      fs_rw = false
+    rescue => e
+      exit_with_failure(e)
+    end
+    status = fs_rw ? 0 : 2
+    puts "FS_RW #{fs_rw ?
+      "OK - file system (#{options[:mount_point]}) writeable" :
+      "CRITICAL - file system (#{options[:mount_point]}) NOT writeable"}"
+    exit status
+  end
+
+  desc "disk_usage", "check the disk space usage of the root volume"
+  option :partition, desc: "The partition to check", default: '/', aliases: '-P'
+  def disk_usage
+    begin
+      host = systemvm_host
+      partition = options[:partition]
+      proc_out = ""
+      on host do |h|
+        proc_out = capture(:df, '-l', partition)
+      end
+      match = proc_out.match(/.*\s(\d+)%\s.*/)
+      if match
+        usage = match[1]
+        data = check_data(100, usage, options[:warning], options[:critical])
+        puts "DISK_USAGE #{RETURN_CODES[data[0]]} (Partition #{options[:partition]}) - usage = #{data[1]}% | usage=#{data[1]}%"
+        exit data[0]
+      else
+        puts "DISK_USAGE UNKNOWN"
+      end
+    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
+
+  desc "conntrack_connections", "check the number of conntrack connections"
+  def conntrack_connections
+    begin
+      host = systemvm_host
+      default_max = 1000000
+      netfilter_path = "/proc/sys/net/netfilter/"
+      current, max = 0
+      on host do |h|
+        max     = capture("cat #{netfilter_path}nf_conntrack_max").to_i
+        current = capture("cat #{netfilter_path}nf_conntrack_count").to_i
+      end
+      if max < default_max
+        on host do |h|
+          execute :echo, "#{default_max} > #{netfilter_path}nf_conntrack_max"
+        end
+      end
+      data = check_data(max, current, options[:warning], options[:critical])
+      puts "CONNTRACK_CONNECTIONS #{RETURN_CODES[data[0]]} - usage = #{data[1]}% (#{current.round(0)}/#{max.round(0)}) | usage=#{data[1]}% current=#{current.round(0)} max=#{max.round(0)}"
+      exit data[0]
+    rescue => e
+      exit_with_failure(e)
+    end
+  end
+
+  desc "active_ftp", "make sure conntrack_ftp and nf_nat_ftp modules are loaded"
+  def active_ftp
+    begin
+      host = systemvm_host
+      active_ftp_enabled = false
+      modules = %w(nf_conntrack_ftp, nf_nat_ftp)
+      on host do |h|
+        lsmod = capture(:lsmod)
+        active_ftp_enabled = lsmod.include?('nf_conntrack_ftp') &&
+          lsmod.include?('nf_nat_ftp')
+        unless active_ftp_enabled
+          # load the modules in the kernel
+          execute(:modprobe, 'nf_conntrack_ftp')
+          execute(:modprobe, 'nf_nat_ftp')
+          # load the modules at next server boot
+          execute(:echo, '"nf_conntrack_ftp" >> /etc/modules')
+          execute(:echo, '"nf_nat_ftp" >> /etc/modules')
+          active_ftp_enabled = true
+        end
+      end
+    rescue SSHKit::Command::Failed
+      active_ftp_enabled = false
+    rescue => e
+      exit_with_failure(e)
+    end
+    status = active_ftp_enabled ? 0 : 2
+    puts "ACTIVE_FTP #{active_ftp_enabled ? 'OK - active_ftp enabled' : 'CRITICAL - active_ftp NOT enabled'}"
+    exit status
+  end
+
+  no_commands do
+
+    def systemvm_host
+      unless options[:host]
+        say "Error: --host/-H option is required for this check.", :red
+        exit 1
+      end
+      # suppress sshkit output to stdout
+      SSHKit.config.output_verbosity = Logger::FATAL
+      host = SSHKit::Host.new("root@#{options[:host]}")
+      host.ssh_options = sshoptions(options[:ssh_key])
+      host.port = options[:ssh_port]
+      host
+    end
+
+  end
+
+end

data/lib/cloudstack-nagios/helper.rb

@@ -18,6 +18,10 @@ module CloudstackNagios
       routers += client.list_routers(projectid: -1, status: 'Running')
     end
 
+    def cs_system_vms
+      vms = client.list_system_vms
+    end
+
     def storage_pools
       storage_pools = client.list_storage_pools.select do |pool|
         pool['state'].downcase == 'up'

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

@@ -0,0 +1,15 @@
+
+<% system_vms.each do |vm| -%>
+  <% if vm['privateip'] -%>
+define host {
+  host_name      <%= vm['name'] %>
+  display_name   <%= vm['name'] %> (<%= vm['privateip'] %>) - <%= vm['zonename'] %>
+  address        <%= vm['privateip'] %>
+  use            Linux-Host,host-pnp
+  hostgroups     CloudstackSystemVm
+  check_command  check-host-alive
+  register       1
+}
+
+  <% end -%>
+<% end -%>

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

@@ -0,0 +1,84 @@
+
+define command {
+        command_name  cs-nagios_check_systemvm-memory
+        command_line  <%= bin_path -%>cs-nagios check system_vm memory -H $HOSTADDRESS$ -w $ARG1$ -c $ARG2$ --ssh-key <%= ssh_key %> --ssh-port <%= ssh_port %> --config <%= config_file %>
+        register      1
+}
+
+define command {
+        command_name  cs-nagios_check_systemvm-cpu
+        command_line  <%= bin_path -%>cs-nagios check system_vm cpu -H $HOSTADDRESS$ -w $ARG1$ -c $ARG2$ --ssh-key <%= ssh_key %> --ssh-port <%= ssh_port %> --config <%= config_file %>
+        register      1
+}
+
+define command {
+        command_name  cs-nagios_check_systemvm-network
+        command_line  <%= bin_path -%>cs-nagios check system_vm network -H $HOSTADDRESS$ -w $ARG1$ -c $ARG2$ --if-speed <%= if_speed %> --ssh-key <%= ssh_key %> --ssh-port <%= ssh_port %> --config <%= config_file %>
+        register      1
+}
+
+define command {
+        command_name  cs-nagios_check_systemvm-fsrw
+        command_line  <%= bin_path -%>cs-nagios check system_vm fs_rw -H $HOSTADDRESS$ -w $ARG1$ -c $ARG2$ --ssh-key <%= ssh_key %> --ssh-port <%= ssh_port %> --config <%= config_file %>
+        register      1
+}
+
+define command {
+        command_name  cs-nagios_check_systemvm-diskusage
+        command_line  <%= bin_path -%>cs-nagios check system_vm disk_usage -H $HOSTADDRESS$ -w $ARG1$ -c $ARG2$ -P $ARG3$ --ssh-key <%= ssh_key %> --ssh-port <%= ssh_port %> --config <%= config_file %>
+        register      1
+}
+
+define service {
+        hostgroup_name	     CloudstackSystemVm
+        service_description  Cloudstack Virtual System VM Memory
+        display_name         Cloudstack Virtual System VM Memory
+        use                  Generic-Service,service-pnp
+        check_command        cs-nagios_check_systemvm-memory!80!90
+        register             1
+}
+
+define service {
+        hostgroup_name       CloudstackSystemVm
+        service_description  Cloudstack Virtual System VM CPU
+        display_name         Cloudstack Virtual System VM CPU
+        use                  Generic-Service,service-pnp
+        check_command        cs-nagios_check_systemvm-cpu!80!90
+        register             1
+}
+
+define service {
+        hostgroup_name       CloudstackSystemVm
+        service_description  Cloudstack Virtual System VM Network
+        display_name         Cloudstack Virtual System VM Network
+        use                  Generic-Service,service-pnp
+        check_command        cs-nagios_check_systemvm-network!80!90
+        register             1
+}
+
+define service {
+        hostgroup_name       CloudstackSystemVm
+        service_description  Cloudstack Virtual System VM RootFS rw
+        display_name         Cloudstack Virtual System VM RootFS rw
+        use                  Generic-Service,service-pnp
+        check_command        cs-nagios_check_systemvm-rootfsrw!80!90
+        register             1
+}
+
+define service {
+        hostgroup_name       CloudstackSystemVm
+        service_description  Cloudstack Virtual System VM DiskUsageRoot
+        display_name         Cloudstack Virtual System VM DiskUsage Root
+        use                  Generic-Service,service-pnp
+        check_command        cs-nagios_check_systemvm-diskusage!80!90!/
+        register             1
+}
+
+define service {
+        hostgroup_name       CloudstackSystemVm
+        service_description  Cloudstack Virtual System VMDiskUsageVar
+        display_name         Cloudstack Virtual System VM DiskUsage Var
+        use                  Generic-Service,service-pnp
+        check_command        cs-nagios_check_systemvm-diskusage!80!90!/var
+        register             1
+}

data/lib/cloudstack-nagios/version.rb

@@ -1,3 +1,3 @@
 module CloudstackNagios
-  VERSION = "0.14.2"
+  VERSION = "0.15.0"
 end

metadata

@@ -1,117 +1,132 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack-nagios
 version: !ruby/object:Gem::Version
-  version: 0.14.2
+  version: 0.15.0
+  prerelease: 
 platform: ruby
 authors:
 - Nik Wolfgramm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-05 00:00:00.000000000 Z
+date: 2014-09-19 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.5'
-    - - ">="
+        version: '0.7'
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0.5'
-    - - ">="
+        version: '0.7'
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.7.1
 - !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
@@ -123,7 +138,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
+- .ruby-version
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -138,6 +154,7 @@ files:
 - lib/cloudstack-nagios/commands/nagios_config.rb
 - lib/cloudstack-nagios/commands/router.rb
 - lib/cloudstack-nagios/commands/snmpd_config.rb
+- lib/cloudstack-nagios/commands/system_vm.rb
 - lib/cloudstack-nagios/files/create_cs_router_config.sh
 - lib/cloudstack-nagios/files/snmpd.conf
 - lib/cloudstack-nagios/helper.rb
@@ -147,6 +164,8 @@ files:
 - lib/cloudstack-nagios/templates/cloudstack_router_hosts.cfg.erb
 - lib/cloudstack-nagios/templates/cloudstack_router_services.cfg.erb
 - lib/cloudstack-nagios/templates/cloudstack_storage_pools.cfg.erb
+- lib/cloudstack-nagios/templates/cloudstack_system_vm_hosts.cfg.erb
+- lib/cloudstack-nagios/templates/cloudstack_system_vm_services.cfg.erb
 - lib/cloudstack-nagios/templates/cloudstack_zone_hosts.cfg.erb
 - lib/cloudstack-nagios/templates/footer.cfg.erb
 - lib/cloudstack-nagios/templates/header.cfg.erb
@@ -155,27 +174,28 @@ 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
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: cloudstack-nagios CloudStack monitoring tools for nagios
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 944d22aba5a8a1b41bcfdd7d6ae63ca86af3d082
-  data.tar.gz: cfc0d40ecc78b6ab5cf50de2a8be47f3160a9a94
-SHA512:
-  metadata.gz: 37869a07b4fb19e67a8f8f24ae58bafda2230260f0f7383fae1762d850ebf8ac8e533649b70dac74704d4222262bd2fd47e2757d9a38808d4b7e4039d8b9c79d
-  data.tar.gz: 12b065a279fdee3e75e7cd5c3cbd461665bf4fd2760fb43d3bd2078db15183f636384fdd385718128e87ba873919f10b002629903857d7a1cf2bae48d3fdfe5a