Merge pull request #65 from uselagoon/new-relic

build: add fluent-plugin-newrelic
uselagoon · May 17, 2024 · 3ff8d13 · 3ff8d13
2 parents f01b8bf + 9bc0566
commit 3ff8d13
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 35 deletions.
diff --git a/logs-dispatcher/Gemfile b/logs-dispatcher/Gemfile
@@ -8,6 +8,7 @@ gem "fluent-plugin-cloudwatch-logs", "0.14.3"
 gem "fluent-plugin-datadog", "0.14.2"
 gem "fluent-plugin-kubernetes_metadata_filter", "3.4.0"
 gem "fluent-plugin-multi-format-parser", "1.1.0"
+gem "fluent-plugin-newrelic", "1.2.3"
 gem "fluent-plugin-prometheus", "2.1.0"
 gem "fluent-plugin-rabbitmq", "0.1.2"
 gem "fluent-plugin-record-modifier", "2.2.0"

diff --git a/logs-dispatcher/Gemfile.lock b/logs-dispatcher/Gemfile.lock
@@ -1,41 +1,41 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.5)
+    addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
     amq-protocol (2.3.2)
-    aws-eventstream (1.2.0)
-    aws-partitions (1.844.0)
-    aws-sdk-cloudwatchlogs (1.71.0)
-      aws-sdk-core (~> 3, >= 3.184.0)
+    aws-eventstream (1.3.0)
+    aws-partitions (1.925.0)
+    aws-sdk-cloudwatchlogs (1.81.0)
+      aws-sdk-core (~> 3, >= 3.193.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.186.0)
-      aws-eventstream (~> 1, >= 1.0.2)
+    aws-sdk-core (3.194.1)
+      aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
-      aws-sigv4 (~> 1.5)
+      aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.72.0)
-      aws-sdk-core (~> 3, >= 3.184.0)
+    aws-sdk-kms (1.80.0)
+      aws-sdk-core (~> 3, >= 3.193.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.136.0)
-      aws-sdk-core (~> 3, >= 3.181.0)
+    aws-sdk-s3 (1.149.1)
+      aws-sdk-core (~> 3, >= 3.194.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.6)
-    aws-sdk-sqs (1.65.0)
-      aws-sdk-core (~> 3, >= 3.184.0)
+      aws-sigv4 (~> 1.8)
+    aws-sdk-sqs (1.72.0)
+      aws-sdk-core (~> 3, >= 3.193.0)
       aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.6.1)
+    aws-sigv4 (1.8.0)
       aws-eventstream (~> 1, >= 1.0.2)
+    base64 (0.2.0)
     bunny (2.14.4)
       amq-protocol (~> 2.3, >= 2.3.0)
     concurrent-ruby (1.2.3)
     connection_pool (2.4.1)
     cool.io (1.8.0)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
+    domain_name (0.6.20240107)
     ffi (1.16.3)
-    ffi-compiler (1.0.1)
-      ffi (>= 1.0.0)
+    ffi-compiler (1.3.2)
+      ffi (>= 1.15.5)
       rake
     fluent-config-regexp-type (1.0.0)
       fluentd (> 1.0.0, < 2)
@@ -54,6 +54,8 @@ GEM
       lru_redux
     fluent-plugin-multi-format-parser (1.1.0)
       fluentd (>= 0.14.0, < 2)
+    fluent-plugin-newrelic (1.2.3)
+      fluentd (>= 1.0.0)
     fluent-plugin-prometheus (2.1.0)
       fluentd (>= 1.9.1, < 2)
       prometheus-client (>= 2.1.0)
@@ -94,41 +96,42 @@ GEM
       tzinfo-data (~> 1.0)
       webrick (~> 1.4)
       yajl-ruby (~> 1.0)
-    http (5.1.1)
+    http (5.2.0)
       addressable (~> 2.8)
+      base64 (~> 0.1)
       http-cookie (~> 1.0)
       http-form_data (~> 2.2)
-      llhttp-ffi (~> 0.4.0)
+      llhttp-ffi (~> 0.5.0)
     http-accept (1.7.0)
     http-cookie (1.0.5)
       domain_name (~> 0.5)
     http-form_data (2.3.0)
     http_parser.rb (0.8.0)
     httpclient (2.8.3)
     jmespath (1.6.2)
-    json (2.6.3)
+    json (2.7.2)
     jsonpath (1.1.5)
       multi_json
     kubeclient (4.11.0)
       http (>= 3.0, < 6.0)
       jsonpath (~> 1.0)
       recursive-open-struct (~> 1.1, >= 1.1.1)
       rest-client (~> 2.0)
-    llhttp-ffi (0.4.0)
+    llhttp-ffi (0.5.0)
       ffi-compiler (~> 1.0)
       rake (~> 13.0)
     lru_redux (1.1.0)
-    mime-types (3.5.1)
+    mime-types (3.5.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2023.1003)
+    mime-types-data (3.2024.0305)
     msgpack (1.7.2)
     multi_json (1.15.0)
     net-http-persistent (4.0.2)
       connection_pool (~> 2.2)
     netrc (0.11.0)
     prometheus-client (4.2.2)
-    public_suffix (5.0.3)
-    rake (13.1.0)
+    public_suffix (5.0.5)
+    rake (13.2.1)
     recursive-open-struct (1.1.3)
     rest-client (2.1.0)
       http-accept (>= 1.7.0, < 2.0)
@@ -144,22 +147,19 @@ GEM
       concurrent-ruby (~> 1.0)
     tzinfo-data (1.2024.1)
       tzinfo (>= 1.0.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.8.2)
     uuidtools (2.2.0)
     webrick (1.8.1)
     yajl-ruby (1.4.3)
 
 PLATFORMS
-  x86_64-linux
   x86_64-linux-musl
 
 DEPENDENCIES
   fluent-plugin-cloudwatch-logs (= 0.14.3)
   fluent-plugin-datadog (= 0.14.2)
   fluent-plugin-kubernetes_metadata_filter (= 3.4.0)
   fluent-plugin-multi-format-parser (= 1.1.0)
+  fluent-plugin-newrelic (= 1.2.3)
   fluent-plugin-prometheus (= 2.1.0)
   fluent-plugin-rabbitmq (= 0.1.2)
   fluent-plugin-record-modifier (= 2.2.0)
@@ -172,4 +172,4 @@ DEPENDENCIES
   fluentd (= 1.16.5)
 
 BUNDLED WITH
-   2.4.17
+   2.5.7
diff --git a/logs-dispatcher/Makefile b/logs-dispatcher/Makefile
@@ -11,7 +11,7 @@ update-gemfile:
 		-v $$PWD/Gemfile.lock:/tmp/Gemfile.lock \
 		-w /tmp \
 		--entrypoint bundle \
-		fluent/fluentd:v1.16-1 \
+		fluent/fluentd:v1.16.5-1.0 \
 		lock --update
 
 .PHONY: update-vendor-cache
@@ -24,5 +24,5 @@ update-vendor-cache:
 		-w /tmp \
 		-e BUNDLE_NO_INSTALL=true \
 		--entrypoint bundle \
-		fluent/fluentd:v1.16-1 \
+		fluent/fluentd:v1.16.5-1.0 \
 		cache