fluent-plugin-lm-logs-gcp 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59647cc29f2faad926500cc7447586f3df7ffc89103e2f0dd680331aca82e9b6
-  data.tar.gz: 1a488bc8c8c8a4ecf409858b5de49d07730a06a44dbfba9a285021303cc03533
+  metadata.gz: 86591ed4d747ec9ba44685fc6e9a0e7f193796fe620d8ad90b0e42250350971d
+  data.tar.gz: ad4e8736b8454ea34445c94e0c8739f769429c835f4d3f6767f5cb5ea0bff993
 SHA512:
-  metadata.gz: 1a96c7b2acab954150d701ca6055d7c60077e56e30f2166cc51ee0bb5351a24f778fa6b16678c9c04cc881ee20cc5b5900ce05a436818a08c27ce8caee47adab
-  data.tar.gz: a7398d088f5fca2cae1bb37164dc55be7e3fccffdafa8bd666fb414406d9f2fed5e6cceb10b8eae078411afb65aec5acff23f0cee00241b46c1cecfce4a84f12
+  metadata.gz: 650e1799e6546073994d608187e70babc7c95f4d4da299aa87049d9849a9e045adaca15a75b599090b1f182afe71d22cef66d78e87db328f406c33fbb2c074b3
+  data.tar.gz: 5b194b7f3f691ac9039212a1f5ae06a26e796158397bdcc1404fea719bfe812102561cdbf9a2f75b050bcfb12d7c370a1c075bbd5e17e50dd1b2c0156ddf9cb8

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.0'
+  spec.version                        = '1.0.1'
   spec.authors                        = ["LogicMonitor"]
   spec.email                          = "rubygems@logicmonitor.com"
   spec.summary                        = "LogicMonitor with GCP logs fluentd filter plugin"

data/lib/fluent/plugin/filter_gcplm.rb

@@ -27,6 +27,7 @@ module Fluent::Plugin
       resourceMap = Hash.new
       project_id = record.dig("resource","labels", "project_id")
       region = record.dig("resource","labels", "region")
+      filteredRecord = Hash.new
 
       case
       when record['textPayload']
@@ -42,23 +43,24 @@ module Fluent::Plugin
       case resourceType
       when 'gce_instance'
         if (record.dig("resource","labels", "instance_id"))
-            resourceMap = {"system.gcp.resourceid" => record.dig("resource","labels", "instance_id")}
+            resourceMap = {"system.gcp.resourceid" => record.dig("resource","labels", "instance_id"), "system.cloud.category" => 'GCP/ComputeEngine'}
         elsif (record.dig("labels", "compute.googleapis.com/resource_name"))
-            resourceMap = {"system.gcp.resourcename" => record.dig("labels", "compute.googleapis.com/resource_name")}
+            resourceMap = {"system.gcp.resourcename" => record.dig("labels", "compute.googleapis.com/resource_name"), "system.cloud.category" => 'GCP/ComputeEngine'}
         end
       when 'cloud_function'
-        resourceMap = {"system.gcp.resourcename" => "projects/" + project_id + "/locations/" + region +"/functions/" + record.dig("resource","labels", "function_name")}
+        resourceMap = {"system.gcp.resourcename" => "projects/" + project_id + "/locations/" + region +"/functions/" + record.dig("resource","labels", "function_name"), "system.cloud.category" => 'GCP/CloudFunction'}
       when 'cloudsql_database'
-        resourceMap = {"system.gcp.resourceid" => record.dig("resource","labels", "database_id")}
+        resourceMap = {"system.gcp.resourceid" => record.dig("resource","labels", "database_id"), "system.cloud.category" => 'GCP/CloudSQL'}
       end
 
       if(record.key?("protoPayload") && record.dig('protoPayload','@type') == "type.googleapis.com/google.cloud.audit.AuditLog")
         resourceMap = {"system.gcp.projectId" => project_id, "system.cloud.category" => 'GCP/LMAccount'}
       end
 
-      record['message'] = message
-      record['_lm.resourceId'] = resourceMap
-      record
+      filteredRecord['message'] = message
+      filteredRecord['_lm.resourceId'] = resourceMap
+      filteredRecord['timestamp'] = record['timestamp']
+      filteredRecord
     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.0
+  version: 1.0.1
 platform: ruby
 authors:
 - LogicMonitor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-30 00:00:00.000000000 Z
+date: 2021-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd