fluent-plugin-opensearch 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c4ad0e88f3c4bb0497f3af7d1fa669bc0a9e0820fd7ccbe32713fa86f9fdc69
-  data.tar.gz: 56626ed3aadd52c4b560fb6eb8d9a0c0070ac68178ce789a63db19c404ab39e7
+  metadata.gz: 1b8cc79e0b3618ac9af026312e4d73784ea6bc939e944f03bcae487a239a3106
+  data.tar.gz: 67a5c76a80dc1f00bb13febd1feac5ab029393934d8f2e60b74f6af9c96e03d4
 SHA512:
-  metadata.gz: 620d0a42bb7b4db1bdd32bf863697644a5afc499a4d9b071a99192cfb8c621dd863e8f35f30ae6eab6ab90e982ed5a68a2dbab83de6f7b526e44ebe419fd6c5b
-  data.tar.gz: ca2cdd6fa2a704423e7cee2c065e72075b6e0d564414d5dcc1feb08608aa303fa93b9bf57afde32ed8a6e90c707bbe2c89bcdfcf8af84aabec904d1d52222dfd
+  metadata.gz: 2dadfc649ab1f9836031963ee85cdfc739029f71f35bdbd44b55f61c35351ffe1f84b64f118d6adf16ae866ebb9bc479fdcce3d71d2d0f83baba2f4fba013e80
+  data.tar.gz: e3a1a7df140ec59197d231b86a291dd1686d47ab2817da3983e3e9931b5e71e5994b138a6b2f10e1191a9f4deaba458c5cd221e541e66cbd534f533de85ec633

data/History.md

@@ -2,6 +2,10 @@
 
 ### [Unreleased]
 
+### 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.2'
   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_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
 

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.2
 platform: ruby
 authors:
 - Hiroshi Hatake
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-21 00:00:00.000000000 Z
+date: 2023-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd