ffwd-carbon 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f25d5c10424ad9b079a9288d7505d947f8bc8e80
-  data.tar.gz: cbed15ed201791e5db9ae8791efb3cf6d1388a64
+  metadata.gz: a601a8b1217697b3383f0afc711296650e1aecfc
+  data.tar.gz: 62305d04108083f3bdf652a0dd4e6758e20e4364
 SHA512:
-  metadata.gz: 41fe8a07cbbda226712b76de2d3a26479f74fbcc3aec9a80396b26e5e1fab1db00ecdd7300ecabf09e6b7283fcbdec673048e5281859f32788dafa89e97834fa
-  data.tar.gz: 3ac83deeb8c04edc929230490d5849328b6847361b67e316d566e3de0620c7dc189e01f1a1856a0b2bfe18ba26949b79f32460128753b1070f99c6c1b963d6d9
+  metadata.gz: d8c07bb4befd1239779237e68059b279e1d2190736b2766b2fe3844bf8822c9ee25439a8caf9356be18a9e4a11cab91e35680290a91cfecac39d2e9f34255ae6
+  data.tar.gz: 5f0d89e68211ebae611246d5a68fdf11803f5327169012f9a9290078c4e59b4c2c3c8201a8ab32c01d3bcf4ec80029d08aab7f6ce9b1204147a110d942c59bbb

data/lib/ffwd/plugin/carbon.rb

@@ -27,6 +27,7 @@ module FFWD::Plugin
     DEFAULT_HOST = "localhost"
     DEFAULT_PORT = 2003
     DEFAULT_PROTOCOL = "tcp"
+    DEFAULT_KEY = "carbon"
 
     register_plugin "carbon",
       :description => "A plugin for the carbon line protocol.",
@@ -41,6 +42,12 @@ module FFWD::Plugin
           :help => [
             "Port to bind to."
           ]),
+        FFWD::Plugin.option(
+          :key, :default => DEFAULT_KEY,
+          :help => [
+            "Key to output metrics for.",
+            "All carbon paths will be added to the :what attribute."
+          ]),
       ]
 
     class InputTCP < FFWD::Plugin::Carbon::Connection
@@ -61,6 +68,7 @@ module FFWD::Plugin
       config[:host] ||= DEFAULT_HOST
       config[:port] ||= DEFAULT_PORT
       config[:protocol] ||= DEFAULT_PROTOCOL
+      config[:key] ||= DEFAULT_KEY
       protocol = FFWD.parse_protocol config[:protocol]
 
       unless connection = INPUTS[protocol.family]

data/lib/ffwd/plugin/carbon/connection.rb

@@ -23,6 +23,7 @@ module FFWD::Plugin
       def initialize bind, core, config
         @bind = bind
         @core = core
+        @key = config[:key]
       end
 
       def parse line
@@ -34,7 +35,9 @@ module FFWD::Plugin
         value = value.to_f unless value.nil?
         time = Time.at(timestamp.to_i)
 
-        return {:key => path, :value => value, :time => time}
+        a = {:what => path}
+
+        return {:key => @key, :value => value, :time => time, :attributes => a}
       end
 
       def receive_line line
@@ -44,6 +47,7 @@ module FFWD::Plugin
         @bind.increment :received_metrics
       rescue => e
         @bind.log.error "Failed to receive data", e
+        @bind.increment :failed_metrics
       end
     end
   end

data/lib/ffwd/plugin/carbon/version.rb

@@ -16,7 +16,7 @@
 module FFWD
   module Plugin
     module Carbon
-      VERSION = "0.3.4"
+      VERSION = "0.3.5"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffwd-carbon
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Martin Parm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-11 00:00:00.000000000 Z
+date: 2014-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffwd
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.3.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.3.5
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement