logstash-output-lmlogs 2.0.2 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4846f9bbbd52ab6c5f801aa3d6938e7fc58311408588ab3e57adeb12c852b02
-  data.tar.gz: 23239bd62adc2baf7d8340bcfccf5b63b85bf5b30c189420465f66d3b6584d51
+  metadata.gz: d63b3de1ab7597eba97b4712eeb40ceba5f8c3f9efd0f99f0123bd98ee085be0
+  data.tar.gz: 2e63421a187f1cdbed504d94caaa421cc00a90790fd52cb44a7b2e9c49ce1a8e
 SHA512:
-  metadata.gz: d24e42560a21de68485a601ac2f82e60559269801597756848c4d8d000eace113bc07265e2352f967224f2c43f2abf3f98c47da2855bec8123745429c4e249d8
-  data.tar.gz: b72a1fb18c3bb21d31c6d78d4291b293c272cea084f761f2359edd9d984b3c01a467bef42c76a7dd3821b590fabebbc2cd3b5a260ba94f3377b6b041a9ca1af0
+  metadata.gz: cf6ad8fc04a9c9f05f61547a0d956e9fe54dd92ef9708ca4508751974bc121e6cb9a771a9b292c8499f41bd30e7eaf5a737c34dc6395efdd3f901ca709994fc4
+  data.tar.gz: 36ea602ca70119afa88cc8aee70ec4486e4499e14f83068606b22d886614b9581403679370adc4e639f95ed2557fe145661f251d51e2e4c5a84c78d0cb52359c

data/README.md

@@ -22,7 +22,8 @@ output {
 }
 ```
 You would need either `access_id` and `access_id` both or `bearer_token` for authentication with Logicmonitor. 
-The portal_domain is the domain of your LM portal. If not set the default is set to `logicmonitor.com`. Eg if your LM portal URL is `https://test.domain.com`, portal_name should be set to `test` and portal_domain to `domain.com`
+The portal_domain is the domain of your LM portal. If not set the default is set to `logicmonitor.com`. Eg if your LM portal URL is `https://test.lmgov.us`, portal_name should be set to `test` and portal_domain to `lmgov.us`
+The allowed values for portal_domain are ["logicmonitor.com", "lmgov.us", "qa-lmgov.us"]
 
 
 

data/lib/logstash/outputs/lmlogs.rb

@@ -115,6 +115,8 @@ class LogStash::Outputs::LMLogs < LogStash::Outputs::Base
   # For developer debugging.
   @@CONSOLE_LOGS = false
 
+  ALLOWED_DOMAINS = ["logicmonitor.com", "lmgov.us", "qa-lmgov.us"]
+
   public
   def register
     @total = 0
@@ -130,6 +132,11 @@ class LogStash::Outputs::LMLogs < LogStash::Outputs::Base
       @portal_domain = "logicmonitor.com"
     end
 
+     unless ALLOWED_DOMAINS.include?(@portal_domain)
+          raise LogStash::ConfigurationError, "Invalid portal_domain: #{@portal_domain}. Allowed values are: #{ALLOWED_DOMAINS.join(', ')}"
+     end
+     log_debug("Setting LM portal domain ", :portal_domain => portal_domain)
+
     @final_metadata_keys = Hash.new
     if @include_metadata_keys.any?
       include_metadata_keys.each do | nested_key |
@@ -301,6 +308,7 @@ class LogStash::Outputs::LMLogs < LogStash::Outputs::Base
     if @include_metadata
       lmlogs_event = event_json
       lmlogs_event.delete("@timestamp")  # remove redundant timestamp field
+      lmlogs_event["_resource.type"]="Logstash"
       if lmlogs_event.dig("event", "original") != nil
         lmlogs_event["event"].delete("original") # remove redundant log field
       end
@@ -348,4 +356,4 @@ class LogStash::Outputs::LMLogs < LogStash::Outputs::Base
     documents.push(lmlogs_event)
     return documents
   end
-end # class LogStash::Outputs::LMLogs
+end # class LogStash::Outputs::LMLogs

data/lib/logstash/outputs/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LmLogsLogstashPlugin
-  VERSION = '2.0.2'
+  VERSION = '2.0.4'
 end

data/spec/outputs/metadata_spec.rb

@@ -44,8 +44,7 @@ describe LogStash::Outputs::LMLogs do
       expected_event = {
         "message" => "hello this is log 1",
         "timestamp" => logstash_event.timestamp,
-        "_lm.resourceId" => {"system.hostname" => "host1"},
-
+        "_lm.resourceId" => {"system.hostname" => "host1"}
       }
       puts " actual : #{constructed_event} \n expected : #{expected_event}"
 
@@ -77,7 +76,8 @@ describe LogStash::Outputs::LMLogs do
         "nested" => {"nested2" => {"nested3" => "value",
                                 "nested3b" => "value"},
                     "nested_ignored" => "somevalue"
-                  }
+                  },
+        "_resource.type"=>"Logstash"
       }
       puts " actual : #{constructed_event} \n expected : #{expected_event}"
       puts " hash diff : #{Hashdiff.diff(constructed_event,expected_event)}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-lmlogs
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.4
 platform: ruby
 authors:
 - LogicMonitor
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-25 00:00:00.000000000 Z
+date: 2024-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement