neutrino_client 0.0.3 → 0.0.5

data/lib/neutrino/metric.rb

@@ -10,11 +10,10 @@ module Neutrino
       property :group
       property :type
       property :name
-      property :value
+      property :values
       property :display_options
 
       def metric_id
-        raise StandardError.new("Requires name and hostname") unless name && hostname
         Digest::MD5.hexdigest("#{name}#{hostname}")
       end
 
@@ -23,15 +22,19 @@ module Neutrino
       end
 
       def to_h
+        raise StandardError.new("Requires name") unless name
+        raise StandardError.new("Requires values") unless values
+        raise StandardError.new("Requires hostname") unless hostname
         {
           :metadata => (base_metadata || {}).merge({
             :name => self.name,
             :group => self.group,
-            :type => self.type
+            :type => self.type,
+            :hostname => self.hostname
           }),
           :display_options => self.display_options,
           :name => self.metric_id,
-          :value => self.value
+          :values => self.values || {}
         }
       end
     end

data/lib/neutrino/munin_metric.rb

@@ -8,7 +8,7 @@ module Neutrino
       def initialize(opts={})
         super(opts)
         configure
-        # query
+        query
       end
 
       def self.execute_and_parse(command)
@@ -16,9 +16,16 @@ module Neutrino
           stdout.read.strip
         end
         result = {}
-        output.split("\n").each do |line|
+        Log.debug("#{command} outputs #{output}")
+        output.to_s.split("\n").each do |line|
           whole_line, key, value = line.match(/(\S*) (.*)/).to_a
-          key_parts = key.split(/\.|_/)
+          key = line.strip if key.nil? # Can be nil if no value is specified
+          key_parts = nil
+          if key.match("graph_")
+            key_parts = key.split(/_/)
+          else
+            key_parts = key.split(/\./)
+          end
           if key_parts.length == 2
             result[key_parts.first] ||= {}
             result[key_parts.first][key_parts.last] = value
@@ -26,6 +33,7 @@ module Neutrino
             result[key_parts.first] = value
           end
         end
+        Log.debug("#{command} output is parsed as #{result.inspect}")
         result
       end
 
@@ -44,14 +52,22 @@ module Neutrino
           self.base_metadata["group"] = plugin_configuration["graph"]["category"]
           self.base_metadata["type"] = plugin_configuration["graph"]["vlabel"]
           self.base_metadata["name"] = plugin_configuration["graph"]["title"]
+          self.name = plugin_configuration["graph"]["title"]
         end
       end
 
       def query
         plugin_query = MuninMetric.query_plugin(self.munin_plugin_path)
         begin
-        self.value = plugin_query.to_a.first[1]["value"]
-        rescue
+          values_hash = {}
+          plugin_query.to_a.each do |metric|
+            name = metric[0]
+            val = metric[1]["value"]
+            values_hash[name] = val.nil? ? nil : val.to_f
+          end
+          self.values = values_hash
+        rescue => e
+          Log.debug("Error querying munin: #{e}")
         end
       end
 

data/lib/neutrino/reporter.rb

@@ -6,60 +6,46 @@ module Neutrino
 
       def self.record(metric)
         Log.info("Recording: #{metric.to_json}")
-        HTTParty.post('http://neutrino2.heroku.com/record', :body => metric.to_json)
-        # `curl --silent -X POST -H 'Content-Type: application/json' -d '#{metric.to_json}' http://neutrino2.heroku.com/record`
+        response = HTTParty.post('http://neutrino2.heroku.com/record', :body => metric.to_h)
+        Log.debug "Response: body=#{response.body} code=#{response.code} message=#{response.message} headers=#{response.headers.inspect}"
       end
 
       def self.get_metrics
         ms = [
-          ShellMetric.new({
-            :name => "CPU Steal",
-            :command => "iostat | grep -A1 avg-cpu | tail -1 | awk '{print $5}'",
-            :group => "system",
-            :type => "CPU"
-          }),
           ShellMetric.new({
             :name => "User CPU",
-            :command => "iostat | grep -A1 avg-cpu | tail -1 | awk '{print $1}'",
+            :commands => {:user => "iostat | grep -A1 avg-cpu | tail -1 | awk '{print $1}'"},
             :group => "system",
             :type => "CPU",
             :display_options => {:min => 0, :max => 1}
           }),
           ShellMetric.new({
             :name => "Idle CPU",
-            :command => "iostat | grep -A1 avg-cpu | tail -1 | awk '{print $6}'",
+            :commands => {:idle => "iostat | grep -A1 avg-cpu | tail -1 | awk '{print $6}'"},
             :group => "system",
             :type => "CPU",
             :display_options => {:min => 0, :max => 100}
           }),
           ShellMetric.new({
             :name => "Free Memory",
-            :command => "cat /proc/meminfo  | grep 'MemFree' | awk '{print $2}'",
+            :commands => {:free => "cat /proc/meminfo  | grep 'MemFree' | awk '{print $2}'"},
             :group => "system",
             :type => 'memory'
             # :display_options => {:min => 0, :max => ShellMetric.execute("cat /proc/meminfo  | grep 'MemTotal' | awk '{print $2}'")}
           }),
-          ShellMetric.new({
-            :name => "Load Avg (1m)",
-            :command => "cat /proc/loadavg | awk '{print $1}'",
-            :group => "system",
-            :type => 'load'
-          }),
-          ShellMetric.new({
-            :name => "Load Avg (5m)",
-            :command => "cat /proc/loadavg | awk '{print $2}'",
-            :group => "system",
-            :type => 'load'
-          }),
           ShellMetric.new({
             :name => "Load Avg (15m)",
-            :command => "cat /proc/loadavg | awk '{print $3}'",
+            :commands => {
+              "1_min" => "cat /proc/loadavg | awk '{print $1}'",
+              "5_min" => "cat /proc/loadavg | awk '{print $2}'",
+              "15_min" => "cat /proc/loadavg | awk '{print $3}'",
+            },
             :group => "system",
             :type => 'load'
           }),
           ShellMetric.new({
             :name => "Process Count",
-            :command => "ps aux | wc -l",
+            :commands => {:processes => "ps aux | wc -l"},
             :group => "system",
             :type => 'process'
           })
@@ -72,11 +58,7 @@ module Neutrino
         get_metrics.each do |m|
           m.hostname = `hostname`.strip
           m.base_metadata = Config.metadata
-          begin
-            Reporter.record(m)
-          rescue StandardError => e
-            Log.warn("Error running '#{m.name}': #{e}")
-          end
+          Reporter.record(m)
         end
       end
     end

data/lib/neutrino/shell_metric.rb

@@ -3,20 +3,28 @@ require 'open3'
 module Neutrino
   module Client
     class ShellMetric < Metric
-      property :command
+      property :commands
+
+      def initialize(opts={})
+        super(opts)
+        query
+      end
 
       def self.execute(command)
         parsed_value = Open3.popen3(command) do |stdin, stdout, stderr, wait_thr|
           stdout.read.strip
         end
-        raise StandardError.new("Could not parse a value from \"#{command}\". Got '#{parsed_value}'") if parsed_value.nil? || parsed_value == ""
+        Log.debug("'#{command}' outputs '#{parsed_value}'")
+        Log.warn("'#{command}' outputs '#{parsed_value}'") if parsed_value.nil? || parsed_value.empty?
         return parsed_value
       end
 
-      def value
-        v = ShellMetric.execute(self.command)
-        Log.debug("#{self.command} returns '#{v}'")
-        v
+      def query
+        values_hash = {}
+        self.commands.each_pair do |name, cmd|
+          values_hash[name] = ShellMetric.execute(cmd)
+        end
+        self.values = values_hash
       end
     end
   end

data/lib/neutrino/version.rb

@@ -1,5 +1,5 @@
 module Neutrino
   module Client
-    VERSION = "0.0.3"
+    VERSION = "0.0.5"
   end
 end

data/test/cli_test.rb

@@ -1,4 +1,4 @@
-require "neutrino/client"
+require "lib/neutrino/client"
 require "test/unit"
 
 module Neutrino

data/test/config_test.rb

@@ -1,4 +1,4 @@
-require "neutrino/client"
+require "lib/neutrino/client"
 require "test/unit"
 
 module Neutrino

data/test/metric_test.rb

@@ -1,4 +1,4 @@
-require "neutrino/client"
+require "lib/neutrino/client"
 require "test/unit"
 require 'mocha'
 
@@ -17,7 +17,7 @@ module Neutrino
       def test_metric_attributes
         attrs = {
           :name => "Load Avg (15m)",
-          :value => 747,
+          :values => {:myval => 747},
           :group => "system",
           :type => 'load',
           :display_options => {:width => 100}
@@ -26,7 +26,8 @@ module Neutrino
         assert_equal metric.group, attrs[:group]
         assert_equal metric.type, attrs[:type]
         assert_equal metric.name, attrs[:name]
-        assert_equal metric.value, attrs[:value]
+        assert_equal metric.values, attrs[:values]
+        assert_equal metric.values[:myval], attrs[:values][:myval]
         assert_equal metric.display_options, attrs[:display_options]
       end
 
@@ -51,16 +52,6 @@ module Neutrino
         assert_equal metric.metric_id, Digest::MD5.hexdigest("#{name}#{hostname}")
       end
 
-      def test_metric_id_raises_without_hostname
-        metric = Metric.new(:name => "a_metric")
-        assert_raises(StandardError){ metric.metric_id }
-      end
-
-      def test_metric_id_raises_without_hostname
-        metric = Metric.new(:hostname => "a_metric.com")
-        assert_raises(StandardError){ metric.metric_id }
-      end
-
       def test_to_json_calls_to_h
         metric = Metric.new(:hostname => "a_metric.com", :name => "asdf")
         metric.expects(:to_h)
@@ -70,7 +61,7 @@ module Neutrino
       def test_metric_to_h
         attrs = {
           :name => "Load Avg (15m)",
-          :value => 0.11,
+          :values => {:bval => 0.11},
           :group => "system",
           :type => 'load',
           :display_options => {:width => 100}
@@ -84,10 +75,46 @@ module Neutrino
         assert_equal result[:metadata][:name], attrs[:name]
         assert_equal result[:metadata][:group], attrs[:group]
         assert_equal result[:metadata][:type], attrs[:type]
+        assert_equal result[:metadata][:hostname], metric.hostname
         assert_equal result[:display_options], attrs[:display_options]
-        assert_equal result[:value], attrs[:value]
+        assert_equal result[:values][:bval], 0.11
         assert_equal result[:name], metric.metric_id
       end
+
+      def test_metric_to_h_raises_without_hostname
+        attrs = {
+          :name => "Load Avg (15m)",
+          :values => {:bval => 0.11},
+          :group => "system",
+          :type => 'load',
+          :display_options => {:width => 100}
+        }
+        metric = Metric.new(attrs)
+        assert_raises(StandardError){ metric.to_h }
+      end
+
+      def test_metric_to_h_raises_without_name
+        attrs = {
+          :values => {:bval => 0.11},
+          :group => "system",
+          :type => 'load',
+          :display_options => {:width => 100}
+        }
+        metric = Metric.new(attrs)
+        assert_raises(StandardError){ metric.to_h }
+      end
+
+      def test_metric_to_h_raises_without_values
+        attrs = {
+          :name => "Load Avg (15m)",
+          :group => "system",
+          :type => 'load',
+          :display_options => {:width => 100}
+        }
+        metric = Metric.new(attrs)
+        assert_raises(StandardError){ metric.to_h }
+      end
+
     end
   end
 end

data/test/munin_metric_test.rb

@@ -1,4 +1,4 @@
-require "neutrino/client"
+require "lib/neutrino/client"
 require "test/unit"
 require 'mocha'
 
@@ -11,6 +11,7 @@ module Neutrino
 
       def test_properties
         path = "/path/to/plugin"
+        Open3.stubs(:popen3)
         m = MuninMetric.new(:munin_plugin_path => path)
         assert_equal m.munin_plugin_path, path
       end
@@ -42,8 +43,9 @@ module Neutrino
         assert_equal m["load"]["value"], "0.17"
       end
 
-      def test_configure
+      def test_configuring_sets_base_metadata
         path = "/some_plugin"
+        Open3.stubs(:popen3).with("#{path}")
         Open3.expects(:popen3).with("#{path} config").returns("graph_title Load average\ngraph_args --base 1000 -l 0\ngraph_vlabel load\ngraph_scale no\ngraph_category system\nload.label load\nload.warning 10\nload.critical 120\ngraph_info The load average of the machine describes how many processes are in the run-queue (scheduled to run \"immediately\").\nload.info Average load for the five minutes.\n")
         m = MuninMetric.new(:munin_plugin_path => path)
         assert_equal m.base_metadata["group"], "system"
@@ -51,13 +53,48 @@ module Neutrino
         assert_equal m.base_metadata["name"], "Load average"
       end
 
+      def test_can_handle_memory_output
+        path = "/some_plugin"
+        output = "swap_cache.value 0\nswap.value 0\n"
+        Open3.stubs(:popen3).with("#{path} config").returns("")
+        Open3.stubs(:popen3).with("#{path}").returns(output)
+        m = MuninMetric.new(:munin_plugin_path => path)
+      end
+
+      def test_can_handle_multiple_values
+        path = "/some_plugin"
+        output = "swap_cache.value 33\nswap.value 44\n"
+        Open3.stubs(:popen3).with("#{path} config").returns("")
+        Open3.stubs(:popen3).with("#{path}").returns(output)
+        m = MuninMetric.new(:munin_plugin_path => path)
+        assert_equal m.values["swap_cache"], 33
+        assert_equal m.values["swap"], 44
+      end
+
+      def test_can_handle_no_values
+        path = "/some_plugin"
+        output = "swap_cache.value\nswap.value 44\n"
+        Open3.stubs(:popen3).with("#{path} config").returns("")
+        Open3.stubs(:popen3).with("#{path}").returns(output)
+        m = MuninMetric.new(:munin_plugin_path => path)
+        assert_equal m.values["swap_cache"], nil
+        assert m.values.keys.include? "swap_cache"
+      end
+
+      def test_instanciation_configures_and_queries
+        path = "/some_plugin"
+        Open3.stubs(:popen3).with("#{path}")
+        Open3.expects(:popen3).with("#{path} config")
+        MuninMetric.new(:munin_plugin_path => path)
+      end
+
       def test_query
         path = "/some_plugin"
         Open3.expects(:popen3).with("#{path} config").returns("")
         Open3.expects(:popen3).with(path).returns("load.value 123\n")
         m = MuninMetric.new(:munin_plugin_path => path)
-        m.query
-        assert_equal m.value, "123"
+        assert m.values.keys.include? "load"
+        assert_equal m.values["load"], 123
       end
     end
   end

data/test/reporter_test.rb

@@ -1,4 +1,4 @@
-require "neutrino/client"
+require "lib/neutrino/client"
 require "test/unit"
 require 'mocha'
 require 'fakeweb'
@@ -12,6 +12,7 @@ module Neutrino
         ShellMetric.stubs(:execute).returns(3.14159)
 
         FakeWeb.allow_net_connect = false
+        FakeWeb.register_uri(:post, %r|neutrino2\.heroku\.com/|, :body => "{ok:1}")
       end
 
       def test_reporter_should_call_record_one_per_metric
@@ -20,17 +21,11 @@ module Neutrino
         Reporter.report
       end
 
-      def test_reporter_swallows_errors_and_logs_warnings
-        Open3.stubs(:popen3).returns('')
-        metrics = Reporter.get_metrics
-        Log.expects(:warn).times(metrics.length)
-        Reporter.report
-      end
-
       def test_reporter_adds_munin_plugins
+        dummy_metric = Metric.new(:name => "a", :hostname => 'asdf', :values => {:a => 1})
         Dir.expects(:glob).with("/somedir/*").returns(["/path1", "/path2"])
-        MuninMetric.expects(:new).with(:munin_plugin_path => "/path1").returns(Metric.new)
-        MuninMetric.expects(:new).with(:munin_plugin_path => "/path2").returns(Metric.new)
+        MuninMetric.expects(:new).with(:munin_plugin_path => "/path1").returns(dummy_metric)
+        MuninMetric.expects(:new).with(:munin_plugin_path => "/path2").returns(dummy_metric)
         Config.munin_plugin_globs "/somedir/*"
         Reporter.report
       end

data/test/shell_metric_test.rb

@@ -1,4 +1,4 @@
-require "neutrino/client"
+require "lib/neutrino/client"
 require "test/unit"
 require 'mocha'
 
@@ -9,22 +9,43 @@ module Neutrino
         Config.defaults!
       end
 
+      def test_initialization_calls_query
+        ShellMetric.expects(:execute).with("somecmd").returns(100)
+        m = ShellMetric.new(:commands => {:myval => "somecmd"})
+      end
+
       def test_execute_calculates_value
         cmd = "ps aux | wc -l"
-        m = ShellMetric.new(:command => cmd)
         ShellMetric.expects(:execute).with(cmd)
-        m.value
+        m = ShellMetric.new(:commands => {:myval => cmd})
       end
 
-      def test_executes_command
+      def test_creates_values_hash
+        ShellMetric.stubs(:execute).with("somecmd").returns(100)
+        ShellMetric.stubs(:execute).with("othercmd").returns(150)
+        m = ShellMetric.new(:commands => {:myval => "somecmd", :bval => "othercmd"})
+        assert_equal m.values[:myval], 100
+        assert_equal m.values[:bval], 150
+      end
+
+      def test_reporter_logs_warnings_for_empty_output
+        cmd = "ps aux | wc -l"
+        Open3.stubs(:popen3).with(cmd).returns("")
+        Log.expects(:warn)
+        ShellMetric.execute(cmd)
+      end
+
+      def test_reporter_logs_debugs
         cmd = "ps aux | wc -l"
-        Open3.expects(:popen3).with(cmd).returns(100)
+        Open3.stubs(:popen3).with(cmd).returns("100")
+        Log.expects(:debug)
         ShellMetric.execute(cmd)
       end
 
-      def test_execute_raises_error_without_value
-        Open3.stubs(:popen3).returns('')
-        assert_raises(StandardError){ShellMetric.execute("some bogus command")}
+      def test_executes_command
+        cmd = "ps aux | wc -l"
+        Open3.expects(:popen3).with(cmd).returns("100")
+        ShellMetric.execute(cmd)
       end
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: neutrino_client
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Nick Stielau
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-14 00:00:00 -08:00
+date: 2011-02-25 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency