fluent-plugin-lm-logs-gcp 1.0.6 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 213a63d23d18929286a8201af426fe7e2b1ff68ac8a30cc9d50dc53cff532786
-  data.tar.gz: 9e161f20a42725baf4b32ea931cfe225516802aa0952a221a8d86ce1dbec457e
+  metadata.gz: 2674bd9fe0d77cbb6b9960b69278261381d9ec8c73604c5eac247b016c839ea8
+  data.tar.gz: d2a14c818ee472ce3270a31ffe92d826ea06a06f4439f2ab88281678e8b80d2c
 SHA512:
-  metadata.gz: 4a1e38a85f385fc408f3b74b40503ff255b2c3a3c29afa37854e4562b55ee21cc1d4c348f3ffda1f2378d22195ce995e842e15cf887d32eba73891027362fbe1
-  data.tar.gz: fd3f360ef17b0a568f30dadf56b6df6417fe725a566ece3c3e5c4af7478b2c5132fe94d0866d1a66604bd383d0ccbd66f9df903aa5df0c7d7b4b381c70fc6e78
+  metadata.gz: 8880f059d56514bb76aac758f9b456aaf11f7b3ab2eb2852fb2b0d7d8939aa5b9eb8cd2a5dd8c73e44bf0abef6c67b32a08337d2a7fafe403e00f55f78187cff
+  data.tar.gz: 7bfeeb38ad29493ab5a73fd9f6f5a6a9a833ce1e0fe7d1da69fa089b67880abc08f55ca287006c5fd17d49f2531b3f6696ac7f741a36ef39e9f69c56a4b90249

data/README.md

@@ -12,4 +12,5 @@ This filter plugin is provided for mapping the logs coming from GCP pubsub to '_
 | Property | Description |
 | --- | --- |
 | `metadata_keys` | Array of keys to be added as metadata. Filter will look for these keys in fluentd record and extract those if exist. in case of nested json, whole sub json would be added. default ` ["severity", "logName", "labels", "resource.type", "resource.labels", "httpRequest"] ` . few keys will be renamed as part of metadata standardization in Logicmonitor : ` {"trace" => "trace_id", "spanId" => "span_id","resource.type" => "_type"}`|
-| `use_default_severity` | When `true`, and log record does not have severity, severity=`DEFAULT` would be added to log. default `false`.  |
+| `use_default_severity` | When `true`, and log record does not have severity, log_level=`DEFAULT` would be added to log. default `false`.  |
+| `lm_tenant_id` |  tenant id to be added as event metadata. This will be added directly into metadata as `_lm.tenantId` |

data/fluent-plugin-lm-logs-gcp.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |spec|
   spec.name                           = "fluent-plugin-lm-logs-gcp"
-  spec.version                        = '1.0.6'
+  spec.version                        = '1.0.8'
   spec.authors                        = ["LogicMonitor"]
   spec.email                          = "rubygems@logicmonitor.com"
   spec.summary                        = "LogicMonitor with GCP logs fluentd filter plugin"
@@ -22,4 +22,4 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "fluentd", [">= 1", "< 2"]
   spec.add_development_dependency 'hashdiff', '>= 1.0.0'
-end
+end

data/lib/fluent/plugin/filter_gcplm.rb

@@ -4,11 +4,13 @@ module Fluent::Plugin
   class GCPLMFilter < Filter
     Fluent::Plugin.register_filter('gcplm', self)
 
-    METADATA_KEYS_TO_RENAME = {"trace" => "trace_id", "spanId" => "span_id","resource.type" => "_type"}.freeze
+    METADATA_KEYS_TO_RENAME = {"trace" => "trace_id", "spanId" => "span_id","resource.type" => "_type", "severity" => "log_level"}.freeze
     STATIC_METADATA = {"_integration" => "gcp"}
+    LM_TENANT_ID_KEY = "_lm.tenantId".freeze
 
     config_param :metadata_keys, :array, default: ["severity", "logName", "labels", "resource.type", "resource.labels", "httpRequest"], value_type: :string
-    config_param :use_default_severity, :bool, default: false 
+    config_param :use_default_severity, :bool, default: false
+    config_param :lm_tenant_id, :string, default: nil
 
     def configure(conf)
       super
@@ -21,9 +23,9 @@ module Fluent::Plugin
       @final_metadata_keys = Hash.new
       if @metadata_keys
         @metadata_keys.each do | nested_key |
-          @final_metadata_keys[nested_key] = nested_key.to_s.split('.') 
-        end  
-      end  
+          @final_metadata_keys[nested_key] = nested_key.to_s.split('.')
+        end
+      end
       super
     end
 
@@ -92,26 +94,32 @@ module Fluent::Plugin
       filteredRecord['timestamp'] = record['timestamp']
 
       # Add metadata
-      if @final_metadata_keys 
+      if @final_metadata_keys
         @final_metadata_keys.each do | key, value |
           final_key = METADATA_KEYS_TO_RENAME[key] ? METADATA_KEYS_TO_RENAME[key] : key
           nestedVal = record
           value.each { |x| nestedVal = nestedVal[x] }
           if nestedVal != nil
             filteredRecord[final_key] = nestedVal
-          end  
-        end  
-      end  
+          end
+        end
+      end
 
       # Add static metadata
       STATIC_METADATA.each { | key, value| filteredRecord[key] = value }
 
-      # Add default severity if does not exist 
-      if !filteredRecord["severity"] and @use_default_severity
-        filteredRecord["severity"] = "DEFAULT"
-      end   
-
+      # Add tenantid
+      tenant_id_from_record = record[LM_TENANT_ID_KEY]
+      if (tenant_id_from_record != nil)
+        filteredRecord[LM_TENANT_ID_KEY] = tenant_id_from_record
+      elsif @lm_tenant_id != nil && ! @lm_tenant_id.empty?
+        filteredRecord[LM_TENANT_ID_KEY] = @lm_tenant_id
+      end
+      # Add default severity if does not exist
+      if !filteredRecord["log_level"] and @use_default_severity
+        filteredRecord["log_level"] = "DEFAULT"
+      end
       filteredRecord
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-lm-logs-gcp
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.8
 platform: ruby
 authors:
 - LogicMonitor
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-05 00:00:00.000000000 Z
+date: 2023-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd