fluent-plugin-label-router 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39bb31d6e0960885594803292fd8b7e6739191333aaa303d2db16809d2ddaf1c
-  data.tar.gz: 46d5658ae6ed1159e4d55c6068f945ce5bb4719e6c373602cf88581323f60c46
+  metadata.gz: 84f4bafc4ac5d89f9c326c55c54e12f70b4315afe546aa6463492cc6ba69aa8e
+  data.tar.gz: 6c507a4af8eccfd37a5f70ea40e64f077ceefb4d34519ea3db1d284d90700a92
 SHA512:
-  metadata.gz: cae3b60f07ff8bd9b411b7ae5ae766c59c95737484eb497e77b219e8d6d43f31943e4702313097cf8dd331b029a213389c3911ea0c1d937797dd6f18e7f19669
-  data.tar.gz: bafd88bb200ca34795d206b7a4e24ab25e78de209c078282414f2de7b02de7e494e7835927c872f29c11e173ddd51056e8bea68a8642319a76519271d3ac524c
+  metadata.gz: 4db8ea9e6b6e0af1c491f9635c47dcf8e5eb8f4ac91cff15c46600717714e2e9784b2eb32a287ba83fdd96439c588e70a9b7e256c8b330998127976fd039d4ee
+  data.tar.gz: 8f112e80a1b562008ecbe69e02fe6292c93deed2afd53e9a54a6eb2f2fad56bfbdbb3994ab7fc4b1a2dbe942c25982a3858eed2c4f7f5aaf7813d2b4be8152bd

data/README.md

@@ -35,7 +35,7 @@ $ bundle
 The configuration builds from `<route>` sections. Each `route` section
 can have several `<match>` statement. These statements computed in order and
 positive (or in case of *negate true* negative) results break the evaluation.
-We can say that the sections are coupled in a **lazy evaluation OR**. 
+We can say that the sections are coupled in a **lazy evaluation OR**.
 
 ```
 <match example.tag**>
@@ -78,6 +78,7 @@ Configuration reference
 |------------------|-------------------------------------------------------------------------------------------------------|----------|----------|
 | labels           | Label definition to match record. Example: `app:nginx`                                                | Hash     | nil      |
 | namespaces       | Comma separated list of namespaces. Ignored if left empty.                                            | []string | nil      |
+| namespaces_regex | Comma separated list of regex for namespaces match. Ignored if left empty.                            | []string | nil      |
 | namespace_labels | Label definition of the namespace a record originates. Example: `kubernetes.io/metadata.name=default` | Hash     | nil      |
 | hosts            | Comma separated list of hosts. Ignored if left empty.                                                 | []string | nil      |
 | container_names  | Comma separated list of container names. Ignored if left empty.                                       | []string | nil      |
@@ -145,7 +146,7 @@ Output
 @label = "@NGINX"; tag = "new_tag"; {"log" => "", "kubernetes" => { "namespace_name" => "default", "labels" =>  {"app" => "nginx" } } }
 nil
 ```
-### 2. Both `labels` and `namespace` are optional
+### 3. Both `labels` and `namespace` are optional
 Only `labels`
 ```
 <match example.tag**>
@@ -183,10 +184,10 @@ Rewrite all
 </match>
 ```
 
-### 3. One of `@label` ot `tag` configuration should be specified
+### 4. One of `@label` or `tag` configuration should be specified
 If you don't rewrite either of them fluent will **likely to crash** because it will reprocess the same messages again.
 
-### 4. Default route/tag
+### 5. Default route/tag
 
 Use `default_label` and/or `default_tag` to route non matching records.
 
@@ -200,6 +201,22 @@ Use `default_label` and/or `default_tag` to route non matching records.
 </match>
 ```
 
+### 6. Use of namespaces_regex
+
+Configuration to re-tag and re-label all logs from namespaces_regex which match regex .*-system$
+
+```
+<match example.tag**>
+  @type label_router
+  <route>
+    @label SYSTEM_NAMESPACE
+    tag new_tag
+    <match>
+      namespaces_regex .*-system$
+    </match>
+  </route>
+</match>
+```
 
 ## Copyright
 

data/fluent-plugin-label-router.gemspec

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

data/lib/fluent/plugin/out_label_router.rb

@@ -54,6 +54,8 @@ module Fluent
           config_param :labels, :hash, :default => {}
           desc "List of namespace definition to filter the record. Ignored if left empty."
           config_param :namespaces, :array, :default => [], value_type: :string
+          desc "List of regex for namespace definition to filter the record. Ignored if left empty."
+          config_param :namespaces_regex, :array, :default => [], value_type: :string
           desc "List of namespace labels to filter the record based on where it came from. Ignored if left empty."
           config_param :namespace_labels, :hash, :default => {}
           desc "List of hosts definition to filter the record. Ignored if left empty."
@@ -117,6 +119,10 @@ module Fluent
           unless match.namespaces.empty? || match.namespaces.include?(metadata[:namespace])
             return false
           end
+          # Break if list of namespaces is not empty and does not contain any entry that match actual namespace
+          unless match.namespaces_regex.empty? || match.namespaces_regex.any? { |pattern| Regexp.new(pattern).match?(metadata[:namespace]) }
+            return false
+          end
           # Break if list of namespace_labels is not empty and does not match actual namespace labels
           if !match.namespace_labels.empty? && !match_labels(metadata[:namespace_labels], match.namespace_labels)
             return false

data/test/plugin/test_out_label_router.rb

@@ -59,6 +59,12 @@ class LabelRouterOutputTest < Test::Unit::TestCase
   </match>
   tag new_app_tag
 </route>
+<route>
+  <match>
+    labels app:app3
+    namespaces_regex .*-system$,^kube-.*
+  </match>
+</route>
 <route>
   <match>
     labels app:nginx
@@ -98,23 +104,42 @@ class LabelRouterOutputTest < Test::Unit::TestCase
       assert_equal(false, r2.match?(labels: { 'app3' => 'app' }, namespace: 'system'))
 
       r3 = Fluent::Plugin::LabelRouterOutput::Route.new(d.instance.routes[2], nil,nil)
-      assert_equal(true, r3.match?(labels: { 'app' => 'nginx' }, namespace: 'dev'))
-      assert_equal(true, r3.match?(labels: { 'app' => 'nginx' }, namespace: 'sandbox'))
-      assert_equal(false, r3.match?(labels: { 'app' => 'nginx2' }, namespace: 'sandbox'))
+      # Match selector and namespace: GO
+      assert_equal(true, r3.match?(labels: { 'app' => 'app3' }, namespace: 'logging-system'))
+      # Nothing matched: NO GO
+      assert_equal(false, r3.match?(labels: { 'app' => 'app3' }, namespace: 'logging-system1'))
+      # Nothing matched: NO GO
+      assert_equal(false, r3.match?(labels: { 'app' => 'app3' }, namespace: 'system'))
+      # Nothing matched: NO GO
+      assert_equal(false, r3.match?(labels: { 'app' => 'app3' }, namespace: '1system'))
+      # Match selector and namespace: GO
+      assert_equal(true, r3.match?(labels: { 'app' => 'app3' }, namespace: 'kube-ns'))
+      # Nothing matched: NO GO
+      assert_equal(false, r3.match?(labels: { 'app' => 'app3' }, namespace: '1kube-ns'))
+      # Nothing matched: NO GO
+      assert_equal(false, r3.match?(labels: { 'app' => 'app3' }, namespace: 'kube'))
+      # Nothing matched: NO GO
+      assert_equal(false, r3.match?(labels: { 'app' => 'app3' }, namespace: 'kube1'))
+
 
       r4 = Fluent::Plugin::LabelRouterOutput::Route.new(d.instance.routes[3], nil,nil)
+      assert_equal(true, r4.match?(labels: { 'app' => 'nginx' }, namespace: 'dev'))
+      assert_equal(true, r4.match?(labels: { 'app' => 'nginx' }, namespace: 'sandbox'))
+      assert_equal(false, r4.match?(labels: { 'app' => 'nginx2' }, namespace: 'sandbox'))
+
+      r5 = Fluent::Plugin::LabelRouterOutput::Route.new(d.instance.routes[4], nil,nil)
       # Matching container name
-      assert_equal(true, r4.match?(labels: { 'app' => 'nginx' }, namespace: 'dev', container: 'mycontainer'))
+      assert_equal(true, r5.match?(labels: { 'app' => 'nginx' }, namespace: 'dev', container: 'mycontainer'))
       # Missing container name is equal to wrong container
-      assert_equal(false, r4.match?(labels: { 'app' => 'nginx' }, namespace: 'sandbox'))
+      assert_equal(false, r5.match?(labels: { 'app' => 'nginx' }, namespace: 'sandbox'))
       # Wrong container name
-      assert_equal(false, r4.match?(labels: { 'app' => 'nginx' }, namespace: 'dev', container: 'mycontainer2'))
+      assert_equal(false, r5.match?(labels: { 'app' => 'nginx' }, namespace: 'dev', container: 'mycontainer2'))
       # Wrong label but good namespace and container_name
-      assert_equal(false, r4.match?(labels: { 'app' => 'nginx2' }, namespace: 'sandbox',  container_name: 'mycontainer2'))
+      assert_equal(false, r5.match?(labels: { 'app' => 'nginx2' }, namespace: 'sandbox',  container_name: 'mycontainer2'))
 
-      r4 = Fluent::Plugin::LabelRouterOutput::Route.new(d.instance.routes[4], nil,nil)
+      r6 = Fluent::Plugin::LabelRouterOutput::Route.new(d.instance.routes[5], nil,nil)
       # Matching namespaces_labels
-      assert_equal(true, r4.match?(namespaces_labels: { 'name' => 'default' }))
+      assert_equal(true, r6.match?(namespaces_labels: { 'name' => 'default' }))
     end
   end
 
@@ -224,6 +249,7 @@ default_tag "new_tag"
   <match>
     labels
     namespaces
+    namespaces_regex
   </match>
 </route>
 ]
@@ -254,6 +280,7 @@ default_tag "new_tag"
     <match>
       labels
       namespaces
+      namespaces_regex
     </match>
   </route>
   ]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-label-router
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Banzai Cloud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-12-02 00:00:00.000000000 Z
+date: 2025-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake