cloudstack-nagios 0.17.6 → 0.17.7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cloudstack-nagios (0.17.0)
+    cloudstack-nagios (0.17.3)
       cloudstack_client (~> 0.7, >= 0.7.1)
       erubis (~> 2.7.0)
       highline (~> 1.6.20)

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

@@ -24,15 +24,29 @@ class SystemVm < CloudstackNagios::Base
   end
 
   desc "cpu", "check memory on host"
+  option :mode,
+    desc: "average mode gives the average value over all CPU's and max the highest usage of any CPU",
+    :enum => %w(average max),
+    aliases: '-m',
+    default: 'average'
   def cpu
     begin
       host = systemvm_host
       mpstat_output = ""
       on host do |h|
-        mpstat_output = capture(:mpstat)
+        mpstat_output = capture(:mpstat, '-P ALL', '2', '2')
       end
-      values = mpstat_output.scan(/\d+\.\d+/)
-      usage = 100 - values[-1].to_f
+      # max takes the min idle value, removes zero values before
+      value = if options[:mode] == "max"
+        values = mpstat_output.each_line.to_a.slice(3..-1).map do |line, index|
+          line.scan(/\d+\.\d+/)[-1].to_f
+        end
+        values.delete(0.0)
+        values.min
+      else
+        mpstat_output.scan(/\d+\.\d+/)[-1].to_f
+      end
+      usage = 100 - value
       data = check_data(100, usage, options[:warning], options[:critical])
       puts "CPU #{RETURN_CODES[data[0]]} - usage = #{data[1]}% | usage=#{data[1]}%"
       exit data[0]

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

@@ -11,6 +11,12 @@ define command {
         register      1
 }
 
+define command {
+  command_name  cs-nagios_check-cpu-max
+  command_line  <%= bin_path -%>cs-nagios check router cpu -H $HOSTADDRESS$ --mode max -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 %> --ssh-key <%= ssh_key %> --ssh-port <%= ssh_port %> --config <%= config_file %>
@@ -65,6 +71,15 @@ define service {
         register             1
 }
 
+define service {
+  hostgroup_name       CloudstackRouter
+  service_description  Cloudstack Virtual Router Max CPU
+  display_name         Cloudstack Virtual Router Max CPU
+  use                  Generic-Service,service-pnp
+  check_command        cs-nagios_check-cpu-max!80!90
+  register             1
+}
+
 define service {
 	hostgroup_name       CloudstackRouter
         service_description  Cloudstack Virtual Router Network

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

@@ -15,7 +15,7 @@ object CheckCommand "cs-nagios_check-memory" {
 
 object CheckCommand "cs-nagios_check-cpu" {
 	import "plugin-check-command"
-        command = [ "<%= bin_path -%>cs-nagios", "check", "router", "cpu" ] 
+        command = [ "<%= bin_path -%>cs-nagios", "check", "router", "cpu" ]
 
         arguments = {
                 "-H" = "$address$"
@@ -27,6 +27,21 @@ object CheckCommand "cs-nagios_check-cpu" {
 	}
 }
 
+object CheckCommand "cs-nagios_check-cpu-max" {
+	import "plugin-check-command"
+	command = [ "<%= bin_path -%>cs-nagios", "check", "router", "cpu" ]
+
+	arguments = {
+		"-H" = "$address$"
+		"-m" = "max"
+		"-w" = "80"
+		"-c" = "90"
+		"--ssh_key" = "<%= ssh_key %>"
+		"--ssh-port" = "<%= ssh_port %>"
+		"--config" = "<%= config_file %>"
+	}
+}
+
 object CheckCommand "cs-nagios_check-network" {
 	import "plugin-check-command"
         command = [  "<%= bin_path -%>cs-nagios", "check", "router", "network"  ]
@@ -111,6 +126,12 @@ apply Service "Cloudstack Virtual Router CPU" {
 	assign where "CloudstackRouter" in host.groups
 }
 
+apply Service "Cloudstack Virtual Router Max CPU" {
+	import  "generic-service-pnp"
+	check_command  = "cs-nagios_check-cpu-max"
+	assign where "CloudstackRouter" in host.groups
+}
+
 apply Service "Cloudstack Virtual Router Network" {
 	import  "generic-service-pnp"
         check_command =  "cs-nagios_check-network"

data/lib/cloudstack-nagios/version.rb

@@ -1,3 +1,3 @@
 module CloudstackNagios
-  VERSION = "0.17.6"
+  VERSION = "0.17.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack-nagios
 version: !ruby/object:Gem::Version
-  version: 0.17.6
+  version: 0.17.7
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-17 00:00:00.000000000 Z
+date: 2015-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc