cloudstack-nagios 0.7.8 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03827f3422783fbb581345b23c1e77e6a16e4f81
-  data.tar.gz: b28228db0803a34ee63aa1d8d3920c316cb925ad
+  metadata.gz: 667b096bf7ec0a5da7a25e592a34be9ccc217910
+  data.tar.gz: 32a5cc461d2a9605b33263f89a7c6880218b17a8
 SHA512:
-  metadata.gz: 3b82d5e0af8fb887afd9d0e4b3cd65f0618c7d5b5ce5f0c43b4b546691666917ad8e16de61b6af5ec6f604568240f51018775985b606978dad5187791fbcc2b2
-  data.tar.gz: 4148e97b700fff326eb915f464ab716e9b699ba209970ad016e1fef26eadea039b9a6b9bd05a98d51b732b14a4d3c9923b850bbb26227e7261150b52a0d17fac
+  metadata.gz: 0b4222049779b16307bb4d48dab4f6177d3717362f87d04f0630396ecf284c2948e0f2843295b4b16b379694da820d14e52ea5a082c6e2f01afaba564e7f42e0
+  data.tar.gz: ee48563afdde541e9b680cc31a2a9323608c02d354f3aa2e67e9115eaf6e6f28abe6f0173b83f105ae51910f370c58069ac5dab24a9749d7529280f6b2933b69

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    cloudstack-nagios (0.7.7)
+    cloudstack-nagios (0.8.0)
       cloudstack_client (~> 0.4, >= 0.4.4)
       erubis (~> 2.7.0)
       highline (~> 1.6.20)
-      sshkit (~> 1.1.0)
+      sshkit (~> 1.3.0)
       thor (~> 0.18.1)
 
 GEM
@@ -13,16 +13,16 @@ GEM
   specs:
     cloudstack_client (0.5.0)
     erubis (2.7.0)
-    highline (1.6.20)
+    highline (1.6.21)
     json (1.8.1)
     net-scp (1.1.2)
       net-ssh (>= 2.6.5)
     net-ssh (2.8.0)
-    rake (10.0.4)
+    rake (10.1.1)
     rdoc (4.1.1)
       json (~> 1.4)
-    sshkit (1.1.0)
-      net-scp
+    sshkit (1.3.0)
+      net-scp (>= 1.1.2)
       net-ssh
       term-ansicolor
     term-ansicolor (1.3.0)
@@ -35,5 +35,5 @@ PLATFORMS
 
 DEPENDENCIES
   cloudstack-nagios!
-  rake (~> 10.0.4)
+  rake (~> 10.1.1)
   rdoc

data/README.md

@@ -18,7 +18,7 @@ The following checks are supported:
 
 Install the cloudstack-cli gem:
 
-```bash
+```sh
 $ gem install cloudstack-nagios
 ```
 
@@ -26,7 +26,7 @@ $ gem install cloudstack-nagios
 
 Create the initial configuration:
 
-```bash
+```sh
 $ cs-nagios setup
 ```
 
@@ -53,7 +53,7 @@ test:
 
 See the help screen:
 
-```bash
+```sh
 $ cs-nagios
 ```
 
@@ -61,48 +61,22 @@ $ cs-nagios
 
 Generate all configuration files:
 
-```bash
-$ cs-nagios nagios_config generate_all
+```sh
+$ cs-nagios nagios_config generate all
 ```
-
-### Generate Nagios configuration files of each type
-
-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:
-
-```bash
-$ cs-nagios nagios_config router_hosts
-```
-
-Generate nagios host configuration for virtual routers:
-
-```bash
-$ cs-nagios nagios_config router_services
-```
-
-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
-```
-
-Generate nagios service configuration for async job checks:
-
-```bash
-$ cs-nagios nagios_config asyncjobs_services
+You can also generate each config file individualy.
+The following types are awailable:
+
+```sh
+$ cs-nagios nagios_config list
+all
+hostgroup
+zone_hosts
+router_hosts
+router_services
+capacities
+async_jobs
+storage_pools
 ```
 
 ### System VM checks
@@ -121,7 +95,7 @@ The following checks are available:
 
 Example:
 
-```bash
+```sh
 $ cs-nagios check system_vm network --host 10.100.9.161
 ```
 
@@ -140,7 +114,7 @@ Checks various global capacity values.
 
 Example:
 
-```bash
+```sh
 $ cs-nagios check capacity memory --zone ZUERICH_IX
 ```
 
@@ -150,7 +124,7 @@ Checks the available disk space on Cloudstack storage pools.
 
 Example:
 
-```bash
+```sh
 $ cs-nagios check storage_pool --pool_name fs_cs_zone01_pod01
 ```
 
@@ -160,7 +134,7 @@ Checks the number of pending async jobs.
 
 Example:
 
-```bash
+```sh
 $ cs-nagios check async_jobs
 ```
 
@@ -178,4 +152,4 @@ $ cs-nagios check async_jobs
 
 ## License
 
-Released under the MIT License. See the [LICENSE](https://bitbucket.org/swisstxt/cloudstack-cli/raw/master/LICENSE.txt) file for further details.
+Released under the MIT License. See the [LICENSE](https://bitbucket.org/swisstxt/cloudstack-cli/raw/master/LICENSE.txt) file for further details.

data/cloudstack-nagios.gemspec

@@ -21,11 +21,11 @@ Gem::Specification.new do |gem|
   gem.rdoc_options  = %w[--line-numbers --inline-source]
 
   gem.add_development_dependency('rdoc')
-  gem.add_development_dependency('rake', '~> 10.0.4')
+  gem.add_development_dependency('rake', '~> 10.1.1')
   
   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')
+  gem.add_dependency('sshkit', '~> 1.3.0')
   gem.add_dependency('highline', '~> 1.6.20')
 end

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

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

@@ -51,7 +51,7 @@ class Check < CloudstackNagios::Base
          options[:warning],
          options[:critical]
       )
-      puts "storage_pool #{options[:pool_name]} #{RETURN_CODES[data[0]]} - usage = #{data[1]}% | usage=#{pool['disksizeused']}"
+      puts "storage_pool #{options[:pool_name]} #{RETURN_CODES[data[0]]} - usage = #{data[1]}% | usage=#{pool['disksizeused']} usage=#{data[1]}%"
       exit data[0]
    end
 

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

@@ -1,116 +1,86 @@
 class NagiosConfig < CloudstackNagios::Base
 
-  class_option :bin_path, desc: "absolute path to the nagios-cloudstack binary"
+  TEMPLATE_DIR = File.join(File.dirname(__FILE__), '..', 'templates')
 
-  desc "generate_all", "generate all nagios configs"
-  def generate_all
-    commands = %w(router_hosts router_services api_hosts storage_pool_services capacity_services asyncjobs_services)
-    commands.each do |command|
-      invoke "nagios_config:#{command}"
-      puts
-    end
-  end
+  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",
-    default: File.join(File.dirname(__FILE__), '..', 'templates', 'cloudstack_router_hosts.cfg.erb'),
+  class_option :template,
+    desc: "Path of ERB template to use. Only valid when generating a single configuration",
     aliases: '-t'
-  def router_hosts
-  	host_template = load_template(options[:template])
-    puts host_template.result(
-      routers: cs_routers,
-      date: date_string
-    )
-  end
 
-  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_router_services.cfg.erb'),
-    aliases: '-t'
-  option :if_speed,
+  class_option :if_speed,
     desc: 'network interface speed in bits per second',
     type: :numeric,
     default: 1000000,
     aliases: '-s'
-  def router_services
-  	service_template = load_template(options[:template])
-    puts service_template.result(
-      routers: cs_routers,
-      bin_path: bin_path,
-      if_speed: options[:if_speed],
-      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'
-  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| 
-      pool['state'].downcase == 'up'
+  desc "generate [type]", "generate all nagios configs"
+  def generate(*configs)
+    configs = get_configs(configs)
+    if configs.size == 0
+      say "Please specify a valid configuration.", :green
+      say "Possible values are..."
+      invoke "nagios_config:list", []
+      exit
     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
-    )
-  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(
-      zones: client.list_zones,
-      capacity_types: Capacity::CAPACITY_TYPES,
-      bin_path: bin_path,
-      config_file: options[:config],
+    routers = configs.include?("router_hosts") ? cs_routers : nil
+    pools = configs.include?("storage_pools") ? storage_pools : nil
+    zones = client.list_zones
+    config_name = configs.size == 1 ?
+      "#{configs[0]} configuration" :
+      "all configurations"
+
+    header = load_template(File.join(TEMPLATE_DIR, "header.cfg.erb"))
+    output = header.result(
+      config_name: config_name,
       date: date_string
     )
+    configs.each do |config|
+      if configs.size == 1 && options[:template]
+        tmpl_file = options[:template]
+      else
+        tmpl_file = File.join(TEMPLATE_DIR, "cloudstack_#{config}.cfg.erb")
+      end
+      template = load_template(tmpl_file)
+      output += template.result(
+        routers: routers,
+        bin_path: bin_path,
+        if_speed: options[:if_speed],
+        config_file: options[:config],
+        zones: zones,
+        capacity_types: Capacity::CAPACITY_TYPES,
+        storage_pools: pools,
+        over_provisioning: options[:over_provisioning],
+      )
+    end
+    footer = load_template(File.join(TEMPLATE_DIR, "footer.cfg.erb"))
+    output += footer.result(
+      config_name: config_name
+    )
+    puts output
   end
 
-  desc "asyncjobs_services", "generate nagios capacity services configuration"
-  option :template,
-    desc: "path of ERB template to use",
-    default: File.join(File.dirname(__FILE__), '..', 'templates', 'cloudstack_asyncjobs_services.cfg.erb'),
-    aliases: '-t'
-  def asyncjobs_services
-    service_template = load_template(options[:template])
-    puts service_template.result(
-      bin_path: bin_path,
-      config_file: options[:config],
-      date: date_string
-    )
+  desc "list", "show a list of possible configurations which can be generated."
+  def list
+    configs = get_configs
+    puts ["all"] << configs
   end
 
   no_commands do
+
+    def get_configs(configs = [])
+      all_configs = %w(hostgroup zone_hosts router_hosts router_services capacities async_jobs storage_pools)
+      if configs.size == 0
+        return all_configs
+      else
+        if configs.size == 1 && configs[0].downcase == "all"
+          return all_configs
+        end
+        return all_configs.select { |config| configs.include? config }
+      end
+    end
+
     def date_string
       Time.new.strftime("%d.%m.%Y - %H:%M:%S")
     end

data/lib/cloudstack-nagios/helper.rb

@@ -8,7 +8,7 @@ module CloudstackNagios
         templ.filename = template_path
         return templ
       else
-        say "Error: template not found #{template_path}"
+        say "Error: Template \"#{template_path}\" not found.", :red
         exit 1
       end
     end
@@ -18,6 +18,12 @@ module CloudstackNagios
       routers += client.list_routers(projectid: -1, status: 'Running')
     end
 
+    def storage_pools
+      storage_pools = client.list_storage_pools.select do |pool| 
+        pool['state'].downcase == 'up'
+      end
+    end
+
     def exit_with_failure(exception)
       say 'ERROR: command execution failed!', :red
       say "Message: ", :magenta

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

@@ -0,0 +1,15 @@
+
+define command {
+        command_name         cs-nagios_check-asyncjobs
+        command_line         <%= bin_path -%>cs-nagios check async_jobs -w $ARG1$ -c $ARG2$ --config <%= config_file %>
+        register             1
+}
+
+define service {
+        hostgroup_name       Cloudstack
+        service_description  Cloudstack Async Jobs
+        display_name         Cloudstack Async Jobs
+        use                  Generic-Service,service-pnp
+        check_command        cs-nagios_check-asyncjobs!80!90
+        register             1
+}

data/lib/cloudstack-nagios/templates/{cloudstack_capacity_services.cfg.erb → cloudstack_capacities.cfg.erb}

@@ -1,16 +1,3 @@
-###############################################################################
-#
-# 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 {
@@ -20,11 +7,10 @@ define command {
 }
 
 <% end -%>
-
 <% zones.each do |zone| -%>
   <% capacity_types.each do |cap_type, cap_values| -%>
 define service {
-        hostgroup_name       Cloudstack-API
+        hostgroup_name       Cloudstack
         service_description  Cloudstack <%= zone['name'] %> <%= cap_values[:name] %>
         display_name         Cloudstack <%= zone['name'] %> <%= cap_values[:method_name] %>
         use                  Generic-Service,service-pnp
@@ -34,10 +20,3 @@ define service {
 
   <% end -%>
 <% end -%>
-###############################################################################
-#
-# Service configuration file
-#
-# END OF FILE
-#
-###############################################################################

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

@@ -0,0 +1,6 @@
+
+define hostgroup {
+  hostgroup_name  Cloudstack
+  alias           Cloudstack
+  register        1
+}

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

@@ -1,21 +1,3 @@
-###############################################################################
-#
-# 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
-}
 
 <% routers.each do |router| -%>
   <% if router['linklocalip'] -%>
@@ -24,17 +6,10 @@ define host {
   display_name   <%= router['name'] %> (<%= router['linklocalip'] %>)<%= " - #{router['project']}" if router['project'] %> - <%= router['zonename'] %>
   address        <%= router['linklocalip'] %>
   use			       Linux-Host,host-pnp
-  hostgroups     Cloudstack-SystemVM
+  hostgroups     Cloudstack
   check_command  check-host-alive
   register       1
 }
+
   <% end -%>
 <% end -%>
-
-###############################################################################
-#
-# Host configuration file
-#
-# END OF FILE
-#
-###############################################################################

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

@@ -1,95 +1,75 @@
-###############################################################################
-#
-# Service 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 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 %>
-        register                       1
+        command_name  cs-nagios_check-memory
+        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 %>
-        register                       1
+        command_name  cs-nagios_check-cpu
+        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$ --if-speed <%= if_speed %> --config <%= config_file %>
-        register                       1
+        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 %>
+        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 %>
-        register                       1
+        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 %>
+        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 %>
-        register                       1
+        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 %>
+        register      1
 }
 
 define service {
-        hostgroup_name                  Cloudstack-SystemVM
-        service_description             Memory
-        display_name                    Memory
-        use                             Generic-Service,service-pnp
-        check_command                   cs-nagios_check-memory!80!90
-        register                        1
+        hostgroup_name       Cloudstack-SystemVM
+        service_description  Memory
+        display_name         Memory
+        use                  Generic-Service,service-pnp
+        check_command        cs-nagios_check-memory!80!90
+        register             1
 }
 
 define service {
-        hostgroup_name                  Cloudstack-SystemVM
-        service_description             CPU
-        display_name                    CPU
-        use                             Generic-Service,service-pnp
-        check_command                   cs-nagios_check-cpu!80!90
-        register                        1
+        hostgroup_name       Cloudstack-SystemVM
+        service_description  CPU
+        display_name         CPU
+        use                  Generic-Service,service-pnp
+        check_command        cs-nagios_check-cpu!80!90
+        register             1
 }
 
 define service {
-        hostgroup_name                  Cloudstack-SystemVM
-        service_description             Network
-        display_name                    Network
-        use                             Generic-Service,service-pnp
-        check_command                   cs-nagios_check-network!80!90
-        register                        1
+        hostgroup_name       Cloudstack-SystemVM
+        service_description  Network
+        display_name         Network
+        use                  Generic-Service,service-pnp
+        check_command        cs-nagios_check-network!80!90
+        register             1
 }
 
 define service {
-        hostgroup_name                  Cloudstack-SystemVM
-        service_description             RootFS rw
-        display_name                    RootFS rw
-        use                             Generic-Service,service-pnp
-        check_command                   cs-nagios_check-rootfsrw!80!90
-        register                        1
+        hostgroup_name       Cloudstack-SystemVM
+        service_description  RootFS rw
+        display_name         RootFS rw
+        use                  Generic-Service,service-pnp
+        check_command        cs-nagios_check-rootfsrw!80!90
+        register             1
 }
 
 define service {
-        hostgroup_name                  Cloudstack-SystemVM
-        service_description             DiskUsage
-        display_name                    DiskUsage
-        use                             Generic-Service,service-pnp
-        check_command                   cs-nagios_check-diskusage!80!90
-        register                        1
+        hostgroup_name       Cloudstack-SystemVM
+        service_description  DiskUsage
+        display_name         DiskUsage
+        use                  Generic-Service,service-pnp
+        check_command        cs-nagios_check-diskusage!80!90
+        register             1
 }
-
-###############################################################################
-#
-# Service configuration file
-#
-# END OF FILE
-#
-###############################################################################

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

@@ -0,0 +1,18 @@
+
+define command {
+  command_name  cs-nagios_check-storage_pool
+  command_line  <%= bin_path -%>cs-nagios check storage_pool --pool_name $ARG3$ --over_provisioning $ARG4$ -w $ARG1$ -c $ARG2$ --config <%= config_file %>
+  register      1
+}
+
+<% storage_pools.each do |storage_pool| -%>
+define service {
+  hostgroup_name       Cloudstack
+  service_description  Cloudstack Storage Pool <%= storage_pool['zonename'] %> <%= storage_pool['name'] %>
+  display_name         Cloudstack Storage Pool <%= storage_pool['zonename'] %> <%= storage_pool['name'] %>
+  use                  Generic-Service,service-pnp
+  check_command        cs-nagios_check-storage_pool!80!90!<%= storage_pool['name'] %>!<%= over_provisioning %>
+  register             1
+}
+
+<% end -%>

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

@@ -0,0 +1,13 @@
+
+<% 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
+  check_command  check-host-alive
+  register       1
+}
+
+<% end -%>

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

@@ -0,0 +1,7 @@
+###############################################################################
+#
+#  Cloudstack - <%= config_name %>
+#
+#  END OF FILE
+#
+###############################################################################

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

@@ -0,0 +1,12 @@
+###############################################################################
+#
+#  Cloudstack - <%= config_name %>
+#
+#  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
+#
+###############################################################################

data/lib/cloudstack-nagios/version.rb

@@ -1,3 +1,3 @@
 module CloudstackNagios
-  VERSION = "0.7.8"
+  VERSION = "0.8.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack-nagios
 version: !ruby/object:Gem::Version
-  version: 0.7.8
+  version: 0.8.0
 platform: ruby
 authors:
 - Nik Wolfgramm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-06 00:00:00.000000000 Z
+date: 2014-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 10.0.4
+        version: 10.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 10.0.4
+        version: 10.1.1
 - !ruby/object:Gem::Dependency
   name: cloudstack_client
   requirement: !ruby/object:Gem::Requirement
@@ -92,14 +92,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -140,12 +140,15 @@ files:
 - lib/cloudstack-nagios/commands/snmpd_config.rb
 - lib/cloudstack-nagios/files/snmpd.conf
 - lib/cloudstack-nagios/helper.rb
-- lib/cloudstack-nagios/templates/cloudstack_api_hosts.cfg.erb
-- lib/cloudstack-nagios/templates/cloudstack_asyncjobs_services.cfg.erb
-- lib/cloudstack-nagios/templates/cloudstack_capacity_services.cfg.erb
+- lib/cloudstack-nagios/templates/cloudstack_async_jobs.cfg.erb
+- lib/cloudstack-nagios/templates/cloudstack_capacities.cfg.erb
+- lib/cloudstack-nagios/templates/cloudstack_hostgroup.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/templates/cloudstack_storage_pools.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
 - lib/cloudstack-nagios/version.rb
 - lib/cloudstack_nagios.rb
 homepage: https://github.com/swisstxt/cloudstack-nagios

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

@@ -1,39 +0,0 @@
-###############################################################################
-#
-# 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-API
-  alias           Cloudstack-API
-  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-API
-  check_command  check-host-alive
-  register       1
-}
-
-<% end -%>
-
-###############################################################################
-#
-# Host configuration file
-#
-# END OF FILE
-#
-###############################################################################

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

@@ -1,35 +0,0 @@
-###############################################################################
-#
-# Cloudstack async jobs 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
-#
-###############################################################################
-
-define command {
-        command_name                   cs-nagios_check-asyncjobs
-        command_line                   <%= bin_path -%>cs-nagios check async_jobs -w $ARG1$ -c $ARG2$ --config <%= config_file %>
-        register                       1
-}
-
-define service {
-        hostgroup_name                  Cloudstack-API
-        service_description             Cloudstack Async Jobs
-        display_name                    Cloudstack Async Jobs
-        use                             Generic-Service,service-pnp
-        check_command                   cs-nagios_check-asyncjobs!80!90
-        register                        1
-}
-
-###############################################################################
-#
-# Service configuration file
-#
-# END OF FILE
-#
-###############################################################################

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

@@ -1,38 +0,0 @@
-###############################################################################
-#
-# 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
-#
-###############################################################################
-
-define command {
-  command_name  cs-nagios_check-storage_pool
-  command_line  <%= bin_path -%>cs-nagios check storage_pool --pool_name $ARG3$ --over_provisioning $ARG4$ -w $ARG1$ -c $ARG2$ --config <%= config_file %>
-  register      1
-}
-
-<% storage_pools.each do |storage_pool| -%>
-define service {
-  hostgroup_name        Cloudstack-API
-  service_description   Cloudstack Storage Pool <%= storage_pool['name'] %>
-  display_name          Cloudstack Storage Pool <%= storage_pool['name'] %>
-  use                   Generic-Service,service-pnp
-  check_command         cs-nagios_check-storage_pool!80!90!<%= storage_pool['name'] %>!<%= over_provisioning %>
-  register              1
-}
-
-<% end -%>
-
-###############################################################################
-#
-# Service configuration file
-#
-# END OF FILE
-#
-###############################################################################