fluent-plugin-oci-logging-analytics 2.0.0 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dde9a7a3e6be01a2556efa148f43934c2c723ffce544d3c11af1c50fe46f06b7
-  data.tar.gz: b442ff6c28ef6bc1c3ddc6d74c6b48e30c9921902607f9581c0aa116e5ba9db2
+  metadata.gz: 370ab2ca02c76665077069c52e02b97297b238a990bd0ba9475f86e588fb76c5
+  data.tar.gz: 0a0428639be123f7f908132d2965d6ceabb15054ea080e239b6da3e19b4ad7a6
 SHA512:
-  metadata.gz: a106761ec570d6c14435544617bf2357846b022869ef7c6154463b848cf72eeedbc96080a7d819911518818864379655aaa7668c4bad46d4d45a80a10dffc40f
-  data.tar.gz: dd7fcd53fd707c1c365cd8c5cbe1f4d6612d27b0de201d9ed2e1a98235322b08cdb7c4d15f968fa3bc667175e226cae1022673c36ba6409ee73bbe0e703417aa
+  metadata.gz: 8062761ad58799206282392787e6fe9440bb58f1b29a2ac692b6212e08fedc7cb6fd9c4b3b992fe56e8e02d6bc211defe92a51fb04f5a50ea49581d004eb10b6
+  data.tar.gz: ddbdfe55b2ee221112e6accdfb113bfda2a585d624efc6f5489ddc0953816784d1dad9d126f34b011ce93494a1b112f9ee24d42d58d80dbfab559efa6f07b6c1

data/lib/fluent/dto/logEvents.rb

@@ -1,3 +1,5 @@
+## Copyright (c) 2021, 2022  Oracle and/or its affiliates.
+## The Universal Permissive License (UPL), Version 1.0 as shown at https://oss.oracle.com/licenses/upl/
 
 class LogEvents
   attr_accessor :entityId, :entityType, :logSourceName, :logPath, :logRecords , :metadata

data/lib/fluent/dto/logEventsJson.rb

@@ -1,3 +1,5 @@
+## Copyright (c) 2021, 2022  Oracle and/or its affiliates.
+## The Universal Permissive License (UPL), Version 1.0 as shown at https://oss.oracle.com/licenses/upl/
 
 require_relative './logEvents'
 

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

@@ -1,14 +1,52 @@
-## Copyright (c) 2021  Oracle and/or its affiliates.
+## Copyright (c) 2021, 2022  Oracle and/or its affiliates.
 ## The Universal Permissive License (UPL), Version 1.0 as shown at https://oss.oracle.com/licenses/upl/
 
 require 'fluent/plugin/output'
 require "benchmark"
 require 'zip'
-require 'oci'
+
 require 'logger'
 require_relative '../dto/logEventsJson'
 require_relative '../dto/logEvents'
 
+# Import only specific OCI modules to improve load times and reduce the memory requirements.
+require 'oci/auth/auth'
+require 'oci/log_analytics/log_analytics'
+require 'oci/log_analytics/log_analytics_client'
+
+# Workaround until OCI SDK releases a proper fix to load only specific service related modules/client.
+require 'oci/api_client'
+require 'oci/api_client_proxy_settings'
+require 'oci/config'
+require 'oci/config_file_loader'
+require 'oci/errors'
+require 'oci/global_context'
+require 'oci/internal/internal'
+require 'oci/regions'
+require 'oci/regions_definitions'
+require 'oci/response_headers'
+require 'oci/response'
+require 'oci/base_signer'
+require 'oci/signer'
+require 'oci/version'
+require 'oci/waiter'
+require 'oci/retry/retry'
+require 'oci/object_storage/object_storage'
+
+module OCI
+   class << self
+     attr_accessor :sdk_name
+
+     # Defines the logger used for debugging for the OCI module.
+     # For example, log to STDOUT by setting this to Logger.new(STDOUT).
+     #
+     # @return [Logger]
+     attr_accessor :logger
+   end
+ end
+
+OracleBMC = OCI
+
 module Fluent::Plugin
   class OutOracleOCILogAnalytics < Output
     Fluent::Plugin.register_output('oci-logging-analytics', self)
@@ -916,4 +954,4 @@ module Fluent::Plugin
       end
     end
   end
-end
+end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-oci-logging-analytics
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.2
 platform: ruby
 authors:
-- OCI Logging Analytics Team
+- Oracle
+- 'OCI Observability: Logging Analytics'
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-14 00:00:00.000000000 Z
+date: 2022-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -86,22 +87,24 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.13'
-description: Fluentd Output plugin to ship logs/events to OCI Logging Analytics.
+description: OCI Logging Analytics Fluentd output plugin for ingesting the collected
+  log events to OCI Logging Analytics.
 email:
-- oci_la_plugins@oracle.com
+- oci_la_plugins_grp@oracle.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - lib/fluent/dto/logEvents.rb
 - lib/fluent/dto/logEventsJson.rb
-- lib/fluent/metrics/metricsLabels.rb
-- lib/fluent/metrics/prometheusMetrics.rb
 - lib/fluent/plugin/out_oci-logging-analytics.rb
 homepage: 
 licenses:
 - UPL-1.0
-metadata: {}
+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: 
 rdoc_options: []
 require_paths:
@@ -110,15 +113,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: Fluentd Output plugin to ship logs/events to OCI Logging Analytics.
+summary: Fluentd output plugin for OCI Logging Analytics.
 test_files: []

data/lib/fluent/metrics/metricsLabels.rb

@@ -1,11 +0,0 @@
-class MetricsLabels
-  attr_accessor :tag, :logGroupId, :logSourceName, :logSet, :drop_reason, :records_valid
-  def initialize
-      @tag = nil
-      @logGroupId = nil
-      @logSourceName = nil
-      @logSet = nil
-      @drop_reason = nil
-      @records_valid = 0
-    end
-end

data/lib/fluent/metrics/prometheusMetrics.rb

@@ -1,41 +0,0 @@
-require 'prometheus/client'
-require 'prometheus/client/registry'
-require 'prometheus/client/gauge'
-require 'prometheus/client/histogram'
-require 'singleton'
-
-class PrometheusMetrics
-  include Singleton
-  attr_accessor :records_received, :records_valid, :records_dropped, :records_error, :records_posted,
-                :bytes_received, :bytes_posted, :latency_avg, :chunk_upload_time_taken
-  def initialize
-    createMetrics
-    registerMetrics
-  end
-  def createMetrics
-    gauge = Prometheus::Client::Gauge
-    @records_received = gauge.new(:oci_logging_analytics_records_received, docstring: '...', labels: [:tag,:logGroupId,:logSourceName,:logSet])
-    @records_valid = gauge.new(:oci_logging_analytics_records_valid, docstring: '...', labels: [:tag,:logGroupId,:logSourceName,:logSet])
-    @records_dropped = gauge.new(:oci_logging_analytics_records_dropped, docstring: '...', labels: [:tag,:logGroupId,:logSourceName,:logSet,:drop_reason])
-    @records_error = gauge.new(:oci_logging_analytics_records_error, docstring: '...', labels: [:tag,:logGroupId,:logSourceName,:logSet,:error_code, :error_reason])
-    @records_posted = gauge.new(:oci_logging_analytics_records_posted, docstring: '...', labels: [:tag,:logGroupId,:logSourceName,:logSet])
-    @bytes_received = gauge.new(:oci_logging_analytics_bytes_received, docstring: '...', labels: [:tag])
-    @bytes_posted = gauge.new(:oci_logging_analytics_bytes_posted, docstring: '...', labels: [:logGroupId])
-    histogram = Prometheus::Client::Histogram
-    @latency_avg = histogram.new(:oci_logging_analytics_network_latency_avg, docstring: '...', labels: [:tag])
-    @chunk_upload_time_taken = histogram.new(:oci_logging_analytics_chunk_upload_time_taken, docstring: '...', labels: [:logGroupId])
-  end
-
-  def registerMetrics
-    registry = Prometheus::Client.registry
-    registry.register(@records_received) unless registry.exist?('oci_logging_analytics_records_received')
-    registry.register(@records_valid) unless registry.exist?('oci_logging_analytics_records_valid')
-    registry.register(@records_dropped) unless registry.exist?('oci_logging_analytics_records_dropped')
-    registry.register(@records_error) unless registry.exist?('oci_logging_analytics_records_error')
-    registry.register(@records_posted) unless registry.exist?('oci_logging_analytics_records_posted')
-    registry.register(@bytes_received) unless registry.exist?('oci_logging_analytics_bytes_received')
-    registry.register(@bytes_posted) unless registry.exist?('oci_logging_analytics_bytes_valid')
-    registry.register(@latency_avg) unless registry.exist?('oci_logging_analytics_network_latency_avg')
-    registry.register(@chunk_upload_time_taken) unless registry.exist?('oci_logging_analytics_chunk_upload_time_taken')
-  end
-end