ffwd-collectd 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac5bc3ee635e6c6924eef53bb428d0c248d5afb6
-  data.tar.gz: 9e721848dd0815e90996d6464937901eab88a479
+  metadata.gz: e49679083351f91e41dbd8633d41113e8382c16e
+  data.tar.gz: b4834244fb558ce61ac5c93b4d425a85cc083edd
 SHA512:
-  metadata.gz: dca260d6792e3577144bdf6c43776cbb7b32fa8cc345b0f281c63a7b0abf89c97477ae7e93905ca85ba00d8cab6cb89a0b1794ecab01d7f1fa4978089ff33a18
-  data.tar.gz: 46e0048352da4bdca94456d036e8e8bc5abe2b6253865e1e6bd2ca2303d22d04d78f3720886b177add55994539f2db9f38a528ef36f9cc10e1ce2f838d497e04
+  metadata.gz: 5c621d6753759e53c1a4ea5c7532a02a1c3e6fdf86db8c4f103e39088aa291db72e04825ba131bfd35d29660a0242e8db6d01a3eca70a27707bfa404cdd62b7c
+  data.tar.gz: 39e84c1eea1d1c2168a6eb3375fb1708c944d32c8ed4b7301f06f13ab59a30037499b7fc99ea32652eca27ed7bdf324c2ce57fe0f55973be863e816a5cbb6c30

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

@@ -23,56 +23,87 @@ module FFWD::Plugin::Collectd
     def initialize bind, core, config
       @bind = bind
       @core = core
-      @types_db = TypesDB.open config[:types_db]
+      @db = TypesDB.open config[:types_db]
       @key = config[:key]
     end
 
     def receive_data(data)
-      Parser.parse(data) do |metric|
-        values = metric[:values]
-        time = metric[:time]
-        host = metric[:host]
+      Parser.parse(data) do |m|
+        plugin = m[:plugin]
+        type = m[:type]
+        plugin_i = m[:plugin_instance]
+        type_i = m[:type_instance]
 
-        attributes = {
-          "plugin" => metric[:plugin],
-          "type" => metric[:type],
-        }
-
-        if instance = metric[:plugin_instance] and not instance.empty?
-          attributes[:plugin_instance] = instance
-        end
-
-        if instance = metric[:type_instance] and not instance.empty?
-          attributes[:type_instance] = instance
-        end
-
-        # 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(metric[:type], i)
-              index_key = name
-            else
-              index_key = i.to_s
-            end
-
-            @core.input.metric(
-              :key => @key, :time => time, :value => v[1],
-              :host => host, :attributes => attributes)
-            @bind.increment :received_metrics
-          end
-        else
-          v = values[0]
+        read_values(plugin, plugin_i, type, type_i, m[:values]) do |a, v|
           @core.input.metric(
-            :key => @key, :time => time, :value => v[1],
-            :host => host, :attributes => attributes)
+            :key => @key, :time => m[:time], :value => v,
+            :host => m[:host], :attributes => a)
           @bind.increment :received_metrics
         end
       end
     rescue => e
       @bind.log.error "Failed to receive data", e
     end
+
+    def read_values(plugin, plugin_i, type, type_i, values, &block)
+      if values.size == 1
+        return read_single(plugin, plugin_i, type, type_i, values[0], &block)
+      end
+
+      read_multiple(plugin, plugin_i, type, type_i, values, &block)
+    end
+
+    def read_single(plugin, plugin_i, type, type_i, v)
+      a = {:plugin => plugin, :type => type}
+      a[:plugin_instance] = plugin_i unless plugin_i.nil? or plugin_i.empty?
+      a[:type_instance] = type_i unless type_i.nil? or type_i.empty?
+      a[:value_type] = v[0]
+      a[:what] = format_what(a)
+      yield a, v[1]
+    end
+
+    # Handle payload with multiple values.
+    #
+    # If a database is not available, plugin_instance becomes the running
+    # integer, or index of the value.
+    #
+    # If a database is avaialble, it would follow the current structure and
+    # determine what the name of the plugin_instance is.
+    #
+    # http://collectd.org/documentation/manpages/types.db.5.shtml
+    def read_multiple(plugin, plugin_i, type, type_i, values)
+      values.each_with_index do |v, i|
+        a = {:plugin => plugin, :type => type}
+        a[:plugin_instance] = plugin_i unless plugin_i.nil? or plugin_i.empty?
+        a[:type_instance] = format_type_instance(type, i)
+        a[:value_type] = v[0]
+        a[:what] = format_what(a)
+        yield a, v[1]
+      end
+    end
+
+    def format_type_instance type, i
+      if @db
+        return @db.get_name(type, i)
+      end
+
+      i.to_s
+    end
+
+    def format_what a
+      p = if a[:plugin_instance]
+            "#{a[:plugin]}-#{a[:plugin_instance]}"
+          else
+            a[:plugin].to_s
+          end
+
+      t = if a[:type_instance]
+            "#{a[:type]}-#{a[:type_instance]}"
+          else
+            a[:type].to_s
+          end
+
+      "#{p}/#{t}"
+    end
   end
 end

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

@@ -23,15 +23,11 @@ module FFWD::Plugin::Collectd
     end
 
     def get_name key, i
-      unless entry = @database[key]
-        return nil
+      if entry = @database[key] and spec = entry[i]
+        return spec[0]
       end
 
-      unless type_spec = entry[i]
-        return nil
-      end
-
-      type_spec[0]
+      return i.to_s
     end
 
     def self.open path

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

@@ -16,7 +16,7 @@
 module FFWD
   module Plugin
     module Collectd
-      VERSION = "0.3.3"
+      VERSION = "0.3.4"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ffwd-collectd
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - John-John Tedro
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.4
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement