Merge pull request #9 from logicmonitor/DEV-118709-implement-failing-test-cases-for-lm-logs-logstash-plugin

Dev 118709 implement failing test cases for lm logs logstash plugin

Author: siddharthck

Dockerfile

@@ -1,11 +1,17 @@
-FROM jruby:latest
+#FROM jruby:9.3.9.0-jdk11
+FROM logstash:8.5.1 AS builder
+
+FROM jruby:9.3.9.0-jdk11
+COPY --from=builder /usr/share/logstash /logstash
 RUN mkdir /logicmonitor
 COPY . /logicmonitor
 WORKDIR /logicmonitor
 #skipping tests due to logstash bug causing failure
-# todo add logstash bug workaround for failing tests 
-#RUN bundle install
-#RUN bundle exec rake vendor
-#RUN bundle exec rspec spec
+# todo add logstash bug workaround for failing tests
+ENV LOGSTASH_SOURCE='1'
+ENV LOGSTASH_PATH='/logstash'
+RUN bundle install
+RUN bundle exec rake vendor
+RUN bundle exec rspec spec
 RUN gem build logstash-output-lmlogs.gemspec
 RUN mv logstash-output-lmlogs-*.gem release.gem

lib/logstash/outputs/lmlogs.rb

@@ -266,7 +266,9 @@ def multi_receive(events)
         if @include_metadata
          lmlogs_event = event_json
          lmlogs_event.delete("@timestamp")  # remove redundant timestamp field
-         lmlogs_event["event"].delete("original") # remove redundant log field
+         if lmlogs_event.dig("event", "original") != nil
+            lmlogs_event["event"].delete("original") # remove redundant log field
+         end 
         end
 
         lmlogs_event["message"] = event.get(@message_key).to_s

spec/outputs/lmlogs_spec.rb

@@ -4,7 +4,7 @@
 require "logstash/event"
 
 describe LogStash::Outputs::LMLogs do
-  let(:sample_event) { LogStash::Event.new("message" => "hello this is log") }
+  let(:sample_event) { LogStash::Event.new("message" => "hello this is log","event" => {"sequence" => 0,"original" => "simple logstash msg from me  running with proxy settings"})}
   let(:client) { @lmlogs.client }
   let(:sample_lm_logs_event){{"message" => "hello this is log 1", "_lm.resourceId" => {"test.property" => "host1"}, "timestamp" => "2021-03-22T04:28:55.907121106Z"}}
 
@@ -35,9 +35,9 @@
     event2 = LogStash::Event.new("message" => "hello this is log 2", "host" => "host2")
     event3 = LogStash::Event.new("message" => "hello this is log 3", "host" => "host3")
     expect(client).to receive(:post).once.with("https://localhost.logicmonitor.com/rest/log/ingest",hash_including(:body => LogStash::Json.dump(
-        [{"message" => "hello this is log 1", "_lm.resourceId" => {"test.property" => "host1"}, "timestamp" => event1.timestamp.to_s},
-        {"message" => "hello this is log 2", "_lm.resourceId" => {"test.property" => "host2"}, "timestamp" => event2.timestamp.to_s},
-        {"message" => "hello this is log 3", "_lm.resourceId" => {"test.property" => "host3"}, "timestamp" => event3.timestamp.to_s}
+        [{ "host" => "host1", "message" => "hello this is log 1","@version":"1", "_lm.resourceId" => {"test.property" => "host1"}, "timestamp" => event1.timestamp.to_s,},
+        {"host" => "host2","message" => "hello this is log 2","@version":"1", "_lm.resourceId" => {"test.property" => "host2"}, "timestamp" => event2.timestamp.to_s},
+        {"host" => "host3","message" => "hello this is log 3","@version":"1", "_lm.resourceId" => {"test.property" => "host3"}, "timestamp" => event3.timestamp.to_s}
         ]
         ))).and_call_original
     @lmlogs.multi_receive([event1, event2, event3])
@@ -66,7 +66,7 @@
     document = [sample_lm_logs_event]
 
     lm_logs_event = {"message" => "hello this is log 2", "_lm.resourceId" => {"test.property" => "host3"}, "timestamp" => "2021-03-22T04:28:55.909421106Z"}
-    
+
     document_expected = [sample_lm_logs_event,lm_logs_event]
     expect(client).to receive(:post).exactly(0).times.and_call_original