logstash-output-scalyr 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f02a9ffc8738ad5eef45acc94337eaa36f3e567883429b761691318f40de5eda
-  data.tar.gz: 124d1ced3db2cbf8ad6a38b196f1697f75b2852bc9b55585c19dc6a87a72469a
+  metadata.gz: 90d9ce5222a3ea4241a086f8d57ed969afa5af0edb4dfbe47d55af214318d354
+  data.tar.gz: f948a285cfdc401090c66133423bad1db96678c108ba7d508bd76010eb9cf5ac
 SHA512:
-  metadata.gz: aa3669f7d0fe767ae50b7e4ac82448d2cd08ca850276b66b2b9d9dd4d0a06f17d32e45b07a1b4980dc41211b314e307c447d9b26bf8adb10e5db5c7c65677e13
-  data.tar.gz: 62d214449bba6046617016291a2da8be3df21a6505f891ec0afc2d647b777e80fb64db01b0882565e591e4aa7de6fd2ad3d5eab921669c801521a1f85235c4db
+  metadata.gz: 4c32b4fc84c642fe54918869479b288adc5f709a4b5d151b27cf52e75f00c4eeb6b96134ae210b935ea9aed628692ad77aa47322b2d72d5b75ba48f1526dd554
+  data.tar.gz: d572c2fcfbdc3a0b9c2fbd3af035803a75de55d2f8f95abc4ce398fecb7fb290b7e90cedf9b771e7d5dcd4fd5759d7fdd312f7ea00f27b9df680ccfed9b79689

data/README.md

@@ -10,7 +10,7 @@ You can view documentation for this plugin [on the Scalyr website](https://app.s
 # Quick start
 
 1. Build the gem, run `gem build logstash-output-scalyr.gemspec` 
-2. Install the gem into a Logstash installation, run `/usr/share/logstash/bin/logstash-plugin install logstash-output-scalyr-0.1.4.gem` or follow the latest official instructions on working with plugins from Logstash.
+2. Install the gem into a Logstash installation, run `/usr/share/logstash/bin/logstash-plugin install logstash-output-scalyr-0.1.5.gem` or follow the latest official instructions on working with plugins from Logstash.
 3. Configure the output plugin (e.g. add it to a pipeline .conf)
 4. Restart Logstash 
 

data/lib/logstash/outputs/scalyr.rb

@@ -110,6 +110,7 @@ class LogStash::Outputs::Scalyr < LogStash::Outputs::Base
 
   public
   def register
+    @node_hostname = Socket.gethostname
 
     if @log_constants and not @log_constants.all? { |x| x.is_a? String }
       raise LogStash::ConfigurationError, "All elements of 'log_constants' must be strings."
@@ -157,7 +158,7 @@ class LogStash::Outputs::Scalyr < LogStash::Outputs::Base
       # Note: Use strings rather than symbols for the key, because keys coming
       # from the config file will be strings
       unless @server_attributes.key? 'serverHost'
-        @server_attributes['serverHost'] = Socket.gethostname
+        @server_attributes['serverHost'] = @node_hostname
       end
     end
 
@@ -361,16 +362,25 @@ class LogStash::Outputs::Scalyr < LogStash::Outputs::Base
 
       # Rename user-specified serverHost field -> 'serverHost'
       rename.call(@serverhost_field, 'serverHost')
-      record.delete(@serverhost_field)
 
       # Rename user-specified logfile field -> 'logfile'
       rename.call(@logfile_field, 'logfile')
-      record.delete(@logfile_field)
+
+      # Set a default parser is none is present in the event
+      if record['parser'].to_s.empty?
+        record['parser'] = "logstashParser"
+      end
+
       # Set logfile field if empty and serverHost is supplied
       if record['logfile'].to_s.empty? and serverHost
         record['logfile'] = "/logstash/#{serverHost}"
       end
 
+      # Set a default if no serverHost value is present.
+      if serverHost.nil?
+        record['serverHost'] = "Logstash"
+      end
+
       log_identifier = nil
       add_log = false
       if serverHost
@@ -562,6 +572,7 @@ class LogStash::Outputs::Scalyr < LogStash::Outputs::Base
 
     if !@last_status_transmit_time
       status_event[:attrs]['message'] = "Started Scalyr LogStash output plugin."
+      status_event[:attrs]['serverHost'] = @node_hostname
     else
       cur_time = Time.now()
       return if (cur_time.to_i - @last_status_transmit_time.to_i) < 300
@@ -575,6 +586,7 @@ class LogStash::Outputs::Scalyr < LogStash::Outputs::Base
         cnt += 1
       end
       status_event[:attrs]['message'] = msg
+      status_event[:attrs]['serverHost'] = @node_hostname
     end
     multi_event_request = create_multi_event_request([status_event], nil, nil)
     @client_session.post_add_events(multi_event_request[:body])

data/lib/scalyr/common/client.rb

@@ -227,7 +227,7 @@ class ClientSession
 
     post = Net::HTTP::Post.new uri_path
     post.add_field('Content-Type', 'application/json')
-    version = 'output-logstash-scalyr 0.1.4'
+    version = 'output-logstash-scalyr 0.1.5'
     post.add_field('User-Agent', version + ';' + RUBY_VERSION + ';' + RUBY_PLATFORM)
 
     if not encoding.nil?

data/logstash-output-scalyr.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-output-scalyr'
-  s.version         = '0.1.4'
+  s.version         = '0.1.5'
   s.licenses = ['Apache-2.0']
   s.summary = "Scalyr output plugin for Logstash"
   s.description     = "Sends log data collected by Logstash to Scalyr (https://www.scalyr.com)"

data/spec/logstash/outputs/scalyr_spec.rb

@@ -116,9 +116,11 @@ describe LogStash::Outputs::Scalyr do
                                                      'seq' => 3,
                                                      'source_file' => 'my file 3',
                                                      'source_host' => 'my host 3',
+                                                     'serverHost' => 'Logstash',
                                                      "tag_prefix_t1" => "true",
                                                      "tag_prefix_t2" => "true",
                                                      "tag_prefix_t3" => "true",
+                                                     "parser" => "logstashParser",
                                                  })
       end
     end
@@ -139,7 +141,9 @@ describe LogStash::Outputs::Scalyr do
                                                      'seq' => 3,
                                                      'source_file' => 'my file 3',
                                                      'source_host' => 'my host 3',
+                                                     'serverHost' => 'Logstash',
                                                      "tags" => ["t1", "t2", "t3"],
+                                                     "parser" => "logstashParser",
                                                  })
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-scalyr
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Edward Chee
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-10 00:00:00.000000000 Z
+date: 2020-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement