fluent-plugin-oci-logging 1.0.2 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff4390e3b3e77082712da61a486e9bf756a55e849053490e03eb884a260e0d5b
-  data.tar.gz: 2e232b1bf8c667db6d4d2a96d9746b1a71a26d056e126a8b79eda83e3abaf5ed
+  metadata.gz: 55daadb06cc22cae55a16a6be2762e40fcd71e237b15ffa9e26cc58124e116f9
+  data.tar.gz: 2c24aaa6537aab53d7ed4dc6c968d67331e4424f1fc6a11c6ebc003d81694ab6
 SHA512:
-  metadata.gz: 382946fb56ed0575bc5e7996c96f92abec7c59efaee23fba3a2e76077d280ed6ff22f555732e27ca6959f19f26a6961bf0298277da02d775ac5d48f8623ddc09
-  data.tar.gz: 985ec4b0de8339aa19a33e03d6c67399137ca16f248657bc7b8216867f6e4c12577f9b1e9bd2d8114b7fe948f78fa860fe6b48ac342e42b773cc344407a633af
+  metadata.gz: 363ef60bba7cf8501dd0b582c29460c5f03d84b51640ec2b198a453f468ba4c4f2fd895c7072a69c59fa3e31bda300e97a84152247f5fb928b4b8fc89dcb4ed7
+  data.tar.gz: e002ac4789e72e53076ffb7c1e9a3157d67e24c886e909acf930d7ab4a20bb071b8f5c07354b288453af57cadbe628dc03d89c6e68a0427dc715a1d82e305715

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/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

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.5
 platform: ruby
 authors:
 - OCI Observability Team
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-25 00:00:00.000000000 Z
+date: 2022-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -171,7 +171,7 @@ licenses:
 - Apache-2.0
 metadata:
   source_code_uri: https://github.com/oracle/fluent-plugin-oci-logging
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -186,8 +186,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: OCI Fluentd Logging output plugin following Unified Schema
 test_files: []