fluent-plugin-opensearch 1.1.1 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c4ad0e88f3c4bb0497f3af7d1fa669bc0a9e0820fd7ccbe32713fa86f9fdc69
-  data.tar.gz: 56626ed3aadd52c4b560fb6eb8d9a0c0070ac68178ce789a63db19c404ab39e7
+  metadata.gz: 8b8b954980a5eb5fd96702cac11352951aea3f3ed18485e151b4642f415ab026
+  data.tar.gz: aeb250f72fa691f558471d88dfde6081c24115049ec995acbc7c58a2799cbecd
 SHA512:
-  metadata.gz: 620d0a42bb7b4db1bdd32bf863697644a5afc499a4d9b071a99192cfb8c621dd863e8f35f30ae6eab6ab90e982ed5a68a2dbab83de6f7b526e44ebe419fd6c5b
-  data.tar.gz: ca2cdd6fa2a704423e7cee2c065e72075b6e0d564414d5dcc1feb08608aa303fa93b9bf57afde32ed8a6e90c707bbe2c89bcdfcf8af84aabec904d1d52222dfd
+  metadata.gz: 51a4428c631b285a8769e82cecc8d9c67e4f3f89cabb8b36520170a594e41ddda56729a6b9aaf6a43808063f6904624997a88fd522a7756dfc2cdea1e20a2b3f
+  data.tar.gz: e301856f437a3dce63d7cf3012156f5ae80234a3faa572b00c3aee2a505e50087e8dfc8f763db1f72733457225c290e102887efe46bb3ae21c0a3e849e326900

data/History.md

@@ -2,6 +2,13 @@
 
 ### [Unreleased]
 
