fluent-plugin-elastic-log 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be4aeea609905311bbed3a83916a01a08f4dbd83891c75ef49260b6349d11bce
-  data.tar.gz: f5ba9b6ac041ab54338dc624a47d6ad72858071969a3faeb53045f720038b411
+  metadata.gz: 605b6f2c68ea885b2e0a46bdb3a109ca31c5c73b589740b2951f90c61b5c91cf
+  data.tar.gz: 2b53da5b868725e625e7295740cfb01cdab7cafcbef724aabbf1dd999f2500ca
 SHA512:
-  metadata.gz: e9f8e07eaa061cbc84d64f3103d2f53c09173847b94de902f6d4d8ecfb88fea345e7a24b21f5b30e5aa391d692241e2105544e0251108247d33905c46fe9b8b3
-  data.tar.gz: ac12a20652aaf7d6840088beb69082f895e31adc78a6f7b2ace471fc414c21b5a1d7e1451a4c227aa9ebd533ba47acc3d91802ebe4e54f6dcf54cdb0733192be
+  metadata.gz: bebb4b2ff28587c058e943ff135d1444d2f7a321bf1ea6219ce824451c3e2293e7a27337c7918cce34d20f4f3ac21c9aab3d59e2228779653e6d9cf3853508a0
+  data.tar.gz: 28cda27bd24301c8a529e28aac1710246b10cd76497217f7004e4c793d98bf55fa71e5131088fc81fed393832d19f8315d61482b31953fdaad08674853982d4b

data/.rubocop.yml

@@ -19,6 +19,7 @@ Metrics/BlockLength:
     - test/**/*.rb
 
 Metrics/ClassLength:
+  Max: 150
   Exclude:
     - test/**/*.rb
 

data/fluent-plugin-elastic-log.gemspec

@@ -5,11 +5,11 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name    = 'fluent-plugin-elastic-log'
-  spec.version = '1.0.1'
+  spec.version = '1.0.2'
   spec.authors = ['Thomas Tych']
   spec.email   = ['thomas.tych@gmail.com']
 
-  spec.summary       = "fluentd plugins to process elastic logs.'"
+  spec.summary       = 'fluentd plugins to process elastic logs'
   spec.homepage      = 'https://gitlab.com/ttych/fluent-plugin-elastic-log'
   spec.license       = 'Apache-2.0'
 

data/lib/fluent/plugin/elastic_log/granted_privileges_metric.rb

@@ -68,6 +68,18 @@ module Fluent
           record[conf.request_type_key]
         end
 
+        def record_request_path
+          record[conf.rest_request_path_key]
+        end
+
+        def trace_task_id
+          record[conf.trace_task_id_key]
+        end
+
+        def trace_task_parent_id
+          record[conf.trace_task_parent_id_key]
+        end
+
         def timestamp
           timestamp = Time.parse(record_timestamp)
 
@@ -83,11 +95,18 @@ module Fluent
           nil
         end
 
+        def query_type_from_request_path
+          return unless record_request_path
+
+          record_request_path.split('/').reject(&:empty?).first
+        end
+
         def query_type
           PRIVILEGE_MAP.each do |pattern, name|
             return name if record_privilege.to_s.start_with?(pattern)
           end
-          'unknown'
+
+          query_type_from_request_path || 'unknown'
         end
 
         def base
@@ -101,10 +120,10 @@ module Fluent
         end
 
         def indices
-          indices = record_r_indices || record_indices || [nil]
+          indices = record_r_indices || record_indices || []
           indices.inject(Set.new) do |acc, index|
             acc << aggregate_index(index)
-          end
+          end.compact
         end
 
         def aggregate_index(index)
@@ -116,7 +135,10 @@ module Fluent
         end
 
         def generate_metrics
-          generate_user_metrics + generate_index_metrics
+          metrics = []
+          metrics += generate_user_metrics unless trace_task_parent_id
+          metrics += generate_index_metrics if !trace_task_id || trace_task_parent_id
+          metrics
         end
 
         def generate_user_metrics

data/lib/fluent/plugin/out_elastic_audit_log_metric.rb

@@ -48,6 +48,8 @@ module Fluent
       DEFAULT_REQUEST_BODY = 'audit_request_body'
       DEFAULT_TIMESTAMP_KEY = '@timestamp'
       DEFAULT_PRIVILEGE_KEY = 'audit_request_privilege'
+      DEFAULT_TRACE_TASK_ID_KEY = 'audit_trace_task_id'
+      DEFAULT_TRACE_TASK_PARENT_ID_KEY = 'audit_trace_task_parent_id'
 
       DEFAULT_AGGREGATE_INDEX_CLEAN_SUFFIX = [].freeze
       DEFAULT_AGGREGATE_INTERVAL = nil
@@ -81,6 +83,10 @@ module Fluent
       config_param :rest_request_path_key, :string, default: DEFAULT_REST_REQUEST_PATH
       desc 'Request body key'
       config_param :request_body_key, :string, default: DEFAULT_REQUEST_BODY
+      desc 'Trace task id key'
+      config_param :trace_task_id_key, :string, default: DEFAULT_TRACE_TASK_ID_KEY
+      desc 'Trace task parent id key'
+      config_param :trace_task_parent_id_key, :string, default: DEFAULT_TRACE_TASK_PARENT_ID_KEY
 
       desc 'Timestamp format'
       config_param :timestamp_format, :enum, list: %i[iso epochmillis epochmillis_str], default: :iso

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-elastic-log
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Thomas Tych
 bindir: bin
 cert_chain: []
-date: 2025-03-24 00:00:00.000000000 Z
+date: 2025-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bump
@@ -269,5 +269,5 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 rubygems_version: 3.6.5
 specification_version: 4
-summary: fluentd plugins to process elastic logs.'
+summary: fluentd plugins to process elastic logs
 test_files: []