lib/cloudstack-nagios/commands/capacity.rb in cloudstack-nagios-0.18.4 vs lib/cloudstack-nagios/commands/capacity.rb in cloudstack-nagios-0.19.0

@@ -14,19 +14,22 @@
   }
 
   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]) { 
+    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
+      unless res_zone = client.list_zones(name: zone).first
+        raise CloudstackNagios::InputError, "zone '#{zone}' not found."
+      end
+      cap = client.list_capacity(type: type, zoneid: res_zone['id']).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_perc=#{data[1]}%"
       exit data[0]
     end
   end
-end
\ No newline at end of file
+end