fluent-plugin-site24x7 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2391265977dd8a33dde6dab1876296406fae59c7633aa0ec0045821bb5688f1
-  data.tar.gz: 6bd7a51fca919c3c38c4f12cf226f403772c473d12f8c2a716f72ccb844f5ec7
+  metadata.gz: a33475317d8f77918035c64d70be3fbeb32ea214554da51753f83b51904c7f68
+  data.tar.gz: 31284ae4e2d074f1545c7bb6641886bc12b3a4ca2ed6fd5de2a12e319409a2bc
 SHA512:
-  metadata.gz: aab17017da06b62df8c7ebc8b2ee5e045e9833687945fd1f262890bd32bc9478f58208e1e07675e4295dd5c05fc6691bad50a19c35ea635c50d627438bb6dd01
-  data.tar.gz: de638056920dcc7cce4a00c1bddad3a4628ce5342e3b837e430d599f5f0db949ffcd81ff18efa55eca2e2d07b8dec761f3bd673367a076af3c69e8dcee6dd7ef
+  metadata.gz: c90315b127043a5ce466c5af1aada7b26fa15614b4e498fd802ef3b88bf145d56dd8fe6e8f038b564750bc5b9d40d3be5f2c83de6c2dfcfd3ee09f5e199b7d6b
+  data.tar.gz: 75c9d7cc52685aef20717a37e544dd7adc4b31951fa984449ec9ee7f23f58366ebf85bde6f54716008d88c2923d6013fb6ad836d76807a9550d1b2a2e9037298

data/README.md

@@ -1,6 +1,6 @@
 # Fluentd output plugin for Site24x7
 
-This output plugin allows parse and sending logs directly from Fluentd to Site2x7 - so you don't have to use a separate log shipper.
+With Site24x7 plugin for Fluentd, you can parse and send logs directly from Fluentd, without having to use a separate log shipper.
 
 
 ## Installation
@@ -10,7 +10,7 @@ To add the plugin to your fluentd agent, use the following command:
 ```
 $ gem install fluent-plugin-site24x7
 ```
-If you installed the td-agent instead
+If you have installed the td-agent instead
 
 ```
 $ /usr/sbin/td-agent-gem install fluent-plugin-site24x7
@@ -20,7 +20,7 @@ $ /usr/sbin/td-agent-gem install fluent-plugin-site24x7
 
 **Configure the output plugin**
 
-To match events and send them to Site24x7, simply add the following code to your configuration file.
+To match events and send them to Site24x7, add the following code to your configuration file.
 
 ```cfg
 # Match events tagged with "site24x7.**" and send them to Site24x7
@@ -49,21 +49,22 @@ To match events and send them to Site24x7, simply add the following code to your
 
 </match>
 ```
-After a restart of FluentD, any events tagged with site24x7 are shipped to site24x7 platform.
+After restarting FluentD, any events tagged with site24x7 are shipped to Site24x7 platform.
 
 ## Parameters
-As fluent-plugin-site24x7 is an output_buffer, you can set all output_buffer properties like it's describe in the [fluentd documentation](http://docs.fluentd.org/articles/output-plugin-overview#buffered-output-parameters).
+As fluent-plugin-site24x7 is an output_buffer, you can set all the output_buffer properties like it's described in the [fluentd documentation](http://docs.fluentd.org/articles/output-plugin-overview#buffered-output-parameters).
 
 Property | Description | Default Value
 ------------ | -------------|------------
-log_type_config | log_type_config for your configured log type in site24x7 | nil
-max_retry | How many times to resend failed uploads | 3
-retry_interval |  How long to sleep initially between retries, exponential step-off | 2 seconds
-http_idle_timeout | Timeout in seconds that the http persistent connection will stay open without traffic | 5 seconds
-http_read_timeout | Timeout in seconds when the socket connects until the connection breaks | 30 secods
+log_type_config | log_type_config of your configured log type in site24x7 | nil
+max_retry | Number of times to resend failed uploads | 3
+retry_interval |  Time interval to sleep initially between retries, exponential step-off | 2 seconds
+http_idle_timeout | Timeout (in seconds) for which http persistent connection will stay open without traffic | 5 seconds
+http_read_timeout | Timeout (in seconds) when the socket connects until the connection breaks | 30 secods
 http_proxy | Your proxy uri | nil
 
 ## Release Notes
-
+* 0.1.2 - Timezone parsing issue fixed
+* 0.1.1 - Minor changes
 * 0.1.0 - Initial Release
 

data/fluent-plugin-site24x7.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name    = "fluent-plugin-site24x7"
-  spec.version = "0.1.2"
+  spec.version = "0.1.3"
   spec.authors = ["Magesh Rajan"]
   spec.email   = ["magesh.rajan@zohocorp.com"]
 

data/lib/fluent/plugin/out_site24x7.rb

@@ -210,7 +210,7 @@ class Fluent::Site24x7Output < Fluent::Plugin::Output
         if !line.empty?
           current_log_size = 0
 	  formatted_line = {}
-	  event_obj = Yajl::Parser.parse(line)
+          event_obj = if line.is_a?(String) then Yajl::Parser.parse(line) else line end
 	  @logtype_config['jsonPath'].each do |path_obj|
 	    value = get_json_value(event_obj, path_obj[if path_obj.has_key?'key' then 'key' else 'name' end], path_obj['type'])
             if value
@@ -231,7 +231,7 @@ class Fluent::Site24x7Output < Fluent::Plugin::Output
 
   def format(tag, time, record)
     if @valid_logtype && (@log_upload_allowed || (time.to_i - @log_upload_stopped_time > S247_LOG_UPLOAD_CHECK_INTERVAL))
-       [record['message']].to_msgpack
+      if !@logtype_config.has_key?'jsonPath' then [record['message']].to_msgpack  else [record].to_msgpack end
     end
   end
 
@@ -262,7 +262,7 @@ class Fluent::Site24x7Output < Fluent::Plugin::Output
     current_batch = []
     current_batch_size = 0
     encoded_events.each_with_index do |encoded_event, i|
-      current_event_size = encoded_event.bytesize
+      current_event_size = String(encoded_event).bytesize
       if current_event_size > S247_MAX_RECORD_SIZE
         encoded_event = encoded_event[0..(S247_MAX_RECORD_SIZE-DD_TRUNCATION_SUFFIX.length)]+DD_TRUNCATION_SUFFIX
         current_event_size = encoded_event.bytesize

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-site24x7
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Magesh Rajan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-12 00:00:00.000000000 Z
+date: 2021-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -152,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.24
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Site24x7 output plugin for Fluent event collector.