recognizer 0.0.7 → 0.0.8

data/README.org

@@ -5,7 +5,7 @@
 * Install
   : gem install recognizer
 * Configure
-  Example: config.json
+  Example: =config.json=
   : {
   :   "librato": {
   :     "email": "email@example.com",
@@ -14,13 +14,29 @@
   :   },
   :   "amqp": {
   :     "host": "hostname",
-  :     "pass": "password",
-  :     "user": "username"
+  :     "user": "username",
+  :     "pass": "password"
   :   }
   : }
 * Usage
   : Usage: recognizer (options)
   :  -c, --config CONFIG              The config file path
   :  -h, --help                       Show this message
+* More
+  Example metric path: =production.i-424242.cpu.user=
+
+  Get the source from the metric path using a regular expression
+  : {
+  :   "librato": {
+  :     "source": "/i-.*/"
+  Or using an index
+  : {
+  :   "librato": {
+  :     "source": 1
+  Or define a static source
+  : {
+  :   "librato": {
+  :     "source": "custom"
+  By default, Recognizer uses the source: =recognizer=
 * License
   Recognizer is released under the [[https://github.com/portertech/recognizer/raw/master/MIT-LICENSE.txt][MIT license]].

data/lib/recognizer/amqp.rb

@@ -8,25 +8,37 @@ module Recognizer
       unless thread_queue && options.is_a?(Hash)
         raise "You must provide a thread queue and options"
       end
-      amqp = Bunny.new(options[:amqp])
+
+      options[:amqp]            ||= Hash.new
+      options[:amqp][:exchange] ||= Hash.new
+
+      exchange_name = options[:amqp][:exchange][:name]        || "graphite"
+      durable       = options[:amqp][:exchange][:durable]     || false
+      routing_key   = options[:amqp][:exchange][:routing_key] || "#"
+      exchange_type = options[:amqp][:exchange][:type]        || :topic
+
+      amqp = Bunny.new(options[:amqp].reject { |key, value| key == :exchange })
       amqp.start
+
+      exchange = amqp.exchange(exchange_name, :type => exchange_type.to_sym, :durable => durable)
       queue = amqp.queue("recognizer")
-      exchange = amqp.exchange("graphite", :type => :topic, :durable => true)
-      queue.bind(exchange, :key => "*")
+      queue.bind(exchange, :key => routing_key)
+
       Thread.abort_on_exception = true
+
       consumer = Thread.new do
         puts "Awaiting the metrics with impatience ..."
         queue.subscribe do |message|
-          payload = message[:payload]
-          routing_key = message[:routing_key]
+          payload         = message[:payload]
+          msg_routing_key = message[:routing_key] || message[:delivery_details][:routing_key]
           lines = payload.split("\n")
           lines.each do |line|
             line = line.strip
-            case line.split(" ").count
+            case line.split("\s").count
             when 3
               thread_queue.push(line)
             when 2
-              thread_queue.push("#{routing_key} #{line}")
+              thread_queue.push("#{msg_routing_key} #{line}")
             end
           end
         end

data/lib/recognizer/librato.rb

@@ -13,14 +13,17 @@ module Recognizer
       unless options[:librato][:email] && options[:librato][:api_key]
         raise "You must provide a Librato Metrics account email and API key"
       end
+
       ::Librato::Metrics.authenticate(options[:librato][:email], options[:librato][:api_key])
       librato = ::Librato::Metrics::Queue.new
+
       mutex = Mutex.new
       Thread.abort_on_exception = true
+
       Thread.new do
         loop do
           sleep(options[:librato][:flush_interval] || 10)
-          unless librato.queued.empty?
+          unless librato.empty?
             puts "Attempting to flush metrics to Librato"
             mutex.synchronize do
               librato.submit
@@ -29,17 +32,35 @@ module Recognizer
           end
         end
       end
+
+      get_source = case options[:librato][:source]
+      when String
+        if options[:librato][:source].match("^/.*/$")
+          @source_pattern = Regexp.new(options[:librato][:source].delete("/"))
+          Proc.new { |path| (matched = path.grep(@source_pattern).first) ? matched : "recognizer" }
+        else
+          Proc.new { options[:librato][:source] }
+        end
+      when Integer
+        Proc.new { |path| path.slice(options[:librato][:source]) }
+      else
+        Proc.new { "recognizer" }
+      end
+
       Thread.new do
         loop do
           graphite_formated = thread_queue.pop
           begin
-            metric, value, timestamp = graphite_formated.split(" ").inject([]) do |result, part|
-              result << (result.empty? ? part.to_sym : Float(part).pretty)
+            path, value, timestamp = graphite_formated.split(" ").inject([]) do |result, part|
+              result << (result.empty? ? part.split(".") : Float(part).pretty)
               result
             end
-            puts "Adding metric to queue: #{graphite_formated}"
+            source = get_source.call(path)
+            path.delete(source)
+            metric = {path.join(".") => {:value => value, :measure_time => timestamp, :source => source}}
             mutex.synchronize do
-              librato.add(metric => {:value => value, :measure_time => timestamp, :source => "recognizer"})
+              puts "Adding metric to queue: #{metric.inspect}"
+              librato.add(metric)
             end
           rescue ArgumentError
             puts "Invalid metric: #{graphite_formated}"

data/lib/recognizer/version.rb

@@ -1,3 +1,3 @@
 module Recognizer
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/recognizer.gemspec

@@ -17,8 +17,8 @@ Gem::Specification.new do |s|
   s.executables   = Dir.glob("bin/**/*").map { |file| File.basename(file) }
   s.require_paths = ["lib"]
 
-  s.add_dependency("librato-metrics", "0.2.3")
-  s.add_dependency("bunny", "0.7.8")
+  s.add_dependency("librato-metrics", "0.3.1")
+  s.add_dependency("bunny", "0.7.9")
   s.add_dependency("mixlib-cli", ">= 1.1.0")
   s.add_dependency("json")
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: recognizer
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Sean Porter
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-10 00:00:00 -08:00
+date: 2012-02-24 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,9 +29,9 @@ dependencies:
         hash: 17
         segments: 
         - 0
-        - 2
         - 3
-        version: 0.2.3
+        - 1
+        version: 0.3.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -42,12 +42,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 17
         segments: 
         - 0
         - 7
-        - 8
-        version: 0.7.8
+        - 9
+        version: 0.7.9
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency