cloudstack-nagios 0.19.0 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: efe4c4038a1f73e7b1e6f2717eaf4ae88ce1d1d4
-  data.tar.gz: 921ca41d297b792c211a9147d72ce62c048c0beb
+SHA256:
+  metadata.gz: f03c854dd36d988f49eb2e15c46a9d7af77a6e0abcdc6dca394dd140aba12480
+  data.tar.gz: aed691232267d72fb6d736b2871fbdb731ebd48acc970ba5d1f9daa0d7ce7049
 SHA512:
-  metadata.gz: 53b5d45771194b938d598f48dfd9da9fd223be7b43cf2607e1fcd51c3bbc491652388a3ce034ebf216d085030fdcb028593f25c771f8498d3cd76fd5512e9204
-  data.tar.gz: 8a2aa486abf30158c47b6f4c7aed53071b1ebe0db4bbc17d0719260e18a65cfee7e1a934cddedf2e628a40232e3b673d3b5a3f7d9d47733a72ad2ff789d7ef79
+  metadata.gz: f50d68d66ed14bdec6de230466d18981a8e8cd9eaa667f28b43739a83b9694ffb2de478b1b331c854589bf5b0c83fe222e14612476cfc35d44e4e4e74dd04320
+  data.tar.gz: ca0a25aca1857dd7fbb042842395bfb5eb18e836fdb13e951b3c73e62825a0cc3b9b985e9a89cf61a9000d8da7e773cd49f8ee34ce33a6b67211b293a3d8bebb

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cloudstack-nagios (0.19.0)
+    cloudstack-nagios (0.20.0)
       cloudstack_client (~> 1.5)
       erubis (~> 2.7)
       highline (~> 1.7)
@@ -11,14 +11,14 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    cloudstack_client (1.5.3)
+    cloudstack_client (1.5.4)
     erubis (2.7.0)
-    highline (1.7.8)
+    highline (1.7.10)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-ssh (4.1.0)
-    rake (12.0.0)
-    rdoc (5.1.0)
+    net-ssh (5.0.2)
+    rake (12.3.1)
+    rdoc (6.0.4)
     sshkit (1.14.0)
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
@@ -33,4 +33,4 @@ DEPENDENCIES
   rdoc
 
 BUNDLED WITH
-   1.13.7
+   1.16.1

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

@@ -9,12 +9,12 @@ class SystemVm < CloudstackNagios::Base
       host = systemvm_host
       free_output = ""
       on host do |h|
-        free_output = capture(:free)
+        free_output = capture(:cat, '/proc/meminfo')
       end
       values = free_output.scan(/\d+/)
       total = values[0].to_i
-      free = values[2].to_i
-      free_b = values[7].to_i
+      free = values[1].to_i
+      free_b = values[1].to_i + values[3].to_i + values[4].to_i
       data = check_data(total, total - free_b, options[:warning], options[:critical])
       puts "MEMORY #{RETURN_CODES[data[0]]} - usage = #{data[1]}% (#{((total - free_b)/1024.0).round(0)}/#{(total/1024.0).round(0)}MB) | \
             usage=#{data[1]}% total=#{total}M free=#{free}M free_wo_buffers=#{free_b}M".gsub(/\s+/, " ")
@@ -180,6 +180,30 @@ class SystemVm < CloudstackNagios::Base
     end
   end
 
+  desc "uptime", "return uptime"
+  def uptime
+    begin
+	  host = systemvm_host
+	  uptime_sec = 0
+      on host do |h|
+        uptime_sec = capture('cat /proc/uptime').split[0].to_f
+	  end
+
+	  if uptime_sec < options[:critical]
+	    code = 2
+      elsif uptime_sec <  options[:warning]
+		code = 1
+	  else
+        code = 0
+	  end
+
+	  puts "UPTIME #{RETURN_CODES[code]} #{uptime_sec}s | uptime=#{uptime_sec}"
+	  exit code
+	rescue => e
+	  exit_with_failure(e)
+	end
+  end
+
   desc "active_ftp", "make sure conntrack_ftp and nf_nat_ftp modules are loaded"
   def active_ftp
     begin

data/lib/cloudstack-nagios/version.rb

@@ -1,3 +1,3 @@
 module CloudstackNagios
-  VERSION = "0.19.0"
+  VERSION = "0.20.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack-nagios
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.20.0
 platform: ruby
 authors:
 - Nik Wolfgramm
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-14 00:00:00.000000000 Z
+date: 2018-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -190,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: cloudstack-nagios CloudStack monitoring tools for nagios