cloudstack-nagios 0.8.2 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e285df3cf03a0ad9afb144ba89b3b005cb2f1fa
-  data.tar.gz: f84e38f2c87f337acd65d23201840b5113139159
+  metadata.gz: 0e420a1e5fafbd84bc572134bee162f9538ea77f
+  data.tar.gz: 38b328cf7f3b8c58dd01a4c658a27ed8cec84228
 SHA512:
-  metadata.gz: 85fe85816239b1982b4f2f0bf1e3e45d3e4022c0793cd84fc9297e2cd06393da090e763a0c31315f36d30a7a372990e43006faf3252fea81b543b0e654dfa51c
-  data.tar.gz: e964154477a24d435b07a96e029ef2b38350dbafd182b089a3f198b8a9033284d642c0271baa8ed88e17503e3dbb53dafcc9a3b9566763b8ff85fba227ac4776
+  metadata.gz: 88bf16e6b0eb6c23c01b38de31c60b2a58e364b291eaaa412187659e40a5c211bca700784e12d0bd31e95609d99df32c212dbcf77dc7fde22840a97c2cfc8722
+  data.tar.gz: ddf24fd256f23fcd9e83b764bdf15a7dcafcfb5cdc5965944282d57e23af6d9664c96b2bd551d41744bd3555096c840013ee380a9cada8a105fd91a37404d53c

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    cloudstack-nagios (0.8.1)
-      cloudstack_client (~> 0.4, >= 0.4.4)
+    cloudstack-nagios (0.9.0)
+      cloudstack_client (~> 0.5, >= 0.5.0)
       erubis (~> 2.7.0)
       highline (~> 1.6.20)
       sshkit (~> 1.3.0)

data/cloudstack-nagios.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency('rdoc')
   gem.add_development_dependency('rake', '~> 10.1.1')
   
-  gem.add_dependency('cloudstack_client', '~> 0.4', '>= 0.4.4')
+  gem.add_dependency('cloudstack_client', '~> 0.5', '>= 0.5.0')
   gem.add_dependency('thor', '~> 0.18.1')
   gem.add_dependency('erubis', '~> 2.7.0')
   gem.add_dependency('sshkit', '~> 1.3.0')

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

@@ -25,7 +25,7 @@ class Capacity < CloudstackNagios::Base
     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']} usage=#{data[1]}%"
+      puts "#{CAPACITY_TYPES[type][:name]} #{RETURN_CODES[data[0]]} - usage = #{data[1]}% | usage=#{cap['capacityused']} usage_perc=#{data[1]}%"
       exit data[0]
     end
   end

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

@@ -12,6 +12,14 @@ class NagiosConfig < CloudstackNagios::Base
     type: :numeric,
     default: 1000000,
     aliases: '-s'
+  option :ssh_key,
+      desc: 'ssh private key to use',
+      default: '/var/lib/cloud/management/.ssh/id_rsa'
+  option :ssh_port,
+    desc: 'ssh port to use',
+    type: :numeric,
+    default: 3922,
+    aliases: '-p'
   option :over_provisioning, type: :numeric, default: 1.0
   def generate(*configs)
     configs = get_configs(configs)
@@ -50,6 +58,8 @@ class NagiosConfig < CloudstackNagios::Base
         capacity_types: Capacity::CAPACITY_TYPES,
         storage_pools: pools,
         over_provisioning: options[:over_provisioning],
+        ssh_key: options[:ssh_key],
+        ssh_port: options[:ssh_port]
       )
     end
     footer = load_template(File.join(TEMPLATE_DIR, "footer.cfg.erb"))

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

@@ -116,7 +116,7 @@ class Router < CloudstackNagios::Base
       end
       host = SSHKit::Host.new("root@#{options[:host]}")
       host.ssh_options = sshoptions(options[:ssh_key])
-      host.port = options[:port]
+      host.port = options[:ssh_port]
       host
     end
 

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

@@ -1,31 +1,31 @@
 
 define command {
         command_name  cs-nagios_check-memory
-        command_line  <%= bin_path -%>cs-nagios check router 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$ --ssh-key <%= ssh_key %> --ssh-port <%= ssh_port %> --config <%= config_file %>
         register      1
 }
 
 define command {
         command_name  cs-nagios_check-cpu
-        command_line  <%= bin_path -%>cs-nagios check router 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$ --ssh-key <%= ssh_key %> --ssh-port <%= ssh_port %> --config <%= config_file %>
         register      1
 }
 
 define command {
         command_name  cs-nagios_check-network
-        command_line  <%= bin_path -%>cs-nagios check router network -H $HOSTADDRESS$ -w $ARG1$ -c $ARG2$ --if-speed <%= if_speed %> --config <%= config_file %>
+        command_line  <%= bin_path -%>cs-nagios check router 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-rootfsrw
-        command_line  <%= bin_path -%>cs-nagios check router 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$ --ssh-key <%= ssh_key %> --ssh-port <%= ssh_port %> --config <%= config_file %>
         register      1
 }
 
 define command {
         command_name  cs-nagios_check-diskusage
-        command_line  <%= bin_path -%>cs-nagios check router disk_usage -H $HOSTADDRESS$ -w $ARG1$ -c $ARG2$ --config <%= config_file %>
+        command_line  <%= bin_path -%>cs-nagios check router disk_usage -H $HOSTADDRESS$ -w $ARG1$ -c $ARG2$ --ssh-key <%= ssh_key %> --ssh-port <%= ssh_port %> --config <%= config_file %>
         register      1
 }
 

data/lib/cloudstack-nagios/version.rb

@@ -1,3 +1,3 @@
 module CloudstackNagios
-  VERSION = "0.8.2"
+  VERSION = "0.9.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack-nagios
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.0
 platform: ruby
 authors:
 - Nik Wolfgramm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-07 00:00:00.000000000 Z
+date: 2014-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -44,20 +44,20 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement