cloudstack-nagios 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4dfef0d15a505ec785f1a81b8de68d7656c5f108
-  data.tar.gz: 8886ff661b1581c56f67a7d08f349378e3495d24
+  metadata.gz: f4cb1a12d66fceb783066e28b57ca209902d70f1
+  data.tar.gz: 8c939b37609f6feddd829ea35815dd58061e18da
 SHA512:
-  metadata.gz: 4fbea4827a0dede42b2cadf9c5aa2bb6c9c07d25d50ca07c8bc8efb64d8f385b350e6157d1f866ed5d182086ef146327c5621d992d8e422479d1c3c7c66e44a6
-  data.tar.gz: af59b95251ba561f0e96b4397952cd8cf2b252e9d28b54548c5e940d2f734607b591b863f12038fe19bffea4f47afefbc50828c97bc74c9a569336752630ccdf
+  metadata.gz: c8e98357a21ac5aff4b643103a9832156d6493fc81928d6f426a2de283044c6552284b422ff8f02ac7104b5b2aa172c148714c3df392b9e3d6f84cfb75103634
+  data.tar.gz: e376a8682220887cb5c9eb59d053a8ea3e9eb4f0f9ced4e1efeede31c33e23bb135d5c63179e9f8e43e091d36eecd7682f7d7c2756741cca79235e33c704e191

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cloudstack-nagios (0.6.1)
+    cloudstack-nagios (0.6.2)
       cloudstack_client (~> 0.4, >= 0.4.4)
       erubis (~> 2.7.0)
       highline (~> 1.6.20)

data/README.md

@@ -27,7 +27,7 @@ $ gem install cloudstack-nagios
 Create the initial configuration:
 
 ```bash
-$ cs setup
+$ cs-nagios 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.

data/cloudstack-nagios.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |gem|
   gem.email         = ["nik.wolfgramm@gmail.com"]
   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.homepage      = "https://github.com/swisstxt/cloudstack-nagios"
   gem.license       = 'MIT'
 
   gem.required_ruby_version = '>= 1.9.3'

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

@@ -42,9 +42,15 @@ class Check < CloudstackNagios::Base
    desc "capacity", "check capacity of storage_pool"
    option :pool_name, required: true
    option :zone
+   option :over_provisioning, type: :numeric, default: 1.0
    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])
+      data = check_data(
+         pool['disksizetotal'] * options[:over_provisioning],
+         pool['disksizeallocated'].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]
    end

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

@@ -1,5 +1,7 @@
 class NagiosConfig < CloudstackNagios::Base
 
+  class_option :bin_path, desc: "absolute path to the nagios-cloudstack binary"
+
   desc "router_hosts", "generate nagios hosts configuration for virtual routers"
   option :template,
     desc: "path of ERB template to use",
@@ -48,6 +50,7 @@ class NagiosConfig < CloudstackNagios::Base
     desc: "path of ERB template to use",
     default: File.join(File.dirname(__FILE__), '..', 'templates', 'cloudstack_storage_pool_services.cfg.erb'),
     aliases: '-t'
+  option :over_provisioning, type: :numeric, default: 1.0
   def storage_pool_services
     service_template = load_template(options[:template])
     storage_pools = client.list_storage_pools.select do |pool| 
@@ -55,6 +58,7 @@ class NagiosConfig < CloudstackNagios::Base
     end
     puts service_template.result(
       storage_pools: storage_pools,
+      over_provisioning: options[:over_provisioning],
       bin_path: bin_path,
       config_file: options[:config],
       date: date_string
@@ -82,7 +86,11 @@ class NagiosConfig < CloudstackNagios::Base
     end
 
     def bin_path
-      File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'bin'))
+      unless options[:bin_path]
+        return ''
+      else
+        return options[:bin_path].end_with?('/') ? options[:bin_path] : options[:bin_path] + "/"
+      end
     end
   end
 

data/lib/cloudstack-nagios/helper.rb

@@ -36,7 +36,6 @@ module CloudstackNagios
         code = 1
       else 
         code = 2
-        usage_percent = 0
       end
       [code, usage_percent.round(0)]
     end

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

@@ -15,7 +15,7 @@
 <% 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 %>
+        command_line                   <%= bin_path -%>cs-nagios check capacity <%= cap_values[:method_name] %> -w $ARG1$ -c $ARG2$ --config <%= config_file %>
         register                       1
 }
 

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

@@ -14,25 +14,25 @@
 
 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$ --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$ --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$ --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 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$ --config <%= config_file %>
         register                       1
 }
 

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

@@ -15,7 +15,7 @@
 <% storage_pools.each do |storage_pool| -%>
 define command {
   command_name  cs-nagios_check-storage_pool
-  command_line  <%= bin_path -%>/cs-nagios check storage_pool --pool_name <%= storage_pool['name'] -%> --zone <%= storage_pool['zonename'] -%> -w $ARG1$ -c $ARG2$ --config <%= config_file %>
+  command_line  <%= bin_path -%>cs-nagios check storage_pool --pool_name <%= storage_pool['name'] -%><%= " --over_provisioning #{over_provisioning}" if over_provisioning != 1.0 && storage_pool['type'] == 'NetworkFilesystem' -%> --zone <%= storage_pool['zonename'] -%> -w $ARG1$ -c $ARG2$ --config <%= config_file %>
   register      1
 }
 

data/lib/cloudstack-nagios/version.rb

@@ -1,3 +1,3 @@
 module CloudstackNagios
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack-nagios
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Nik Wolfgramm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-26 00:00:00.000000000 Z
+date: 2014-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -147,7 +147,7 @@ files:
 - 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
+homepage: https://github.com/swisstxt/cloudstack-nagios
 licenses:
 - MIT
 metadata: {}