fluent-plugin-lm-logs 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fbacc1e0e4eb5389c11d4b23c28eda6100919da6d7de0abbda9edf13dffbf682
-  data.tar.gz: 3bffdba784febf493f69ba0be9c1745f53d7aebb8f66ef92bf23b252fb91d2bb
+  metadata.gz: 74ceac6a53b86efe8123cd6ec143d4839de6043815ebb10e763e2b3019122396
+  data.tar.gz: f72441fc5646c2cdc6f602f066fca505e1bb713371a90bdbf019ea6cf07c80b0
 SHA512:
-  metadata.gz: 34362b69e402d439ee415089540a5f3d1532bb5f44c997bca79437e57a64286579b3e9c8349ebb44095bf86e976e2b197ddd9f7f20a32600e2c164685310b62e
-  data.tar.gz: '0631937f8f545e675735e207d6e6137748ef0bc1445cdab27c1b0179f0513daa271fbee4bcbe9000aa8fea1df155e5f208f82fdb6002a6e58f133f09c2616e57'
+  metadata.gz: ee9e805c8fe449abca81d6fdfff713130359c7b3cb5c246a48fc37e8f6a6a93ab25c2203c1aa5ecfb441ca0a3e7223373ebad31b2a5314660eba5ab5bb31ed0c
+  data.tar.gz: a910b4872388fade3cf044e7f2c9e2562a23d5730a2faffc4f4daa9f942220a44c02fa3daead5e078e662eaddb8ecb27c034f3bb190324267b0b4a04e953cd87

data/fluent-plugin-lm-logs.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |spec|
   spec.name                           = "fluent-plugin-lm-logs"
-  spec.version                        = '1.0.3'
+  spec.version                        = '1.0.4'
   spec.authors                        = ["LogicMonitor"]
   spec.email                          = "rubygems@logicmonitor.com"
   spec.summary                        = "LogicMonitor logs fluentd output plugin"

data/lib/fluent/plugin/out_lm.rb

@@ -15,6 +15,10 @@ module Fluent
   class LmOutput < BufferedOutput
     Fluent::Plugin.register_output('lm', self)
 
+    RESOURCE_MAPPING_KEY      = "_lm.resourceId".freeze
+    DEVICELESS_KEY_SERVICE    = "resource.service.name".freeze
+    DEVICELESS_KEY_NAMESPACE  = "resource.service.namespace".freeze
+
     # config_param defines a parameter. You can refer a parameter via @path instance variable
 
     config_param :access_id,  :string, :default => "access_id"
@@ -91,7 +95,8 @@ module Fluent
       end
 
       if !@device_less_logs
-        if record["_lm.resourceId"] == nil
+        # With devices
+        if record[RESOURCE_MAPPING_KEY] == nil
             @resource_mapping.each do |key, value|
               k = value
               nestedVal = record
@@ -100,17 +105,21 @@ module Fluent
                 resource_map[k] = nestedVal
               end
             end
-          lm_event["_lm.resourceId"] = resource_map
+          lm_event[RESOURCE_MAPPING_KEY] = resource_map
         else
-          lm_event["_lm.resourceId"] = record["_lm.resourceId"]
+          lm_event[RESOURCE_MAPPING_KEY] = record[RESOURCE_MAPPING_KEY]
         end
       else
-        if record["service"]==nil
+        # Device less
+        if record[DEVICELESS_KEY_SERVICE]==nil
           log.error "When device_less_logs is set \'true\', record must have \'service\'. Ignoring this event #{lm_event}."
           return nil
         else
-          lm_event["service"] = encode_if_necessary(record["service"]) 
-        end  
+          lm_event[DEVICELESS_KEY_SERVICE] = encode_if_necessary(record[DEVICELESS_KEY_SERVICE])
+          if record[DEVICELESS_KEY_NAMESPACE]!=nil
+            lm_event[DEVICELESS_KEY_NAMESPACE] = encode_if_necessary(record[DEVICELESS_KEY_NAMESPACE]) 
+          end
+        end
       end
 
       if record["timestamp"] != nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-lm-logs
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - LogicMonitor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-30 00:00:00.000000000 Z
+date: 2022-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd