fluent-plugin-oci-logging 1.0.2 → 1.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff4390e3b3e77082712da61a486e9bf756a55e849053490e03eb884a260e0d5b
-  data.tar.gz: 2e232b1bf8c667db6d4d2a96d9746b1a71a26d056e126a8b79eda83e3abaf5ed
+  metadata.gz: 8da08ff601b50140201c74c6b8fc5a15da8f25288315ceee1b42382e5a051d55
+  data.tar.gz: 37e3601768a8b5eee329b72775683a18afe50c90f9c2741d3a0aa2d6ae4d3f93
 SHA512:
-  metadata.gz: 382946fb56ed0575bc5e7996c96f92abec7c59efaee23fba3a2e76077d280ed6ff22f555732e27ca6959f19f26a6961bf0298277da02d775ac5d48f8623ddc09
-  data.tar.gz: 985ec4b0de8339aa19a33e03d6c67399137ca16f248657bc7b8216867f6e4c12577f9b1e9bd2d8114b7fe948f78fa860fe6b48ac342e42b773cc344407a633af
+  metadata.gz: '0293f60930bf42b4fed3411ba74dd9389e8d8138d9ee512ae09c8b00c55e57b96c8a3c0e9c2b1fc59ff83e8daff49239d5ba1f592a10721a2c350db624ced0a9'
+  data.tar.gz: 433fe08996fcbd80888fdb476acb5d904eda926f08d5cfd98e12bf454fd337ae87b1efa3b991ee9eec2f921e6e0f866322d8133d3eceec696c9e7f34315d8813

data/lib/fluent/plugin/logging_setup.rb

@@ -27,6 +27,7 @@ module Fluent
       PUBLIC_DEFAULT_LINUX_CA_PATH = '/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem'
       PUBLIC_DEFAULT_WINDOWS_CA_PATH = 'C:\\oracle_unified_agent\\unified-monitoring-agent\\embedded\\ssl\\certs\\cacert.pem'
       PUBLIC_DEFAULT_UBUNTU_CA_PATH = '/etc/ssl/certs/ca-certificates.crt'
+      PUBLIC_DEFAULT_DEBIAN_CA_PATH = PUBLIC_DEFAULT_UBUNTU_CA_PATH
 
       def logger
         @log ||= OS.windows? ? Logger.new(WINDOWS_UPLOADER_OUTPUT_LOG) : Logger.new($stdout)
@@ -219,10 +220,13 @@ module Fluent
       # Since r1 overlay has a different default make sure to update this
       #
       def set_default_ca_file
+        @ca_file = PUBLIC_DEFAULT_LINUX_CA_PATH if @ca_file.nil?
         if OS.windows?
           @ca_file = @ca_file == PUBLIC_DEFAULT_LINUX_CA_PATH ? PUBLIC_DEFAULT_WINDOWS_CA_PATH : @ca_file
         elsif OS.ubuntu?
           @ca_file = @ca_file == PUBLIC_DEFAULT_LINUX_CA_PATH ? PUBLIC_DEFAULT_UBUNTU_CA_PATH : @ca_file
+        elsif OS.debian?
+          @ca_file = @ca_file == PUBLIC_DEFAULT_LINUX_CA_PATH ? PUBLIC_DEFAULT_DEBIAN_CA_PATH : @ca_file
         else
           @ca_file = @region == 'r1' && @ca_file == PUBLIC_DEFAULT_LINUX_CA_PATH ? R1_CA_PATH : @ca_file
         end

data/lib/fluent/plugin/logging_utils.rb

@@ -43,7 +43,7 @@ module Fluent
 
         # create lumberjack request records
         logentry = ::OCI::Loggingingestion::Models::LogEntry.new
-        logentry.time = Time.at(time).strftime('%FT%T.%LZ')
+        logentry.time = Time.at(time).utc.strftime('%FT%T.%LZ')
         begin
           logentry.data = content.to_json
         rescue StandardError
@@ -67,7 +67,7 @@ module Fluent
           log_entry_batch.source = @hostname
           log_entry_batch.type = PUBLIC_LOGGING_PREFIX + tagpath
           log_entry_batch.subject = sourceidentifier
-          log_entry_batch.defaultlogentrytime = Time.at(time).strftime('%FT%T.%LZ')
+          log_entry_batch.defaultlogentrytime = Time.at(time).utc.strftime('%FT%T.%LZ')
           log_entry_batch.entries = []
 
           log_batches_map[requestkey] = log_entry_batch

data/lib/fluent/plugin/os.rb

@@ -27,6 +27,10 @@ module OS
     linux? and os_name_ubuntu?
   end
 
+  def self.debian?
+    linux? and os_name_debian?
+  end
+
   def self.os_name_ubuntu?
     os_name = 'not_found'
     file_name = '/etc/os-release'
@@ -45,4 +49,22 @@ module OS
     false
   end
 
+  def self.os_name_debian?
+    os_name = 'not_found'
+    file_name = '/etc/os-release'
+    if File.exists?(file_name)
+      File.foreach(file_name).each do |line|
+        if line.start_with?('ID=')
+          os_name = line.split('=')[1].strip
+        end
+      end
+    else
+      logger.info('Unknown linux distribution detected')
+    end
+    os_name == 'debian' ? true : false
+  rescue StandardError => e
+    log.error "Unable to detect ubuntu platform due to: #{e.message}"
+    false
+  end
+
 end

data/lib/fluent/plugin/out_oci_logging.rb

@@ -42,6 +42,8 @@ module Fluent
 
       helpers :event_emitter
 
+      PAYLOAD_SIZE = 9*1024*1024 #restricting payload size at 9MB
+
       def configure(conf)
         super
         log.debug 'determining the signer type'
@@ -73,19 +75,30 @@ module Fluent
         log.debug "writing chunk metadata #{chunk.metadata}", \
                   dump_unique_id_hex(chunk.unique_id)
         log_batches_map = {}
-
-        # For standard chunk format (without #format() method)
+        # For standard chunk format (without #format() method) 
+        size = 0 
         chunk.each do |time, record|
           begin
             tag = get_modified_tag(chunk.metadata.tag)
             source_identifier = record.key?('tailed_path') ? record['tailed_path'] : ''
+            content = flatten_hash(record)
+            size += content.to_json.bytesize
             build_request(time, record, tag, log_batches_map, source_identifier)
+            if size >= PAYLOAD_SIZE
+              log.info "Exceeding payload size. Size : #{size}"
+              send_requests(log_batches_map)
+              log_batches_map = {}
+              size = 0
+            end
           rescue StandardError => e
             log.error(e.full_message)
           end
         end
-
-        send_requests(log_batches_map)  # flush data
+        # flushing data to LJ
+        unless log_batches_map.empty?
+          log.info "Payload size : #{size}"
+          send_requests(log_batches_map)
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-oci-logging
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.12
 platform: ruby
 authors:
 - OCI Observability Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-25 00:00:00.000000000 Z
+date: 2022-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -186,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: OCI Fluentd Logging output plugin following Unified Schema