fluent-plugin-label-router 0.2.6 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8db0a645ba254d2ab4e728cae01d96f8e0b4d10d299b69321740d0a183475aa3
-  data.tar.gz: ce2821e9db352d06d402acc1a1962711a4256e40f754fc5fb01b7a444fa69e96
+  metadata.gz: 2eccef2ba45a644db797ef22980134d652db67bf049467e3d404e2211dbedd9c
+  data.tar.gz: ab9a02cde570157b3b01228d06982a8cef69ab39c8b5f28ca7c1518ef91ccf35
 SHA512:
-  metadata.gz: 453fdada4c6b1d6d06102203cde03030fdb97e9ae3d4a3cbddd78eb5fa45c61b650c537e2e7333f7d775527512adf92247c795d24dffe945209887d7e7539562
-  data.tar.gz: bad2d5a50a3b6a78bde32b3820690cfce2c2c97a56649ac6a319a7610d81a9634223ac078013145b6c04a39868712a0820fdd667d6820ef87ee273a825d65a86
+  metadata.gz: 3d61f1b61634e0afabc6e4f9418b8eb6d69eb6a5b20833973500b9094e123877af08971576fe6d11240fa53169bd87ed0ca0d94cfc42ba987f4bb3e74789afc6
+  data.tar.gz: d9ed37e986627feb738a384c89242fc8aadd05d58141f91573b3791f8498b6d6ce00e67ad6dfb38e5e151decb7ed5456392936ed3c0d821f241175e656c67a0e

data/README.md

@@ -13,7 +13,7 @@ $ gem install fluent-plugin-label-router
 ### Specific install
 
 ```
-$ gem install specific_install && gem specific_install -l https://github.com/banzaicloud/fluent-plugin-label-router.git
+$ gem install specific_install && gem specific_install -l https://github.com/banzaicloud/fluent-plugin-label-router.git
 ```
 
 ### Bundler
@@ -114,7 +114,7 @@ Configuration to re-tag and re-label all logs from `default` namespace with labe
 ```
 
 ### 2. Exclude specific `labels` and `namespaces`
-Configuration to re-tag and re-label all logs that **not** from `default` namespace **and not** have labels `ap=nginx` and `env=dev`
+Configuration to re-tag and re-label all logs that **not** from `default` namespace **and not** have labels `app=nginx` and `env=dev`
 ```
 <match example.tag**>
   @type label_router

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.2.6"
+  spec.version = "0.2.10"
   spec.authors = ["Banzai Cloud"]
   spec.email   = ["info@banzaicloud.com"]
 
@@ -20,7 +20,6 @@ Gem::Specification.new do |spec|
   spec.test_files    = test_files
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.14"
   spec.add_development_dependency "rake", "~> 12.0"
   spec.add_development_dependency "test-unit", "~> 3.0"
   spec.add_dependency "prometheus-client", ">= 2.1.0"

data/lib/fluent/plugin/out_label_router.rb

@@ -33,6 +33,8 @@ module Fluent
       config_param :sticky_tags, :bool, default: true
       desc "Default label to drain unmatched patterns"
       config_param :default_route, :string, :default => ""
+      desc "Metrics labels for the default_route"
+      config_param :default_metrics_labels, :hash, :default => {}
       desc "Default tag to drain unmatched patterns"
       config_param :default_tag, :string, :default => ""
       desc "Enable metrics for the router"
@@ -69,14 +71,17 @@ module Fluent
           @metrics_labels = (rule['metrics_labels'].map { |k, v| [k.to_sym, v] }.to_h if rule['metrics_labels'])
           @counter = nil
           unless registry.nil?
-              @counter = registry.counter(:fluentd_router_records_total, "Total number of events router for the flow")
+              if registry.exist?(:fluentd_router_records_total)
+                @counter = registry.get(:fluentd_router_records_total)
+              else
+                @counter = registry.counter(:fluentd_router_records_total, docstring: "Total number of events routed for the flow", labels: [:flow, :id])
+              end
           end
         end
 
         def get_labels
-          default = { 'flow': @label }
-          labels = default.merge(@metrics_labels)
-          labels
+          labels = { 'flow': @label, 'id': "default" }
+          !@metrics_labels.nil? ? labels.merge(@metrics_labels) : labels
         end
 
         # Evaluate selectors
@@ -122,6 +127,7 @@ module Fluent
           else
             @router.emit(@tag, time, record)
           end
+          @counter&.increment(by: 1, labels: get_labels)
         end
 
         def emit_es(tag, es)
@@ -206,7 +212,7 @@ module Fluent
         end
 
         if @default_route != '' or @default_tag != ''
-          default_rule = { 'matches' => nil, 'tag' => @default_tag, '@label' => @default_route}
+          default_rule = { 'matches' => nil, 'tag' => @default_tag, '@label' => @default_route, 'metrics_labels' => @default_metrics_labels }
           @default_router = Route.new(default_rule, event_emitter_router(@default_route), @registry)
         end
 

data/test/plugin/test_out_label_router.rb

@@ -208,4 +208,35 @@ default_tag "new_tag"
       assert_equal ["new_app_tag", event_time, {"kubernetes" => {"labels" => {"app" => "app2"} } }], events[1]
     end
   end
+
+    sub_test_case 'test_metrics' do
+      test 'normal' do
+        CONFIG4 = %[
+  @id xxx
+  metrics true
+  <route>
+    metrics_labels {"id": "test"}
+    tag new_app_tag
+    <match>
+      labels
+      namespaces
+    </match>
+  </route>
+  ]
+        event_time = event_time("2019-07-17 11:11:11 UTC")
+        d = create_driver(CONFIG4)
+        d.run(default_tag: 'test') do
+          d.feed(event_time, {"kubernetes" => {"labels" => {"app" => "app1"} } } )
+        end
+        d.run(default_tag: 'test2') do
+          d.feed(event_time, {"kubernetes" => {"labels" => {"app" => "app2"} } } )
+        end
+        events = d.events
+
+        assert_equal(2, events.size)
+        assert_equal ["new_app_tag", event_time, {"kubernetes" => {"labels" => {"app" => "app1"} } }], events[0]
+        assert_equal ["new_app_tag", event_time, {"kubernetes" => {"labels" => {"app" => "app2"} } }], events[1]
+      end
+    end
+
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-label-router
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.10
 platform: ruby
 authors:
 - Banzai Cloud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-27 00:00:00.000000000 Z
+date: 2021-09-14 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.14'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.14'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement