neutrino_client 0.0.2 → 0.0.3

data/TODO

@@ -1 +0,0 @@
-Send with httparty, not curl

data/lib/neutrino/client.rb

@@ -2,6 +2,7 @@ require 'neutrino/cli'
 require 'neutrino/config'
 require 'neutrino/log'
 require 'neutrino/metric'
+require 'neutrino/munin_metric'
 require 'neutrino/reporter'
 require 'neutrino/shell_metric'
 require 'json'

data/lib/neutrino/config.rb

@@ -14,6 +14,7 @@ module Neutrino
          end
          log_level :warn
          config_file "/etc/neutrino.rb"
+         munin_plugin_globs ""
       end
 
       Config.defaults!

data/lib/neutrino/metric.rb

@@ -24,7 +24,7 @@ module Neutrino
 
       def to_h
         {
-          :metadata => base_metadata.merge({
+          :metadata => (base_metadata || {}).merge({
             :name => self.name,
             :group => self.group,
             :type => self.type

data/lib/neutrino/munin_metric.rb

@@ -0,0 +1,60 @@
+require 'open3'
+
+module Neutrino
+  module Client
+    class MuninMetric < Metric
+      property :munin_plugin_path
+
+      def initialize(opts={})
+        super(opts)
+        configure
+        # query
+      end
+
+      def self.execute_and_parse(command)
+        output = Open3.popen3(command) do |stdin, stdout, stderr, wait_thr|
+          stdout.read.strip
+        end
+        result = {}
+        output.split("\n").each do |line|
+          whole_line, key, value = line.match(/(\S*) (.*)/).to_a
+          key_parts = key.split(/\.|_/)
+          if key_parts.length == 2
+            result[key_parts.first] ||= {}
+            result[key_parts.first][key_parts.last] = value
+          else
+            result[key_parts.first] = value
+          end
+        end
+        result
+      end
+
+      def self.configure_plugin(path)
+        self.execute_and_parse("#{path} config")
+      end
+
+      def self.query_plugin(path)
+        self.execute_and_parse(path)
+      end
+
+      def configure
+        plugin_configuration = MuninMetric.configure_plugin(self.munin_plugin_path)
+        self.base_metadata ||= {}
+        if plugin_configuration["graph"]
+          self.base_metadata["group"] = plugin_configuration["graph"]["category"]
+          self.base_metadata["type"] = plugin_configuration["graph"]["vlabel"]
+          self.base_metadata["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
+        end
+      end
+
+    end
+  end
+end

data/lib/neutrino/reporter.rb

@@ -11,7 +11,7 @@ module Neutrino
       end
 
       def self.get_metrics
-        [
+        ms = [
           ShellMetric.new({
             :name => "CPU Steal",
             :command => "iostat | grep -A1 avg-cpu | tail -1 | awk '{print $5}'",
@@ -64,6 +64,8 @@ module Neutrino
             :type => 'process'
           })
         ]
+        Dir.glob(Config.munin_plugin_globs).each{|plugin_path| ms << MuninMetric.new(:munin_plugin_path => plugin_path)}
+        ms
       end
 
       def self.report

data/lib/neutrino/version.rb

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

data/test/config_test.rb

@@ -19,6 +19,10 @@ module Neutrino
       def test_default_config_file
         assert_equal("/etc/neutrino.rb", Config.config_file)
       end
+
+      def test_default_munin_plugin_globs
+        assert_equal("", Config.munin_plugin_globs)
+      end
     end
   end
 end

data/test/munin_metric_test.rb

@@ -0,0 +1,64 @@
+require "neutrino/client"
+require "test/unit"
+require 'mocha'
+
+module Neutrino
+  module Client
+    class TestMuninMetric < Test::Unit::TestCase
+      def setup
+        Config.defaults!
+      end
+
+      def test_properties
+        path = "/path/to/plugin"
+        m = MuninMetric.new(:munin_plugin_path => path)
+        assert_equal m.munin_plugin_path, path
+      end
+
+      def test_configure_plugin
+        path = "/some_plugin"
+        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.configure_plugin(path)
+        assert_equal m.class, Hash
+        assert_not_nil m["graph"]
+        assert_equal m["graph"]["title"], "Load average"
+        assert_equal m["graph"]["args"], "--base 1000 -l 0"
+        assert_equal m["graph"]["vlabel"], "load"
+        assert_equal m["graph"]["scale"], "no"
+        assert_equal m["graph"]["category"], "system"
+        assert_not_nil m["load"]
+        assert_equal m["load"]["label"], "load"
+        assert_equal m["load"]["warning"], "10"
+        assert_equal m["load"]["critical"], "120"
+        assert_equal m["load"]["info"], "Average load for the five minutes."
+      end
+
+      def test_query_plugin
+        path = "/some_plugin"
+        Open3.expects(:popen3).with(path).returns("load.value 0.17\n")
+        m = MuninMetric.query_plugin(path)
+        assert_equal m.class, Hash
+        assert_not_nil m["load"]
+        assert_equal m["load"]["value"], "0.17"
+      end
+
+      def test_configure
+        path = "/some_plugin"
+        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"
+        assert_equal m.base_metadata["type"], "load"
+        assert_equal m.base_metadata["name"], "Load average"
+      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"
+      end
+    end
+  end
+end

data/test/reporter_test.rb

@@ -26,6 +26,14 @@ module Neutrino
         Log.expects(:warn).times(metrics.length)
         Reporter.report
       end
+
+      def test_reporter_adds_munin_plugins
+        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)
+        Config.munin_plugin_globs "/somedir/*"
+        Reporter.report
+      end
     end
   end
 end

data/test/shell_metric_test.rb

@@ -13,7 +13,7 @@ module Neutrino
         cmd = "ps aux | wc -l"
         m = ShellMetric.new(:command => cmd)
         ShellMetric.expects(:execute).with(cmd)
-        m.execute
+        m.value
       end
 
       def test_executes_command

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: neutrino_client
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Nick Stielau
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-11 00:00:00 -08:00
+date: 2011-02-14 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -168,6 +168,7 @@ files:
 - lib/neutrino/config.rb
 - lib/neutrino/log.rb
 - lib/neutrino/metric.rb
+- lib/neutrino/munin_metric.rb
 - lib/neutrino/reporter.rb
 - lib/neutrino/shell_metric.rb
 - lib/neutrino/version.rb
@@ -175,6 +176,7 @@ files:
 - test/cli_test.rb
 - test/config_test.rb
 - test/metric_test.rb
+- test/munin_metric_test.rb
 - test/reporter_test.rb
 - test/shell_metric_test.rb
 has_rdoc: true