slashport 0.15.10 → 0.15.12

data/app/models/components/linuxhost.rb

@@ -114,9 +114,9 @@ class SlashPort::Component
       loads = %x{uptime}.chomp.delete(",").split(/ +/)[-3..-1].map { |x| x.to_f }
       _reapchild
       load1, load5, load15 = loads
-      tuple.data["load-1min"] = load1
-      tuple.data["load-5min"] = load5
-      tuple.data["load-15min"] = load15
+      tuple.data["load_1min"] = load1
+      tuple.data["load_5min"] = load5
+      tuple.data["load_15min"] = load15
 
       data << tuple
       return data

data/app/models/components/linuxprocess.rb

@@ -16,12 +16,15 @@ class SlashPort::Component::LinuxProcess < SlashPort::Component
     procinfo = ProcessInfo.new(pid)
     limits = procinfo.get_limits
     tuple = SlashPort::Tuple.new
-    puts limits.inspect
-    tuple.data["max_open_files"] = limits["open files"]
-    tuple.data["open_files"] = procinfo.open_files
+    tuple.data["open_files_max"] = limits["open files"].to_f
+    tuple.data["open_files_used"] = procinfo.open_files.to_f
+    if limits["open files"] == "unlimited"
+      tuple.data["open_files_percent"] = 0.0
+    else
+      tuple.data["open_files_percent"] = procinfo.open_files / limits["open files"].to_f
+    end
     return tuple
   end
-
 end # class SlashPort::Component
 
 

data/app/models/components/mysql.rb

@@ -7,11 +7,11 @@ class SlashPort::Component
     attr_accessor :user
     attr_accessor :password
 
-    attribute :name => "master-status",
+    attribute :name => "master_status",
               :handler => :MasterStatus,
               :doc => "Shows the master status of this mysql server"
 
-    attribute :name => "slave-status",
+    attribute :name => "slave_status",
               :handler => :SlaveStatus,
               :doc => "Shows the slave status of this mysql server"
 
@@ -23,10 +23,6 @@ class SlashPort::Component
               :handler => :MysqlOK,
               :doc => "Reports whether we can send queries successfully to mysql."
 
-    #multiconfig "settings", :ConfigGetVariables, <<-doc
-      #Output of 'show variables'
-    #doc
-
     def initialize
       super
       begin
@@ -71,7 +67,7 @@ class SlashPort::Component
         ret = Hash.new
         if result == nil
           # this host is not a slave
-          tuple.data["is-slave"] = false
+          tuple.data["is_slave"] = false
         else
           result.each do |key, val|
             tuple.data[key.to_s.downcase] = val

data/bin/slashportfetch

@@ -28,12 +28,7 @@ parser = OptionParser.new do |opts|
   end
 
   opts.on("-i FILTER", "--ignore FILTER", "Ignore things matching a check") do |v|
-    check = SlashPort::Check.new_from_string(v)
-    if check == nil
-      puts "Invalid check #{v}"
-      exit 1
-    end
-    ignores << check
+    ignores << v
   end
   
   opts.on("-h HOST[:PORT]", "--host HOST[:PORT]", "Host to query") do |v|
@@ -44,12 +39,7 @@ parser = OptionParser.new do |opts|
   end
 
   opts.on("-c CHECK", "--check CHECK", "Output if CHECK succeeds") do |v|
-    check = SlashPort::Check.new_from_string(v)
-    if check == nil
-      puts "Invalid check #{v}"
-      exit 1
-    end
-    checks << check
+    checks << v
   end
 
   opts.on("-r", "--empty-results-is-ok",
@@ -73,9 +63,21 @@ end
 
 matches = 0
 entries = 0
+
+# monkeypatch OpenStruct so we can use it for a weak 
+# variable storage for the filters and checks.
+class OpenStruct
+  def get_binding
+    return binding
+  end
+end
+
 fetcher.fetch.each do |entry|
-  # Skip if this entry matches any ignores
-  next if ignores.select { |check| check.match?(entry) }.length > 0
+  # Convert entry to an openstruct
+  data = OpenStruct.new(entry["labels"].merge(entry["data"]))
+
+  # skip if any ignores evaluate to true
+  next if ignores.select { |code| eval code, data.get_binding }.length > 0
   entries += 1
 
   if checks.length == 0
@@ -83,9 +85,9 @@ fetcher.fetch.each do |entry|
     matches += 1
   end
 
-  checks.each do |check|
-    if check.match?(entry)
-      puts "#{check} matches #{entry.inspect}"
+  checks.each do |code|
+    if eval(code, data.get_binding)
+      puts "#{code.inspect} matched: #{entry.inspect}"
       exitcode = CRITICAL
       matches += 1
     end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: slashport
 version: !ruby/object:Gem::Version 
-  version: 0.15.10
+  prerelease: false
+  segments: 
+  - 0
+  - 15
+  - 12
+  version: 0.15.12
 platform: ruby
 authors: 
 - Jordan Sissel
@@ -9,49 +14,65 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-12 00:00:00 -08:00
+date: 2010-07-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: merb-core
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 12
         version: 1.0.12
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: mongrel
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 1
+        - 5
         version: 1.1.5
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: sequel
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 5
+        - 0
         version: 3.5.0
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: mysql
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 8
+        - 1
         version: 2.8.1
-    version: 
+  type: :runtime
+  version_requirements: *id004
 description: slashport
 email: jls@semicomplete.com
 executables: 
@@ -137,18 +158,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: slashport