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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5a472e64d8b068a1d4ae4d9c8007c0cfcfae37290ec188ff6a1e7a97f9b3005
-  data.tar.gz: be3762be1e1e6794672bc9ff21871a96d6a5a82053743c6432bab4ca209e0d22
+  metadata.gz: fd5776c0bd11f46ba2366daaef22deeae726369f8f96071de570bb49ae6518bc
+  data.tar.gz: cd579f95bb5ca0fb80eaac9545f2b4658fed580dff45e3d6d7daa7fdb004eb94
 SHA512:
-  metadata.gz: ed1e0a0ee7201c4ad6a2b0cb632fddf155778569ff47762d12407f1bf76c431d8cffb32bdb391f84b484eaf4698d1b457c2ddfcfa4e46b61a02ff550d4c3a650
-  data.tar.gz: 685a2f9fe44d8fbe8b49c64880a2f2bafe065242e1a2700b8ac3e40cb14b66ff0aa3b3a3975a9da7d62bbec203f3fb59700f950a33fbee78ab1e1e45dc1738f6
+  metadata.gz: 3faf9d1372e1da861d7b3f5e32dc82b401379ffece838003cf5862ea380c52d6ed3d13b053470dc11bdbba18382fed71699188a832bf002635854c9f7ef47297
+  data.tar.gz: ba6c3e00de0cdf9843fc965249a1db4896b5a36632b5b6fa4a998f191ecd8247e9690aff5cde5379cb532418e94370ae8c4146f57c395d7435839b7f774cd28f

data/lib/fluent/metrics/prometheusMetrics.rb

@@ -17,15 +17,15 @@ class PrometheusMetrics
   end
   def createMetrics
     gauge = Prometheus::Client::Gauge
-    @records_received = gauge.new(:oci_la_fluentd_output_plugin_records_received, docstring: 'Number of records received by the OCI Logging Analytics Fluentd output plugin.', labels: [:worker_id,:tag,:oci_la_log_group_id,:oci_la_log_source_name,:oci_la_log_set])
-    @records_valid = gauge.new(:oci_la_fluentd_output_plugin_records_valid, docstring: 'Number of valid records received by the OCI Logging Analytics Fluentd output plugin.', labels: [:worker_id,:tag,:oci_la_log_group_id,:oci_la_log_source_name,:oci_la_log_set])
-    @records_invalid = gauge.new(:oci_la_fluentd_output_plugin_records_invalid, docstring: 'Number of invalid records received by the OCI Logging Analytics Fluentd output plugin.', labels: [:worker_id,:tag,:oci_la_log_group_id,:oci_la_log_source_name,:oci_la_log_set,:reason])
-    @records_error = gauge.new(:oci_la_fluentd_output_plugin_records_post_error, docstring: 'Number of records failed posting to OCI Logging Analytics by the Fluentd output plugin.', labels: [:worker_id,:tag,:oci_la_log_group_id,:oci_la_log_source_name,:oci_la_log_set,:error_code, :reason])
-    @records_posted = gauge.new(:oci_la_fluentd_output_plugin_records_post_success, docstring: 'Number of records posted by the OCI Logging Analytics Fluentd output plugin.', labels: [:worker_id,:tag,:oci_la_log_group_id,:oci_la_log_source_name,:oci_la_log_set])
+    @records_received = gauge.new(:oci_la_fluentd_output_plugin_records_received, docstring: 'Number of records received by the OCI Log Analytics Fluentd output plugin.', labels: [:worker_id,:tag,:oci_la_log_group_id,:oci_la_log_source_name,:oci_la_log_set])
+    @records_valid = gauge.new(:oci_la_fluentd_output_plugin_records_valid, docstring: 'Number of valid records received by the OCI Log Analytics Fluentd output plugin.', labels: [:worker_id,:tag,:oci_la_log_group_id,:oci_la_log_source_name,:oci_la_log_set])
+    @records_invalid = gauge.new(:oci_la_fluentd_output_plugin_records_invalid, docstring: 'Number of invalid records received by the OCI Log Analytics Fluentd output plugin.', labels: [:worker_id,:tag,:oci_la_log_group_id,:oci_la_log_source_name,:oci_la_log_set,:reason])
+    @records_error = gauge.new(:oci_la_fluentd_output_plugin_records_post_error, docstring: 'Number of records failed posting to OCI Log Analytics by the Fluentd output plugin.', labels: [:worker_id,:tag,:oci_la_log_group_id,:oci_la_log_source_name,:oci_la_log_set,:error_code, :reason])
+    @records_posted = gauge.new(:oci_la_fluentd_output_plugin_records_post_success, docstring: 'Number of records posted by the OCI Log Analytics Fluentd output plugin.', labels: [:worker_id,:tag,:oci_la_log_group_id,:oci_la_log_source_name,:oci_la_log_set])
 
     histogram = Prometheus::Client::Histogram
-    @chunk_time_to_receive = histogram.new(:oci_la_fluentd_output_plugin_chunk_time_to_receive, docstring: 'Average time taken by Fluentd to deliver the collected records from Input plugin to OCI Logging Analytics output plugin.', labels: [:worker_id,:tag])
-    @chunk_time_to_upload = histogram.new(:oci_la_fluentd_output_plugin_chunk_time_to_post, docstring: 'Average time taken for posting the received records to OCI Logging Analytics by the Fluentd output plugin.', labels: [:worker_id,:oci_la_log_group_id])
+    @chunk_time_to_receive = histogram.new(:oci_la_fluentd_output_plugin_chunk_time_to_receive, docstring: 'Average time taken by Fluentd to deliver the collected records from Input plugin to OCI Log Analytics output plugin.', labels: [:worker_id,:tag])
+    @chunk_time_to_upload = histogram.new(:oci_la_fluentd_output_plugin_chunk_time_to_post, docstring: 'Average time taken for posting the received records to OCI Log Analytics by the Fluentd output plugin.', labels: [:worker_id,:oci_la_log_group_id])
   end
 
   def registerMetrics

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

@@ -243,7 +243,7 @@ module Fluent::Plugin
       rescue => ex
         @@logger = log
         @@logger.error {"Error while initializing logger:#{ex.inspect}"}
-        @@logger.info {"Redirecting oci logging analytics logs to STDOUT"}
+        @@logger.info {"Redirecting oci log analytics logs to STDOUT"}
       end
     end
 
@@ -277,20 +277,49 @@ module Fluent::Plugin
             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
+          workload_identity_signer = OCI::Auth::Signers.oke_workload_resource_principal_signer
+          region = nil
+          config = OCI::Config.new
+
+          if is_valid(@oci_domain)
+            region_match = @oci_domain.match(/^([^.]+)\.oci\./)
+            region = region_match[1]
+            @@logger.info "Extracted region from oci_domain: #{region}"
+          else
+            begin
+              tmp_signer = OCI::Auth::Signers::InstancePrincipalsSecurityTokenSigner.new
+              if tmp_signer.region
+                region = tmp_signer.region
+                @@logger.info "Extracted region from IMDS: #{region}"
+              else
+                raise Fluent::ConfigError, "IMDS returned nil region. " \
+                    "Please provide 'oci_domain' parameter (e.g., us-ashburn-1.oci.oraclecloud.com)."
+              end
+            rescue Fluent::ConfigError
+              raise
+            rescue => e
+              raise Fluent::ConfigError, "Unable to determine region. " \
+              "IMDS not available: #{e.message}. " \
+              "Please provide 'oci_domain' parameter (e.g., us-ashburn-1.oci.oraclecloud.com)."
+            end
+          end
           if is_valid(@endpoint)
             la_endpoint = @endpoint
-            @@logger.info "Initializing loganalytics_client with endpoint: #{@endpoint}"
+            @@logger.info "Using custom endpoint"
           elsif is_valid(@oci_domain)
             la_endpoint = "https://loganalytics.#{@oci_domain}"
-            @@logger.info "Initializing loganalytics_client with custom domain endpoint: #{la_endpoint}"
+            @@logger.info "Using oci_domain endpoint"
+          else
+            la_endpoint = nil
+            @@logger.info "Using SDK default endpoint"
           end
+          config.region = region
+
           @@loganalytics_client = OCI::LogAnalytics::LogAnalyticsClient.new(
-            config: OCI::Config.new,
+            config: config,
             endpoint: la_endpoint,
             signer: workload_identity_signer)
-          @@logger.info 'loganalytics_client initialized.'
+          @@logger.info 'loganalytics_client initialized with WorkloadIdentity.'
         when "ConfigFile"
           my_config = OCI::ConfigFileLoader.load_config(
             config_file_location: @config_file_location,
@@ -326,8 +355,9 @@ module Fluent::Plugin
     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"
+      if is_valid(@oci_domain) && !@oci_domain.match(/^[a-z0-9-]+\.oci\.[a-z0-9.]+[a-z0-9]$/i)
+        raise Fluent::ConfigError, "Invalid oci_domain: #{@oci_domain}, " \
+            "valid format: <region>.oci.<domain> (e.g., us-ashburn-1.oci.oraclecloud.com)"
       end
 
       @@prometheusMetrics = PrometheusMetrics.instance

data/lib/fluent/version/version.rb

@@ -4,5 +4,5 @@
 # frozen_string_literal: true
 
 module Version
-  VERSION = "2.0.8".freeze
+  VERSION = "2.1.0".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-oci-logging-analytics
 version: !ruby/object:Gem::Version
-  version: 2.0.8
+  version: 2.1.0
 platform: ruby
 authors:
 - Oracle
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-18 00:00:00.000000000 Z
+date: 2026-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -121,8 +121,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.3
-description: OCI Logging Analytics Fluentd output plugin for ingesting the collected
-  log events to OCI Logging Analytics.
+description: Fluentd output plugin for ingesting the collected log events to OCI Log
+  Analytics (previously known as OCI Logging Analytics).
 email:
 - oci_la_plugins_grp@oracle.com
 executables: []
@@ -161,5 +161,5 @@ requirements: []
 rubygems_version: 3.3.27
 signing_key:
 specification_version: 4
-summary: Fluentd output plugin for OCI Logging Analytics.
+summary: Fluentd output plugin for OCI Log Analytics.
 test_files: []