reacter 0.0.9 → 0.0.10

data/lib/reacter/agents/filter.rb

@@ -5,18 +5,59 @@ require 'reacter/agent'
 
 class Reacter
   class FilterAgent < Agent
+    def initialize()
+      super
+      @@_rxcache = {}
+    end
+
     def received(message)
-      if @config['sources']
-        sources = @config['sources'].keys()
+      if @config['sources'].is_a?(Hash)
+      # config not found, drop
+        return false if @config['sources'].empty?
+
+        @config['sources'].each do |sources, metrics|
+          sources = [*sources]
+          metrics = [*metrics]
 
-      # fall through if neither default nor our host specifically is named
-        return false unless (@config['sources'].include?('default') or @config['sources'].include?(message.source))
 
-      # fall through if the metric is not in either default our the current source's filter
-        return false unless (@config['sources']['default'].include?(message.metric) or @config['sources'][message.source].include?(message.metric))
+          sources.each do |source|
+            if source === 'default' or _property_match?(message.source, source)
+            # no metrics means all metrics!
+              return message if metrics.nil? or metrics.first === true or metrics.empty?
+
+              metrics.each do |metric|
+                if _property_match?(message.metric, metric)
+                  return message
+                end
+              end
+            end
+          end
+        end
       end
 
-      return message
+      return false
     end
+
+    private
+      def _property_match?(data, test)
+        if test.is_a?(String)
+        # regex
+          if test[0] == '/' and test[-1] == '/'
+            @@_rxcache[test[1..-2]] ||= Regexp.new(test[1..-2])
+
+            if data =~ @@_rxcache[test[1..-2]]
+              return true
+            end
+
+        # exact match
+          else
+            if data === test
+              return true
+            end
+          end
+        end
+
+        return false
+      end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reacter
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &20751620 !ruby/object:Gem::Requirement
+  requirement: &15680680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20751620
+  version_requirements: *15680680
 - !ruby/object:Gem::Dependency
   name: deep_merge
-  requirement: &20750220 !ruby/object:Gem::Requirement
+  requirement: &16230460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20750220
+  version_requirements: *16230460
 - !ruby/object:Gem::Dependency
   name: hashlib
-  requirement: &20748940 !ruby/object:Gem::Requirement
+  requirement: &15070420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20748940
+  version_requirements: *15070420
 - !ruby/object:Gem::Dependency
   name: hiredis
-  requirement: &20748020 !ruby/object:Gem::Requirement
+  requirement: &13732680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20748020
+  version_requirements: *13732680
 description: A utility for consuming, transforming, and routing monitoring data from
   various sources
 email: ghetzel@outbrain.com