instrumental_tools 0.2.1 → 0.3.0

data/bin/instrument_server

@@ -17,6 +17,10 @@ class SystemInspector
   TYPES = [:gauges, :incrementors]
   attr_accessor *TYPES
 
+  def self.memory
+    @memory ||= Memory.new
+  end
+
   def initialize
     @gauges = {}
     @incrementors = {}
@@ -32,6 +36,8 @@ class SystemInspector
   end
 
   def load_all
+    self.class.memory.cycle
+
     load @platform.load_cpu
     load @platform.load_memory
     load @platform.load_disks
@@ -146,14 +152,23 @@ class SystemInspector
     end
 
     def self.cpu
-      cpu, user, nice, system, idle, iowait = `cat /proc/stat | grep cpu[^0-9]`.chomp.split(/\s+/)
-      total = user.to_i + system.to_i + idle.to_i + iowait.to_i
-      {
-        'cpu.user' => (user.to_f / total) * 100,
-        'cpu.system' => (system.to_f / total) * 100,
-        'cpu.idle' => (idle.to_f / total) * 100,
-        'cpu.iowait' => (iowait.to_f / total) * 100,
-      }
+      categories = [:user, :nice, :system, :idle, :iowait]
+      values = `cat /proc/stat | grep cpu[^0-9]`.chomp.split(/\s+/).slice(1, 5).map(&:to_f)
+      SystemInspector.memory.store(:cpu_values, values.dup)
+      if previous_values = SystemInspector.memory.retrieve(:cpu_values)
+        values.map!.with_index { |value, index| (previous_values[index] - value).abs }
+      end
+      data = Hash[*categories.zip(values).flatten]
+      total = values.inject { |memo, value| memo + value }
+
+      output = {}
+      if previous_values
+        data.each do |category, value|
+          output["cpu.#{category}"] = value / total * 100
+        end
+      end
+      output["cpu.in_use"] = 100 - data['idle'] / total * 100
+      output
     end
 
     def self.loadavg
@@ -240,6 +255,29 @@ class SystemInspector
       }
     end
   end
+
+  class Memory
+    attr_reader :past_values, :current_values
+
+    def initialize
+      @past_values = {}
+      @current_values = {}
+    end
+
+    def store(attribute, value)
+      @current_values[attribute] = value
+    end
+
+    def retrieve(attribute)
+      @past_values[attribute]
+    end
+
+    def cycle
+      @past_values = @current_values
+      @current_values = {}
+    end
+  end
+
 end
 
 class ServerController < Pidly::Control
@@ -311,6 +349,9 @@ options = {
 
 option_parser = OptionParser.new do |opts|
   opts.banner = "Usage: instrument_server [-k API_KEY] [options] [-d #{ServerController::COMMANDS.join('|')}]"
+  opts.on('-H', '--hostname HOSTNAME', 'Hostname to report as') do |hostname|
+    options[:hostname] = hostname
+  end
   opts.on('-k', '--api_key API_KEY', 'API key of your project') do |api_key|
     options[:api_key] = api_key
   end

data/lib/instrumental_tools/version.rb

@@ -1,5 +1,5 @@
 module Instrumental
   module Tools
-    VERSION = "0.2.1"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,10 +1,15 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: instrumental_tools
-version: !ruby/object:Gem::Version
-  version: 0.2.1
+version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: 
+  segments: 
+  - 0
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
-authors:
+authors: 
 - Elijah Miller
 - Christopher Zelenak
 - Kristopher Chambers
@@ -12,62 +17,80 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-28 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: &70269861069500 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+
+date: 2012-01-11 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   type: :runtime
-  prerelease: false
-  version_requirements: *70269861069500
-- !ruby/object:Gem::Dependency
-  name: instrumental_agent
-  requirement: &70269861068720 !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0.5'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: json
+  version_requirements: *id001
+  prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :runtime
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 0
+        - 5
+        version: "0.5"
+  name: instrumental_agent
+  version_requirements: *id002
   prerelease: false
-  version_requirements: *70269861068720
-- !ruby/object:Gem::Dependency
-  name: pidly
-  requirement: &70269861067960 !ruby/object:Gem::Requirement
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 0
+        - 1
+        - 3
         version: 0.1.3
-  type: :runtime
+  name: pidly
+  version_requirements: *id003
   prerelease: false
-  version_requirements: *70269861067960
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &70269861067240 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+- !ruby/object:Gem::Dependency 
   type: :development
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: rake
+  version_requirements: *id004
   prerelease: false
-  version_requirements: *70269861067240
 description: Tools for displaying information from and reporting to Instrumental (instrumentalapp.com)
-email:
+email: 
 - support@instrumentalapp.com
-executables:
+executables: 
 - gitstrumental
 - instrument_server
 - instrumental
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Gemfile
 - README.md
@@ -79,32 +102,36 @@ files:
 - lib/instrumental_tools/version.rb
 homepage: http://github.com/fastestforward/instrumental_tools
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: -834890611261305550
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: -834890611261305550
+      version: "0"
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Command line tools for Instrumental
 test_files: []
+