fluent-plugin-oci-logging-analytics 2.0.7 → 2.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b41804c02cd5e1dd39efc4c600f043cbed2a90972aabc39671c830fedcafe67
-  data.tar.gz: 24fc404d3f0f4d06f2e9f2167d7bc4fff337a235f9671e7e024ce71763750cb8
+  metadata.gz: e5a472e64d8b068a1d4ae4d9c8007c0cfcfae37290ec188ff6a1e7a97f9b3005
+  data.tar.gz: be3762be1e1e6794672bc9ff21871a96d6a5a82053743c6432bab4ca209e0d22
 SHA512:
-  metadata.gz: a779a1971cabf78edf2c0b14ae6ba06235ce4113fe0ded3b264d626baba6c7f82f3aabdcb029890cb52697b2b01ae119691c7412e7920c79ada71ce8ed060fff
-  data.tar.gz: ef679bc249d8d16bc12a447f158c19faea8425c98170aecfbd7053da7d4081876f2b830f7c59dcef50e4abb9422d8e2cac30e91c16bffc4cf8e33072f931fe9c
+  metadata.gz: ed1e0a0ee7201c4ad6a2b0cb632fddf155778569ff47762d12407f1bf76c431d8cffb32bdb391f84b484eaf4698d1b457c2ddfcfa4e46b61a02ff550d4c3a650
+  data.tar.gz: 685a2f9fe44d8fbe8b49c64880a2f2bafe065242e1a2700b8ac3e40cb14b66ff0aa3b3a3975a9da7d62bbec203f3fb59700f950a33fbee78ab1e1e45dc1738f6

data/lib/fluent/dto/logEvents.rb

@@ -21,5 +21,4 @@ class LogEvents
       timezone:@timezone
     }.compact
   end
-
 end

data/lib/fluent/dto/logEventsJson.rb

@@ -20,5 +20,4 @@ class LogEventsJson
       end
     }.compact
   end
-
 end

data/lib/fluent/plugin/out_oci-logging-analytics.rb

@@ -92,6 +92,8 @@ module Fluent::Plugin
     config_param :endpoint,                    :string, :default => nil
     desc 'AuthType to be used.'
     config_param :auth_type,                    :string, :default => 'InstancePrincipal'
+    desc 'OCI Domain'
+    config_param :oci_domain,                    :string, :default => nil
     desc 'Enable local payload dump.'
     config_param :dump_zip_file,                    :bool, :default => false
     desc 'Payload zip File Location.'
@@ -249,34 +251,62 @@ module Fluent::Plugin
         if is_valid(@config_file_location)
             @auth_type = "ConfigFile"
         end
+
         case @auth_type
-          when "InstancePrincipal"
-            instance_principals_signer = OCI::Auth::Signers::InstancePrincipalsSecurityTokenSigner.new
-            if is_valid(@endpoint)
-              @@loganalytics_client = OCI::LogAnalytics::LogAnalyticsClient.new(config: OCI::Config.new, endpoint: @endpoint, signer: instance_principals_signer)
-              @@logger.info {"loganalytics_client initialised with endpoint: #{@endpoint}"}
-            else
-              @@loganalytics_client = OCI::LogAnalytics::LogAnalyticsClient.new(config: OCI::Config.new, signer: instance_principals_signer)
-            end
-          when "WorkloadIdentity"
-            workload_identity_signer = OCI::Auth::Signers::oke_workload_resource_principal_signer
-            if is_valid(@endpoint)
-              @@loganalytics_client = OCI::LogAnalytics::LogAnalyticsClient.new(config: OCI::Config.new, endpoint: @endpoint, signer: workload_identity_signer)
-              @@logger.info {"loganalytics_client initialised with endpoint: #{@endpoint}"}
-            else
-              @@loganalytics_client = OCI::LogAnalytics::LogAnalyticsClient.new(config: OCI::Config.new, signer: workload_identity_signer)
-            end
-          when "ConfigFile"
-            my_config = OCI::ConfigFileLoader.load_config(config_file_location: @config_file_location, profile_name: @profile_name)
-            if is_valid(@endpoint)
-              @@loganalytics_client = OCI::LogAnalytics::LogAnalyticsClient.new(config: my_config, endpoint: @endpoint)
-              @@logger.info {"loganalytics_client initialised with endpoint: #{@endpoint}"}
-            else
-              @@loganalytics_client = OCI::LogAnalytics::LogAnalyticsClient.new(config:my_config)
-            end
+        when "InstancePrincipal"
+          instance_principals_signer = nil
+          la_endpoint = nil
+          if is_valid(@oci_domain)
+            fedration_endpoint = "https://auth.#{@oci_domain}/v1/x509"
+            instance_principals_signer = OCI::Auth::Signers::InstancePrincipalsSecurityTokenSigner.new(
+              federation_endpoint: fedration_endpoint)
+            @@logger.info "Custom Federation Endpoint: #{fedration_endpoint}"
           else
-            raise Fluent::ConfigError, "Invalid authType @auth_type, authType must be either InstancePrincipal or ConfigFile."
-            abort
+            instance_principals_signer = OCI::Auth::Signers::InstancePrincipalsSecurityTokenSigner.new
+          end
+          if is_valid(@endpoint)
+            la_endpoint = @endpoint
+            @@logger.info "Initializing loganalytics_client with endpoint: #{la_endpoint}"
+          elsif is_valid(@oci_domain)
+            la_endpoint = "https://loganalytics.#{@oci_domain}"
+            @@logger.info "Initializing loganalytics_client with custom domain endpoint: #{la_endpoint}"
+          end
+          @@loganalytics_client = OCI::LogAnalytics::LogAnalyticsClient.new(
+            config: OCI::Config.new,
+            endpoint: la_endpoint,
+            signer: instance_principals_signer)
+          @@logger.info 'loganalytics_client initialized.'
+        when "WorkloadIdentity"
+          la_endpoint = nil
+          workload_identity_signer = OCI::Auth::Signers::oke_workload_resource_principal_signer
+          if is_valid(@endpoint)
+            la_endpoint = @endpoint
+            @@logger.info "Initializing loganalytics_client with endpoint: #{@endpoint}"
+          elsif is_valid(@oci_domain)
+            la_endpoint = "https://loganalytics.#{@oci_domain}"
+            @@logger.info "Initializing loganalytics_client with custom domain endpoint: #{la_endpoint}"
+          end
+          @@loganalytics_client = OCI::LogAnalytics::LogAnalyticsClient.new(
+            config: OCI::Config.new,
+            endpoint: la_endpoint,
+            signer: workload_identity_signer)
+          @@logger.info 'loganalytics_client initialized.'
+        when "ConfigFile"
+          my_config = OCI::ConfigFileLoader.load_config(
+            config_file_location: @config_file_location,
+            profile_name: @profile_name)
+          la_endpoint = nil
+          if is_valid(@endpoint)
+            la_endpoint = @endpoint
+            @@logger.info "Initializing loganalytics_client with endpoint: #{la_endpoint}"
+          elsif is_valid(@oci_domain)
+            la_endpoint = "https://loganalytics.#{@oci_domain}"
+            @@logger.info "Initializing loganalytics_client with custom domain endpoint: #{la_endpoint}"
+          end
+          @@loganalytics_client = OCI::LogAnalytics::LogAnalyticsClient.new(config: my_config, endpoint: la_endpoint)
+          @@logger.info 'loganalytics_client initialised'
+        else
+          raise Fluent::ConfigError, "Invalid authType: #{@auth_type}, valid inputs are -  InstancePrincipal, ConfigFile, WorkloadIdentity"
         end
 
         if is_valid(@proxy_ip) && is_number(@proxy_port)
@@ -288,13 +318,18 @@ module Fluent::Plugin
         end
 
         rescue => ex
-                @@logger.error {"Error occurred while initializing LogAnalytics Client:
-                                  authType: #{@auth_type},
-                                  errorMessage: #{ex}"}
+          @@logger.error {"Error occurred while initializing LogAnalytics Client:
+                              authType: #{@auth_type},
+                              errorMessage: #{ex}"}
     end
 
     def configure(conf)
       super
+
+      if is_valid(@oci_domain) && !@oci_domain.match(/\S.oci.\S/)
+        raise Fluent::ConfigError,  "Invalid oci_domain: #{@oci_domain}, valid fmt: <oci-region>.oci.<oci-domain> | ex: us-ashburn-1.oci.oraclecloud.com"
+      end
+
       @@prometheusMetrics = PrometheusMetrics.instance
       initialize_logger
 

data/lib/fluent/version/version.rb

@@ -1,8 +1,8 @@
-## Copyright (c) 2024  Oracle and/or its affiliates.
+## Copyright (c) 2021, 2024  Oracle and/or its affiliates.
 ## The Universal Permissive License (UPL), Version 1.0 as shown at https://oss.oracle.com/licenses/upl/
 
 # frozen_string_literal: true
 
 module Version
-  VERSION = "2.0.7".freeze
+  VERSION = "2.0.8".freeze
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-oci-logging-analytics
 version: !ruby/object:Gem::Version
-  version: 2.0.7
+  version: 2.0.8
 platform: ruby
 authors:
 - Oracle
 - 'OCI Observability: Logging Analytics'
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-10 00:00:00.000000000 Z
+date: 2024-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -136,14 +136,14 @@ files:
 - lib/fluent/metrics/prometheusMetrics.rb
 - lib/fluent/plugin/out_oci-logging-analytics.rb
 - lib/fluent/version/version.rb
-homepage: 
+homepage:
 licenses:
 - UPL-1.0
 metadata:
   documentation_uri: https://docs.oracle.com/en/learn/oci_logging_analytics_fluentd/
   source_code_uri: https://github.com/oracle-quickstart/oci-logan-fluentd-output-plugin
   changelog_uri: https://github.com/oracle-quickstart/oci-logan-fluentd-output-plugin/blob/main/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -158,8 +158,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key: 
+rubygems_version: 3.3.27
+signing_key:
 specification_version: 4
 summary: Fluentd output plugin for OCI Logging Analytics.
 test_files: []