+### 1.1.3
+ - Revert the behavior of passing duration second (#108)
+
+### 1.1.2
+ - Check OS cluster for data streams and templates for index template creation (#106)
+ - out\_opensearch\_data\_stream: Don't connect to opensearch on dry-run (#105)
+
 ### 1.1.1
  -  Pass a value of refresh\_credentials\_interval as duration\_seconds (#78)
 

data/fluent-plugin-opensearch.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
   s.name          = 'fluent-plugin-opensearch'
-  s.version       = '1.1.1'
+  s.version       = '1.1.3'
   s.authors       = ['Hiroshi Hatake']
   s.email         = ['cosmo0920.wp@gmail.com']
   s.description   = %q{Opensearch output plugin for Fluent event collector}

data/lib/fluent/plugin/out_opensearch.rb

@@ -83,7 +83,6 @@ module Fluent::Plugin
     attr_reader :template_names
     attr_reader :ssl_version_options
     attr_reader :compressable_connection
-    attr_reader :duration_seconds
 
     helpers :event_emitter, :compat_parameters, :record_accessor, :timer
 
@@ -95,7 +94,6 @@ module Fluent::Plugin
     DEFAULT_RELOAD_AFTER = -1
     DEFAULT_TARGET_BULK_BYTES = -1
     DEFAULT_POLICY_ID = "logstash-policy"
-    DEFAULT_DURATION = "5h"
 
     config_param :host, :string,  :default => 'localhost'
     config_param :port, :integer, :default => 9200
@@ -197,7 +195,7 @@ module Fluent::Plugin
       config_param :assume_role_session_name, :string, :default => "fluentd"
       config_param :assume_role_web_identity_token_file, :string, :default => nil
       config_param :sts_credentials_region, :string, :default => nil
-      config_param :refresh_credentials_interval, :time, :default => DEFAULT_DURATION
+      config_param :refresh_credentials_interval, :time, :default => "5h"
       config_param :aws_service_name, :enum, list: [:es, :aoss], :default => :es
     end
 
@@ -213,8 +211,6 @@ module Fluent::Plugin
 
     def initialize
       super
-
-      @duration_seconds = Fluent::Config.time_value(DEFAULT_DURATION)
     end
 
     ######################################################################################################
@@ -242,15 +238,13 @@ module Fluent::Plugin
             credentials = Aws::AssumeRoleCredentials.new({
                             role_arn: conf[:assume_role_arn],
                             role_session_name: conf[:assume_role_session_name],
-                            region: sts_creds_region(conf),
-                            duration_seconds: @duration_seconds
+                            region: sts_creds_region(conf)
                           }).credentials
           else
             credentials = Aws::AssumeRoleWebIdentityCredentials.new({
                             role_arn: conf[:assume_role_arn],
                             web_identity_token_file: conf[:assume_role_web_identity_token_file],
-                            region: sts_creds_region(conf),
-                            duration_seconds: @duration_seconds
+                            region: sts_creds_region(conf)
                           }).credentials
           end
         end
@@ -351,18 +345,7 @@ module Fluent::Plugin
         @_aws_credentials = aws_credentials(@endpoint)
 
         if @endpoint.refresh_credentials_interval
-          @duration_seconds = Fluent::Config.time_value(@endpoint.refresh_credentials_interval)
-          # 60 * 60 * 12 = 12 hours
-          if @duration_seconds > 43200
-            raise Fluent::ConfigError, "Maximum duration is 12 hours."
-          end
-
-          # 60 * 15 = 15 minutes
-          if @duration_seconds < 900
-            raise Fluent::ConfigError, "Minimum duration is 15 minutes."
-          end
-
-          timer_execute(:out_opensearch_expire_credentials, @duration_seconds) do
+          timer_execute(:out_opensearch_expire_credentials, @endpoint.refresh_credentials_interval) do
             log.debug('Recreate the AWS credentials')
 
             @credential_mutex.synchronize do

data/lib/fluent/plugin/out_opensearch_data_stream.rb

@@ -69,23 +69,26 @@ module Fluent::Plugin
 
     def create_index_template(datastream_name, template_name, host = nil)
       # Create index template from file
-      if @template_file
-        template_installation_actual(template_name, @customize_template, @application_name, datastream_name, host)
-      else # Create default index template
-        return if data_stream_exist?(datastream_name, host) or template_exists?(template_name, host)
-        body = {
-          "index_patterns" => ["#{datastream_name}*"],
-          "data_stream" => {},
-        }
-
-        params = {
-          name: template_name,
-          body: body
-        }
-        retry_operate(@max_retry_putting_template,
-                      @fail_on_putting_template_retry_exceed,
-                      @catch_transport_exception_on_retry) do
-          client(host).indices.put_index_template(params)
+      if !dry_run?
+        if @template_file
+          return if data_stream_exist?(datastream_name, host) or template_exists?(template_name, host)
+          template_installation_actual(template_name, @customize_template, @application_name, datastream_name, host)
+        else # Create default index template
+          return if data_stream_exist?(datastream_name, host) or template_exists?(template_name, host)
+          body = {
+            "index_patterns" => ["#{datastream_name}*"],
+            "data_stream" => {},
+          }
+
+          params = {
+            name: template_name,
+            body: body
+          }
+          retry_operate(@max_retry_putting_template,
+                        @fail_on_putting_template_retry_exceed,
+                        @catch_transport_exception_on_retry) do
+            client(host).indices.put_index_template(params)
+          end
         end
       end
     end
@@ -159,13 +162,10 @@ module Fluent::Plugin
                end
         data_stream_name = extract_placeholders(@data_stream_name, chunk).downcase
         data_stream_template_name = extract_placeholders(@data_stream_template_name, chunk).downcase
-        unless @data_stream_names.include?(data_stream_name)
-          begin
-            create_index_template(data_stream_name, data_stream_template_name, host)
-            @data_stream_names << data_stream_name
-          rescue => e
-            raise Fluent::ConfigError, "Failed to create data stream: <#{data_stream_name}> #{e.message}"
-          end
+        begin
+          create_index_template(data_stream_name, data_stream_template_name, host)
+        rescue => e
+          raise Fluent::ConfigError, "Failed to create data stream: <#{data_stream_name}> #{e.message}"
         end
       end
 

data/test/plugin/test_out_opensearch.rb

@@ -300,7 +300,6 @@ class OpenSearchOutputTest < Test::Unit::TestCase
                                       'region' => "local",
                                       'access_key_id' => 'YOUR_AWESOME_KEY',
                                       'secret_access_key' => 'YOUR_AWESOME_SECRET',
-                                      'refresh_credentials_interval' => '10h'
                                     }, []),
         Fluent::Config::Element.new('buffer', 'tag', {}, [])
 
@@ -317,8 +316,6 @@ class OpenSearchOutputTest < Test::Unit::TestCase
     assert_nil instance.endpoint.assume_role_web_identity_token_file
     assert_nil instance.endpoint.sts_credentials_region
     assert_equal :es, instance.endpoint.aws_service_name
-    assert_equal 36000, instance.endpoint.refresh_credentials_interval
-    assert_equal 36000, instance.duration_seconds
   end
 
   data("OpenSearch Service" => [:es, 'es'],

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-opensearch
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.3
 platform: ruby
 authors:
 - Hiroshi Hatake
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-21 00:00:00.000000000 Z
+date: 2023-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd