build: support OpenSearch and OpenDistro at the same time

uselagoon · Dec 18, 2024 · f56573c · f56573c
1 parent b9239f4
commit f56573c
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 41 deletions.
diff --git a/logs-concentrator/Gemfile b/logs-concentrator/Gemfile
@@ -4,7 +4,8 @@ source "https://rubygems.org"
 
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
-gem "fluent-plugin-elasticsearch", "5.4.3"
-gem "fluent-plugin-opensearch", "1.1.5"
+gem "fluent-plugin-elasticsearch", "5.1.2"
+gem "fluent-plugin-opensearch", "1.0.10"
+gem "elasticsearch", "7.13.3"
 gem "fluent-plugin-prometheus", "2.2.0"
 gem "fluentd", "1.17.1"
diff --git a/logs-concentrator/Gemfile.lock b/logs-concentrator/Gemfile.lock
@@ -2,8 +2,8 @@ GEM
   remote: https://rubygems.org/
   specs:
     aws-eventstream (1.3.0)
-    aws-partitions (1.1001.0)
-    aws-sdk-core (3.211.0)
+    aws-partitions (1.1024.0)
+    aws-sdk-core (3.214.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
@@ -13,43 +13,54 @@ GEM
     base64 (0.2.0)
     concurrent-ruby (1.3.4)
     cool.io (1.9.0)
-    csv (3.3.0)
+    csv (3.3.1)
     drb (2.2.1)
-    elastic-transport (8.3.5)
-      faraday (< 3)
+    elasticsearch (7.13.3)
+      elasticsearch-api (= 7.13.3)
+      elasticsearch-transport (= 7.13.3)
+    elasticsearch-api (7.13.3)
       multi_json
-    elasticsearch (8.15.0)
-      elastic-transport (~> 8.3)
-      elasticsearch-api (= 8.15.0)
-    elasticsearch-api (8.15.0)
+    elasticsearch-transport (7.13.3)
+      faraday (~> 1)
       multi_json
-    excon (1.1.1)
-    faraday (2.12.0)
-      faraday-net_http (>= 2.0, < 3.4)
-      json
-      logger
-    faraday-excon (2.3.0)
-      excon (>= 1.0.0)
-      faraday (>= 2.11.0, < 3)
-    faraday-net_http (3.3.0)
-      net-http
-    faraday_middleware-aws-sigv4 (1.0.1)
+    excon (1.2.2)
+    faraday (1.10.4)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.0)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-multipart (1.1.0)
+      multipart-post (~> 2.0)
+    faraday-net_http (1.0.2)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
+    faraday_middleware-aws-sigv4 (0.6.1)
       aws-sigv4 (~> 1.0)
-      faraday (>= 2.0, < 3)
-    fluent-plugin-elasticsearch (5.4.3)
+      faraday (>= 1.8, < 2)
+    fluent-plugin-elasticsearch (5.1.2)
       elasticsearch
       excon
-      faraday (>= 2.0.0)
-      faraday-excon (>= 2.0.0)
       fluentd (>= 0.14.22)
-    fluent-plugin-opensearch (1.1.5)
+    fluent-plugin-opensearch (1.0.10)
       aws-sdk-core (~> 3)
       excon
-      faraday (>= 2.0.0)
-      faraday-excon (>= 2.0.0)
-      faraday_middleware-aws-sigv4 (~> 1.0.1)
+      faraday (~> 1.10)
+      faraday_middleware-aws-sigv4 (~> 0.6.1)
       fluentd (>= 0.14.22)
-      opensearch-ruby (>= 3.0.1)
+      opensearch-ruby
     fluent-plugin-prometheus (2.2.0)
       fluentd (>= 1.9.1, < 2)
       prometheus-client (>= 2.1.0)
@@ -71,17 +82,16 @@ GEM
       yajl-ruby (~> 1.0)
     http_parser.rb (0.8.0)
     jmespath (1.6.2)
-    json (2.7.6)
-    logger (1.6.1)
-    msgpack (1.7.3)
+    logger (1.6.3)
+    msgpack (1.7.5)
     multi_json (1.15.0)
-    net-http (0.4.1)
-      uri
+    multipart-post (2.4.1)
     opensearch-ruby (3.4.0)
       faraday (>= 1.0, < 3)
       multi_json (>= 1.0)
     prometheus-client (4.2.3)
       base64
+    ruby2_keywords (0.0.5)
     serverengine (2.4.0)
       base64 (~> 0.1)
       logger (~> 1.4)
@@ -92,17 +102,16 @@ GEM
       concurrent-ruby (~> 1.0)
     tzinfo-data (1.2024.2)
       tzinfo (>= 1.0.0)
-    uri (0.13.1)
-    webrick (1.9.0)
+    webrick (1.9.1)
     yajl-ruby (1.4.3)
 
 PLATFORMS
-  x86_64-linux
   x86_64-linux-musl
 
 DEPENDENCIES
-  fluent-plugin-elasticsearch (= 5.4.3)
-  fluent-plugin-opensearch (= 1.1.5)
+  elasticsearch (= 7.13.3)
+  fluent-plugin-elasticsearch (= 5.1.2)
+  fluent-plugin-opensearch (= 1.0.10)
   fluent-plugin-prometheus (= 2.2.0)
   fluentd (= 1.17.1)