monitoring-client 0.2.1 → 0.2.2

data/Gemfile.lock

@@ -1,16 +1,26 @@
 PATH
   remote: .
   specs:
-    monitoring (0.0.1)
+    monitoring-client (0.2.1)
       json
 
 GEM
   remote: http://rubygems.org/
   specs:
+    diff-lcs (1.1.2)
     json (1.5.1)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.0)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  monitoring!
+  monitoring-client!
+  rspec

data/Rakefile

@@ -1,2 +1,8 @@
 require 'bundler'
 Bundler::GemHelper.install_tasks
+
+require 'rspec/core/rake_task'
+desc "Run specs"
+RSpec::Core::RakeTask.new do |t|
+  t.rspec_opts = %w(-fs --color)
+end

data/bin/monitoringd

@@ -110,7 +110,8 @@ module Monitoring
         post_samples(uri, samples_to_post) unless samples_to_post.empty?
         Kernel.sleep(@sleep_period)
       end
-      #server.join()
+
+      server.join()
     end
 
     def daemonize()
@@ -146,7 +147,7 @@ module Monitoring
           JSON.parse(line).each do |sample|
             @samples.push(sample)
           end
-        rescue Exception => e;
+        rescue StandardError => e
           STDOUT.puts("Could not parse " + line.inspect()) rescue nil
           STDERR.puts([[e.class.name, e.message].join(": "),
                        e.backtrace.join("\n")].join("\n")) rescue nil
@@ -162,8 +163,8 @@ module Monitoring
       STDOUT.puts("Could not post sample (will requeue): " + samples.inspect()) rescue nil
       STDERR.puts([[e.class.name, e.message].join(": "),
                    e.backtrace.join("\n")].join("\n")) rescue nil
-      samples.each do |s| @samples.push(s) end
-    rescue Exception => e
+      samples.each { |s| @samples.push(s) }
+    rescue StandardError => e
       STDOUT.puts("Could not post sample (will not requeue): " + samples.inspect()) rescue nil
       STDERR.puts([[e.class.name, e.message].join(": "),
                    e.backtrace.join("\n")].join("\n")) rescue nil

data/lib/monitoring/client/compiler.rb

@@ -0,0 +1,26 @@
+module Monitoring
+  module Client
+    class Compiler
+
+      class << self
+
+        def compile(profiler, routine)
+          decorations = profiler.decorations.reject { |k, v| v.nil? }
+          now = Time.now()
+          routine.metrics.inject([]) do |compilation, metric_tuple|
+            metric_name, metric = metric_tuple
+            compilation.push({
+                               "program_name" => profiler.program_name,
+                               "routine_name" => routine.name,
+                               "metric_name" => metric_name,
+                               "metric_units" => metric.units,
+                               "sample_value" => metric.value,
+                               "sampled_at" => now,
+                               "decorations" => decorations,
+                             })
+          end
+        end
+      end
+    end
+  end
+end

data/lib/monitoring/client/config.rb

@@ -0,0 +1,41 @@
+module Monitoring
+  module Client
+    class Config
+
+      require "yaml"
+
+      class << self
+
+        def global
+          @@global ||= Config.new
+        end
+      end
+
+      DEFAULT_FILENAME = "/usr/local/etc/monitoring-client.yml"
+      
+      attr_accessor :hostname, :hostgroup
+      
+      def initialize
+        self.hostname = get_hostname
+        self.hostgroup = nil
+        load()
+      end
+
+
+      def load(filename = DEFAULT_FILENAME)
+        c = YAML.load_file(filename)
+        self.hostname = c[:hostname]
+        self.hostgroup = c[:hostgroup]
+        self
+      rescue Errno::ENOENT => e
+        # Squelch missing file if default
+        raise(e) unless filename == DEFAULT_FILENAME
+      end
+
+      def get_hostname
+        %x(hostname).strip
+      end
+      
+    end
+  end
+end

data/lib/monitoring/client/profiler.rb

@@ -4,20 +4,42 @@ module Monitoring
 
       require "json"
       require "socket"
+      require "monitoring/client/config"
+      require "monitoring/client/compiler"
       require "monitoring/client/routine"
-      
 
-      def initialize(program_name)
-        @program_name = program_name
+      attr_accessor :config, :program_name, :decorations
+      
+      def initialize(program_name, decorations = {})
+        self.config = Config.global
+        self.program_name = program_name
+        self.decorations = default_decorations.merge(decorations)
       end
 
 
       def routine(routine_name)
         routine = Routine.new(routine_name)
         yield(routine)
-        UDPSocket.new().send(routine.compile(@program_name).to_json + "\n",
+        compiled = compile(routine)
+        post_metrics(compiled)
+        routine
+      end
+
+      def compile(routine)
+        Compiler.compile(self, routine)
+      end
+
+      def post_metrics(compiled)
+        UDPSocket.new().send(compiled.to_json + "\n",
                              0, "localhost", 57475)
       end
+
+      def default_decorations
+        {
+          :hostname => config.hostname,
+          :hostgroup => config.hostgroup,
+        }
+      end
       
     end
   end

data/lib/monitoring/client/routine.rb

@@ -4,9 +4,10 @@ module Monitoring
 
       require "monitoring/client/metric"
 
+      attr_reader :name, :metrics
       
-      def initialize(routine_name)
-        @routine_name = routine_name
+      def initialize(name)
+        @name = name
         @metrics = Hash.new do |h, k| h[k] = Metric.new(k) end
       end
 
@@ -18,25 +19,10 @@ module Monitoring
         @metrics[metric_name].units = "s"
       end
       
-      def count(metric_name, increment_by, units = nil)
+      def count(metric_name, increment_by = 1, units = nil)
         @metrics[metric_name].value = (@metrics[metric_name].value || 0) + increment_by
         @metrics[metric_name].units = units
-      end
-
-      def compile(program_name)
-        @metrics.inject([]) do |compilation, metric_tuple|
-          metric_name, metric = metric_tuple
-          compilation.push({
-                             "program_name" => program_name,
-                             "routine_name" => @routine_name,
-                             "metric_name" => metric_name,
-                             "metric_units" => metric.units,
-                             "sample_value" => metric.value,
-                             "sampled_at" => Time.now(),
-                           })
-        end
-      end
-      
+      end      
     end
   end
 end

data/lib/monitoring/client/version.rb

@@ -1,5 +1,5 @@
 module Monitoring
   module Client
-    VERSION = "0.2.1"
+    VERSION = "0.2.2"
   end
 end

data/monitoring-client.gemspec

@@ -20,4 +20,5 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   
   s.add_runtime_dependency "json"
+  s.add_development_dependency "rspec"
 end

data/spec/compiler_spec.rb

@@ -0,0 +1,70 @@
+require "spec_helper"
+
+require "monitoring/client/profiler"
+
+module Monitoring::Client
+  describe Compiler do
+
+    def mk_metrics(n)
+      metrics = {}
+      n.times do |i|
+        name = "metric-#{i+1}"
+        metric = double(name)
+        metric.stub(:value).
+          and_return(i+1)
+        metric.stub(:units).
+          and_return("units-#{i+1}")
+        metrics[name] = metric
+      end
+      metrics
+    end
+    
+    it "should compile properly" do
+      profiler = double("profiler")
+      profiler.stub(:name).
+        and_return("sample-profiler")
+      profiler.stub(:decorations).
+        and_return({:foo => :bar})
+      routine = double("routine")
+      routine.stub(:name).
+        and_return("sample-routine")
+      routine.stub(:metrics).
+        and_return(mk_metrics(3))
+
+      now = Time.now
+      Time.stub(:now).
+        and_return(now)
+      
+      expected = [
+                  {
+                    "program_name" => "sample-profiler",
+                    "routine_name" => "sample-routine",
+                    "metric_name" => "metric-1",
+                    "metric_units" => "units-1",
+                    "sample_value" => 1,
+                    "sampled_at" => now,
+                    "decorations" => {:foo => :bar},
+                  },
+                  {
+                    "program_name" => "sample-profiler",
+                    "routine_name" => "sample-routine",
+                    "metric_name" => "metric-2",
+                    "metric_units" => "units-2",
+                    "sample_value" => 2,
+                    "sampled_at" => now,
+                    "decorations" => {:foo => :bar},
+                  },
+                  {
+                    "program_name" => "sample-profiler",
+                    "routine_name" => "sample-routine",
+                    "metric_name" => "metric-3",
+                    "metric_units" => "units-3",
+                    "sample_value" => 3,
+                    "sampled_at" => now,
+                    "decorations" => {:foo => :bar},
+                  },
+                 ]
+      Compiler.compile(profiler, routine).should eq(expected)
+    end
+  end
+end

data/spec/config_spec.rb

@@ -0,0 +1,12 @@
+require "spec_helper"
+
+require "monitoring/client/config"
+
+module Monitoring::Client
+  describe Config do
+
+    it "should load the hostname" do
+      Config.global.hostname.should == %x(hostname).strip
+    end
+  end
+end

data/spec/profiler_spec.rb

@@ -0,0 +1,31 @@
+require "spec_helper"
+
+require "monitoring/client/profiler"
+
+module Monitoring::Client
+  describe Profiler do
+
+    it "should post metrics" do
+      p = Profiler.new("program_name")
+      p.decorations.should be_a Hash
+      p.decorations.should include :hostname
+      routine = double("routine")
+      Routine.stub(:new).
+        and_return(routine)
+      compiled_routine = double("compiled_routine")
+      p.should_receive(:compile).
+        with(routine).
+        and_return(compiled_routine)
+      p.should_receive(:post_metrics).
+        with(compiled_routine).
+        and_return(true)
+      p.routine("routine_name") {}
+    end
+
+    it "should decorate with the hostname" do
+      p = Profiler.new("program_name")
+      p.decorations.should include(:hostname)
+      p.decorations[:hostname].should eq(Config.global.hostname)
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: monitoring-client
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Marc Bowes
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-13 00:00:00 +02:00
+date: 2011-08-27 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,6 +32,20 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
 description: Ruby client which uses UDP to communicate with a daemon which uses HTTP POST to communicate with a Web server
 email: 
 - marcbowes+monitoring+client@gmail.com
@@ -48,11 +62,17 @@ files:
 - Rakefile
 - bin/monitoringd
 - lib/monitoring.rb
+- lib/monitoring/client/compiler.rb
+- lib/monitoring/client/config.rb
 - lib/monitoring/client/metric.rb
 - lib/monitoring/client/profiler.rb
 - lib/monitoring/client/routine.rb
 - lib/monitoring/client/version.rb
 - monitoring-client.gemspec
+- spec/compiler_spec.rb
+- spec/config_spec.rb
+- spec/profiler_spec.rb
+- spec/spec_helper.rb
 has_rdoc: true
 homepage: http://rubygems.org/gems/monitoring-client
 licenses: []
@@ -83,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: monitoring-client
-rubygems_version: 1.5.0
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Simple client & daemon to post metrics