fluent-plugin-tag-normaliser 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0be47cfc8a8fb73356184a7e0136f3d6b609e438b6ec39ada7c6b87500c9224
-  data.tar.gz: 8daa7f967cbf3a1459f00574a6035afa030a0d71b5febf83d23683d3c7f7edd3
+  metadata.gz: 3de141eacd728b5c64ef048c4ba6541db115da0348752e699f4a907185db93aa
+  data.tar.gz: 90fc732beaf853c70176dcf2d27325f7b6e5ee5fe3989219a5404c00ea15165f
 SHA512:
-  metadata.gz: 624186d87a41358ec45100c524d2fc170a5a18f2a107fe58e18f994ed545607d7e413abf3520eb7b87eae89def3e75ec935334a78593a075afb12daf640cd59d
-  data.tar.gz: 395bb59c940e0255c7b9ee170ac007583255c727f1dafe61d8333ca16d8342e6d62f048512f052e40beb4efb925bd1dc9950831c0f8da5fc720f408da1b36ee2
+  metadata.gz: fc500f140016b9ce333228829c155b8b9e9f35bbb2c8d6ecaf83dd9abf30873488e275a2889023c00a83ff157b25e148df127c28d026455ef04595a9904945e5
+  data.tar.gz: ab4a9663c53a053e347ac204068b460ac3dec4815367dbbc2f9aa3aa7a9a31d69b4d8044ef5fccb67451346de78c57ab75b4d7a7a06e0fb566926d5b50931be1

data/fluent-plugin-tag-normaliser.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name    = "fluent-plugin-tag-normaliser"
-  spec.version = "0.1.2"
+  spec.version = "0.1.3"
   spec.authors = ["Banzai Cloud"]
   spec.email   = ["info@banzaicloud.com"]
 

data/lib/fluent/plugin/out_tag_normaliser.rb

@@ -72,20 +72,67 @@ module Fluent
 
       def get_key_accessors
         key_accessors = {}
-        keywords = @format.scan(/\$\{([\w\.\/\-]+)}/)
+        keywords = @format.scan(/\$\{([\w\.\/\-\\]+)}/)
         keywords.each do |key|
           placeholder = "${#{key[0]}}"
-          if @key_prefix != ""
-            path = @key_prefix + "." + key[0]
+          if contains_escaped_period?(key[0])
+            path = create_path_with_bracket_notation(key[0])
           else
-            path = key[0]
+            path = create_path(key[0])
           end
-          path = "$." + path
           key_accessors[placeholder] = record_accessor_create(path)
         end
         return key_accessors
       end
 
+      private
+
+      def contains_escaped_period?(key)
+        key.include?('\.')
+      end
+
+      def create_path(key)
+        if @key_prefix != ""
+          path = @key_prefix + "." + key
+        else
+          path = key
+        end
+        path = "$." + path
+      end
+
+      # Produces the output in bracket notation, e.g. $['kubernetes']['labels']['app.tier']"
+      def create_path_with_bracket_notation(key)
+        path = split_by_unescaped_dots(key)
+                .map { |elem| "['#{elem}']" }
+                .join("")
+        if @key_prefix != ""
+          path = "['#{@key_prefix}']" + path
+        end
+        path = "$" + path
+      end
+
+      # Splits the input string by the . character if it is not escaped by \
+      def split_by_unescaped_dots(text)
+        result = []
+        current_part = ""
+        escaped = false
+
+        text.each_char do |char|
+          if char == "\\" && !escaped
+            escaped = true
+          elsif char == "." && !escaped
+            result << current_part
+            current_part = ""
+          else
+            current_part += char
+            escaped = false
+          end
+        end
+
+        result << current_part
+        result
+      end
+
     end
   end
 end

data/test/plugin/test_out_tag_normaliser.rb

@@ -21,10 +21,37 @@ class TagNormaliserOutputTest < Test::Unit::TestCase
     d = create_driver(config)
     d.run(default_tag: 'test') do
       d.feed("tag1", event_time, record.dup)
+    end
+    events = d.events
+    puts events
+
+    assert_equal("cluster.default.understood-butterfly-nginx-logging-demo-7dcdcfdcd7-h7p9n.nginx", events[0][0])
+  end
+
+  test "escape_test" do
+    config = %[
+      format cluster.${namespace_name}.${labels.app}.${labels.app\\.tier}.${labels.app\\.kubernetes\\.io/managed-by}
+    ]
+    record = {
+        "log" => "Example",
+        "kubernetes" => {
+            "pod_name" => "understood-butterfly-nginx-logging-demo-7dcdcfdcd7-h7p9n",
+            "namespace_name" => "default",
+            "labels" => {
+              "app" => "nginx",
+              "app.tier" => "frontend",
+              "app.kubernetes.io/managed-by" => "helm"
+            }
+        }
+    }
+    d = create_driver(config)
+    d.run(default_tag: 'test') do
       d.feed("tag1", event_time, record.dup)
     end
     events = d.events
     puts events
+
+    assert_equal("cluster.default.nginx.frontend.helm", events[0][0])
   end
 
   private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-tag-normaliser
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Banzai Cloud
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-27 00:00:00.000000000 Z
+date: 2024-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -92,7 +92,7 @@ homepage: https://github.com/banzaicloud/fluent-plugin-tag-normaliser
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -107,8 +107,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key:
+rubygems_version: 3.0.3.1
+signing_key: 
 specification_version: 4
 summary: Tag-normaliser is a `fluentd` plugin to help re-tag logs with Kubernetes
   metadata.