ffwd-collectd 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84632368983f61cbfd23176cc3a7a08698b87c2b
-  data.tar.gz: f61abdf41bef4b4da36fee81255f3f49a3a79431
+  metadata.gz: b8d614177f14e30bb8d304dceed417a525263909
+  data.tar.gz: 098d8eaa876fd78cd41a674526be5ef635cc7f41
 SHA512:
-  metadata.gz: 1585e9f8646985bb6442f8c695f3d6921a49780359abfbd56b0b529715af251e5e6914bfc2a4cc16fe26b87724278e07b3c07a4cfbb7eab340057081de1004ce
-  data.tar.gz: ab0536abd15a34ec92ce0d3ce86b45c72066e7cf15b1bb7fb005980fbd60ec96695d87bd2e19fc28e6c7dd7bd98afe964b5f328384588574f4bdaf08ba189cd4
+  metadata.gz: 8aca02b9d2d7053d2ec4199ebaeaeb0e185e01245b623cf7685f8958f1c423a8c3c35be4932376b16559cc797c3b82b41ee1a1a202b228d4faad246ba09b2dbe
+  data.tar.gz: d5231c5863a03806f9e370bca0b84d9c4aa068508ff118b0842e965fb14d1608a93e9f01916896e7d17d73fc1db603574d07383805dcfb5081653fdf0f807b07

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

@@ -24,49 +24,50 @@ module FFWD::Plugin::Collectd
       @bind = bind
       @core = core
       @types_db = TypesDB.open config[:types_db]
+      @key = config[:key]
     end
 
     def receive_data(data)
       Parser.parse(data) do |metric|
-        plugin_key = metric[:plugin]
-        type_key = metric[:type]
+        values = metric[:values]
+        time = metric[:time]
+        host = metric[:host]
+
+        attributes = {
+          "plugin" => metric[:plugin],
+          "type" => metric[:type],
+        }
 
         if instance = metric[:plugin_instance] and not instance.empty?
-          plugin_key = "#{plugin_key}-#{instance}"
+          attributes[:plugin_instance] = instance
         end
 
         if instance = metric[:type_instance] and not instance.empty?
-          type_key = "#{type_key}-#{instance}"
+          attributes[:type_instance] = instance
         end
 
-        key = "#{plugin_key}/#{type_key}"
-
-        values = metric[:values]
-
-        time = metric[:time]
-        host = metric[:host]
-
         # Just add a running integer to the end of the key, the 'correct'
         # solution would have been to read, parse and match from a types.db.
         #
         # http://collectd.org/documentation/manpages/types.db.5.shtml
         if values.size > 1
           values.each_with_index do |v, i|
-            if @types_db and name = @types_db.get_name(type_key, i)
+            if @types_db and name = @types_db.get_name(metric[:type], i)
               index_key = name
             else
               index_key = i.to_s
             end
 
             @core.input.metric(
-              :key => "#{key}_#{index_key}", :time => time, :value => v[1],
-              :host => host)
+              :key => @key, :time => time, :value => v[1],
+              :host => host, :attributes => attributes)
             @bind.increment :received_metrics
           end
         else
           v = values[0]
           @core.input.metric(
-            :key => key, :time => time, :value => v[1], :host => host)
+            :key => @key, :time => time, :value => v[1],
+            :host => host, :attributes => attributes)
           @bind.increment :received_metrics
         end
       end

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

@@ -16,7 +16,7 @@
 module FFWD
   module Plugin
     module Collectd
-      VERSION = "0.3.1"
+      VERSION = "0.3.2"
     end
   end
 end

data/lib/ffwd/plugin/collectd.rb

@@ -26,6 +26,7 @@ module FFWD::Plugin::Collectd
   DEFAULT_HOST = "localhost"
   DEFAULT_PORT = 25826
   DEFAULT_TYPES_DB = "/usr/share/collectd/types.db"
+  DEFAULT_KEY = "collectd"
 
   register_plugin "collectd",
     :description => "A plugin for the collectd binary protocol.",
@@ -65,6 +66,8 @@ module FFWD::Plugin::Collectd
     config[:port] ||= DEFAULT_PORT
     config[:types_db] ||= DEFAULT_TYPES_DB
     config[:protocol] ||= "udp"
+    config[:key] ||= DEFAULT_KEY
+
     protocol = FFWD.parse_protocol config[:protocol]
 
     unless connection = INPUTS[protocol.family]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffwd-collectd
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - John-John Tedro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-07 00:00:00.000000000 Z
+date: 2014-10-28 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.1
+        version: 0.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement