cloudstack-nagios 0.3.0 → 0.3.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cloudstack-nagios (0.2.0)
+    cloudstack-nagios (0.3.1)
       erubis (~> 2.7.0)
       highline (~> 1.6.20)
       sshkit (~> 1.1.0)

data/lib/cloudstack-nagios/cli.rb

@@ -8,8 +8,7 @@ module CloudstackNagios
     map %w(-v --version) => :version
 
     class_option :config,
-      default: File.join(Dir.home, '.cloudstack-nagios.yml'),
-      aliases: '-c',
+      default: ENV['HOME'] ? File.join(Dir.home, '.cloudstack-nagios.yml') : '',
       desc: 'location of your cloudstack-nagios configuration file'
 
     class_option :environment,

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

@@ -40,7 +40,7 @@ class Check < CloudstackNagios::Base
     free = values[2].to_i
     free_b = values[7].to_i
     data = check_data(total, free_b, options[:warning], options[:critical])
-    puts "MEMORY #{RETURN_CODES[data[0]]} - usage = #{data[1]}% | usage=#{data[1]}% total=#{total}, free=#{free}, free_wo_buffers=#{free_b}"
+    puts "MEMORY #{RETURN_CODES[data[0]]} - usage = #{data[1]}% | usage=#{data[1]}% total=#{total}M, free=#{free}M, free_wo_buffers=#{free_b}M"
     exit data[0]
   end
 
@@ -52,11 +52,13 @@ class Check < CloudstackNagios::Base
   option :warning,
       desc: 'warning level',
       type: :numeric,
-      default: 90
+      default: 90,
+      aliases: '-w'
   option :critical,
       desc: 'critical level',
       type: :numeric,
-      default: 95
+      default: 95,
+      aliases: '-c'
   option :ssh_key,
       desc: 'ssh private key to use',
       default: '/var/lib/cloud/management/.ssh/id_rsa'
@@ -65,7 +67,7 @@ class Check < CloudstackNagios::Base
       type: :numeric,
       default: 3922,
       aliases: '-p'
-  def cpu(host)
+  def cpu
     host = SSHKit::Host.new("root@#{options[:host]}")
     host.ssh_options = sshoptions(options[:ssh_key])
     host.port = options[:port]
@@ -76,7 +78,7 @@ class Check < CloudstackNagios::Base
     values = mpstat_output.scan(/\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=#{usage}"
+    puts "CPU #{RETURN_CODES[data[0]]} - usage = #{data[1]}% | usage=#{data[1]}%"
     exit data[0]
   end
 
@@ -152,17 +154,17 @@ class Check < CloudstackNagios::Base
       r2 = capture(:cat, '/sys/class/net/eth0/statistics/rx_bytes').to_f
       t2 = capture(:cat, '/sys/class/net/eth0/statistics/tx_bytes').to_f
     end
-    rbps = (r2 - r1) / 1024
-    tbps = (t2 - t1) / 1024
-    data = check_data(1048576, tbps, options[:warning], options[:critical])
-    puts "NETWORK #{RETURN_CODES[data[0]]} - usage = #{data[1]}% | rxbps=#{rbps.round(0)}, txbps=#{tbps.round(0)}"
+    rbps = (r2 - r1)
+    tbps = (t2 - t1)
+    data = check_data(1073741824, (1073741824 - rbps), options[:warning], options[:critical])
+    puts "NETWORK #{RETURN_CODES[data[0]]} - usage = #{data[1]}% | rxbps=#{rbps.round(0)}B, txbps=#{tbps.round(0)}B"
     exit data[0]
   end
 
   no_commands do
 
     def check_data(total, usage, warning, critical)
-      usage_percent = 100.0 / total * usage
+      usage_percent = 100 - 100.0 / total.to_f * usage.to_f
       code = 3
       if usage_percent < warning
         code = 0

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

@@ -3,22 +3,30 @@
 # Host configuration file
 #
 # Created by: 
-# Date:       <%= Date.new -%>
+# Date:       <%= Time.new.strftime("%d.%m.%Y %H:%M:%S") -%>
 # Version:    Nagios 3.x config file
 #
 # --- DO NOT EDIT THIS FILE BY HAND ---
 # cloudstack-cli 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'] -%>
 define host {
-        host_name                       <%= router['name'] %>
-        display_name                    <%= router['name'] %> <%= " - #{router['project']}" if router['project'] %>
-        address                         <%= router['linklocalip'] %>
-        hostgroups                      Cloudstack-SystemVM
-        check_command                   check-host-alive
-        register                        1
+        host_name                     <%= router['name'] %>
+        display_name                  <%= router['name'] %> (<%= <%= router['linklocalip'] %>)<%= " - #{router['project']}" if router['project'] %><%= " - #{router['zonename'] %>
+        address                       <%= router['linklocalip'] %>
+        use			      Linux-Host,host-pnp
+        hostgroups                    Cloudstack-SystemVM
+        check_command                 check-host-alive
+        register                      1
 }
   <% end -%>
 <% end -%>

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

@@ -4,7 +4,7 @@
 # Host configuration file
 #
 # Created by: 
-# Date:       <%= Date.new %>
+# Date:       <%= Time.new.strftime("%d.%m.%Y %H:%M:%S") -%>
 # Version:    Nagios 3.x config file
 #
 # --- DO NOT EDIT THIS FILE BY HAND ---
@@ -14,7 +14,25 @@
 
 define command {
         command_name                   cs-nagios_check-memory
-        command_line                   cs-nagios check memory -H $HOSTADDRESS$ -w $ARG1$ -c $ARG$
+        command_line                   /usr/local/bin/cs-nagios check memory -H $HOSTADDRESS$ -w $ARG1$ -c $ARG2$ --config /var/icinga/.cloudstack-nagios.yml
+        register                       1
+}
+
+define command {
+        command_name                   cs-nagios_check-cpu
+        command_line                   /usr/local/bin/cs-nagios check cpu -H $HOSTADDRESS$ -w $ARG1$ -c $ARG2$ --config /var/icinga/.cloudstack-nagios.yml
+        register                       1
+}
+
+define command {
+        command_name                   cs-nagios_check-network
+        command_line                   /usr/local/bin/cs-nagios check network -H $HOSTADDRESS$ -w $ARG1$ -c $ARG2$ --config /var/icinga/.cloudstack-nagios.yml
+        register                       1
+}
+
+define command {
+        command_name                   cs-nagios_check-rootfsrw
+        command_line                   /usr/local/bin/cs-nagios check rootfs_rw -H $HOSTADDRESS$ -w $ARG1$ -c $ARG2$ --config /var/icinga/.cloudstack-nagios.yml
         register                       1
 }
 
@@ -22,12 +40,38 @@ define service {
         hostgroup_name                  Cloudstack-SystemVM
         service_description             Memory
         display_name                    Memory
-        servicegroups                   Cloudstack-SystemVM
         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
+}
+
+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
+}
+
+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
+}
+
 ###############################################################################
 #
 # Host configuration file
@@ -35,4 +79,3 @@ define service {
 # END OF FILE
 #
 ###############################################################################
-

data/lib/cloudstack-nagios/version.rb

@@ -1,3 +1,3 @@
 module CloudstackNagios
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack-nagios
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors: