From 48bb125a6bd191408eba27b872b9f29ce146e273 Mon Sep 17 00:00:00 2001
From: Toby Bellwood <toby.bellwood@amazee.io>
Date: Fri, 3 Nov 2023 08:06:33 +1100
Subject: [PATCH] small log image fixups and updates

---
 logs-concentrator/Gemfile.lock | 33 +++++++++++++++------------------
 logs-concentrator/Makefile     |  2 +-
 logs-dispatcher/Gemfile.lock   |  6 +++---
 logs-dispatcher/Makefile       |  2 +-
 logs-dispatcher/fluent.conf    |  3 +--
 5 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/logs-concentrator/Gemfile.lock b/logs-concentrator/Gemfile.lock
index c5b2edaa..e394ef41 100644
--- a/logs-concentrator/Gemfile.lock
+++ b/logs-concentrator/Gemfile.lock
@@ -2,26 +2,28 @@ GEM
   remote: https://rubygems.org/
   specs:
     aws-eventstream (1.2.0)
-    aws-partitions (1.752.0)
-    aws-sdk-core (3.171.1)
+    aws-partitions (1.844.0)
+    aws-sdk-core (3.186.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.5)
       jmespath (~> 1, >= 1.6.1)
-    aws-sigv4 (1.5.2)
+    aws-sigv4 (1.6.1)
       aws-eventstream (~> 1, >= 1.0.2)
+    base64 (0.1.1)
     concurrent-ruby (1.2.2)
     cool.io (1.8.0)
-    elastic-transport (8.2.1)
+    elastic-transport (8.3.0)
       faraday (< 3)
       multi_json
-    elasticsearch (8.7.0)
+    elasticsearch (8.10.0)
       elastic-transport (~> 8)
-      elasticsearch-api (= 8.7.0)
-    elasticsearch-api (8.7.0)
+      elasticsearch-api (= 8.10.0)
+    elasticsearch-api (8.10.0)
       multi_json
-    excon (0.99.0)
-    faraday (2.7.10)
+    excon (0.104.0)
+    faraday (2.7.11)
+      base64
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-excon (2.1.0)
@@ -64,15 +66,10 @@ GEM
     jmespath (1.6.2)
     msgpack (1.7.2)
     multi_json (1.15.0)
-    opensearch-api (2.2.0)
-      multi_json
-    opensearch-ruby (2.1.0)
-      opensearch-api (~> 2.1)
-      opensearch-transport (~> 2.0)
-    opensearch-transport (2.1.0)
+    opensearch-ruby (3.0.1)
       faraday (>= 1.0, < 3)
-      multi_json
-    prometheus-client (4.2.1)
+      multi_json (>= 1.0)
+    prometheus-client (4.2.2)
     ruby2_keywords (0.0.5)
     serverengine (2.3.2)
       sigdump (~> 0.2.2)
@@ -96,4 +93,4 @@ DEPENDENCIES
   fluentd (= 1.16.2)
 
 BUNDLED WITH
-   2.4.12
+   2.4.17
diff --git a/logs-concentrator/Makefile b/logs-concentrator/Makefile
index 27655b91..4df2c3d8 100644
--- a/logs-concentrator/Makefile
+++ b/logs-concentrator/Makefile
@@ -1,6 +1,6 @@
 .PHONY: build
 build:
-	docker build .
+	docker build . -t lagoon/logs-concentrator:latest
 
 .PHONY: update-gemfile
 update-gemfile:
diff --git a/logs-dispatcher/Gemfile.lock b/logs-dispatcher/Gemfile.lock
index 97f188a3..48504a37 100644
--- a/logs-dispatcher/Gemfile.lock
+++ b/logs-dispatcher/Gemfile.lock
@@ -5,11 +5,11 @@ GEM
       public_suffix (>= 2.0.2, < 6.0)
     amq-protocol (2.3.2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.843.0)
+    aws-partitions (1.844.0)
     aws-sdk-cloudwatchlogs (1.71.0)
       aws-sdk-core (~> 3, >= 3.184.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.185.2)
+    aws-sdk-core (3.186.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.5)
@@ -172,4 +172,4 @@ DEPENDENCIES
   fluentd (= 1.16.2)
 
 BUNDLED WITH
-   2.4.19
+   2.4.17
diff --git a/logs-dispatcher/Makefile b/logs-dispatcher/Makefile
index d4447122..125bd1e0 100644
--- a/logs-dispatcher/Makefile
+++ b/logs-dispatcher/Makefile
@@ -1,6 +1,6 @@
 .PHONY: build
 build:
-	docker build .
+	docker build . -t lagoon/logs-dispatcher:latest
 
 .PHONY: update-gemfile
 update-gemfile:
diff --git a/logs-dispatcher/fluent.conf b/logs-dispatcher/fluent.conf
index c09fe65d..a7d180e3 100644
--- a/logs-dispatcher/fluent.conf
+++ b/logs-dispatcher/fluent.conf
@@ -1,8 +1,7 @@
 # vi: ft=fluentd
 
 # NOTE: this is just a placeholder. When running in k8s a configmap is mounted
-# over this file. That configmap is configured in the lagoon-logs-concentrator
-# helm chart.
+# over this file. That configmap is configured in the lagoon-logging helm chart
 
 <system>
   workers 2