From d5238ec0bc1edb513b55ae071f41f154564c384a Mon Sep 17 00:00:00 2001
From: Neil Cook <neil.cook@noware.co.uk>
Date: Tue, 6 Aug 2024 18:00:13 +0100
Subject: [PATCH 1/2] Update logstash template for elastic to match new format
 (version 8+)

---
 .../logstash/templates/wforce_template.json   | 110 +++++++++++-------
 1 file changed, 69 insertions(+), 41 deletions(-)

diff --git a/docker/logstash/templates/wforce_template.json b/docker/logstash/templates/wforce_template.json
index b59bca31..6cc4ba74 100644
--- a/docker/logstash/templates/wforce_template.json
+++ b/docker/logstash/templates/wforce_template.json
@@ -1,42 +1,70 @@
-{ 
-    "index_patterns" : ["logstash-wforce*"],
-    "settings" : { "index.refresh_interval" : "5s"},
-    "mappings" : {
-            "dynamic_templates" :
-	    [
-	        {
-		    "minor_fields" : {
-		        "match" : "*minor",
-		        "mapping" : { "type" : "integer", "index" : true }
-		    }
-	        },
-	        {
-		    "major_fields" : {
-		        "match" : "*major",
-		        "mapping" : { "type" : "integer", "index" : true }
-		    }
-	        },
-	        {
-		    "string_fields" : {
-		        "match_mapping_type" : "string",
-		        "mapping" : { "type" : "keyword", "index" : true }
-		    }
-	        }
-	    ],
-            "properties" : {
-                "geoip"  : {
-                    "dynamic": true,
-                    "properties" : {
-                        "ip": { "type": "ip" },
-                        "location" : { "type" : "geo_point" },
-                        "latitude" : { "type" : "half_float" },
-                        "longitude" : { "type" : "half_float" }
-                    }
-                },
-	        "policy_reject": { "type": "boolean" },
-	        "success": { "type": "boolean"},
-	        "tls": { "type": "boolean" },
-	        "t": { "type": "float" }
-            }
-    }
+{
+	"index_patterns" : ["logstash-wforce*"],
+	"template": {
+		"settings": {
+			"index.refresh_interval": "5s"
+		},
+		"mappings": {
+			"dynamic_templates": [
+				{
+					"minor_fields": {
+						"match": "*minor",
+						"mapping": {
+							"type": "integer",
+							"index": true
+						}
+					}
+				},
+				{
+					"major_fields": {
+						"match": "*major",
+						"mapping": {
+							"type": "integer",
+							"index": true
+						}
+					}
+				},
+				{
+					"string_fields": {
+						"match_mapping_type": "string",
+						"mapping": {
+							"type": "keyword",
+							"index": true
+						}
+					}
+				}
+			],
+			"properties": {
+				"geoip": {
+					"dynamic": true,
+					"properties": {
+						"ip": {
+							"type": "ip"
+						},
+						"location": {
+							"type": "geo_point"
+						},
+						"latitude": {
+							"type": "half_float"
+						},
+						"longitude": {
+							"type": "half_float"
+						}
+					}
+				},
+				"policy_reject": {
+					"type": "boolean"
+				},
+				"success": {
+					"type": "boolean"
+				},
+				"tls": {
+					"type": "boolean"
+				},
+				"t": {
+					"type": "float"
+				}
+			}
+		}
+	}
 }

From ef891275191aea165d403f01cbb9856dc7a58079 Mon Sep 17 00:00:00 2001
From: Neil Cook <neil.cook@noware.co.uk>
Date: Tue, 6 Aug 2024 21:36:08 +0100
Subject: [PATCH 2/2] Move from docker-compose (V1) to docker compose (V2)
 everywhere

---
 configure.ac                    | 4 ++--
 docker/Makefile.am              | 4 ++--
 docker/wforce_image/Makefile.am | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index 30b3b45c..c53e00c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -197,9 +197,9 @@ AC_ARG_ENABLE([docker],
   *) AC_MSG_ERROR([bad value ${enableval} for --enable-docker]) ;;
 esac],[docker=false])
 AM_CONDITIONAL([WITH_DOCKER], [test x$docker = xtrue])
-AC_CHECK_PROG(DOCKER, docker-compose, docker-compose)
+AC_CHECK_PROG(DOCKER, docker, docker)
 AS_IF([test x$docker = xtrue -a "x$DOCKER" = "x"], [
-    AC_MSG_ERROR([docker-compose not found, and is required])
+    AC_MSG_ERROR([docker not found, and is required])
 ])
 AC_ARG_ENABLE([trackalert],
 [  --enable-trackalert         Build trackalert],
diff --git a/docker/Makefile.am b/docker/Makefile.am
index 3e22356b..7f44347c 100644
--- a/docker/Makefile.am
+++ b/docker/Makefile.am
@@ -1,4 +1,4 @@
-DCMP = docker-compose
+DCMP = docker compose
 COMPOSE_SOURCE = docker-compose.yml logstash/Dockerfile logstash/config/logstash.conf logstash/templates/wforce_template.json regression/Dockerfile wforce_image/Dockerfile wforce_image/docker-entrypoint.sh wforce_image/wforce.conf.j2 wforce_image/create_config.sh
 COMPOSE_TARGET = .docker
 REGRESSION_SERVICE = regression
@@ -27,7 +27,7 @@ clean_elastic: stop
 	rm $(COMPOSE_TARGET)
 
 clean_docker:
-	docker-compose down -v
+	$(DCMP) down -v
 
 clean: clean_docker
 
diff --git a/docker/wforce_image/Makefile.am b/docker/wforce_image/Makefile.am
index a4841a51..6bbda427 100644
--- a/docker/wforce_image/Makefile.am
+++ b/docker/wforce_image/Makefile.am
@@ -1,4 +1,4 @@
-DCMP = docker-compose
+DCMP = docker compose
 WFORCE_IMAGE_COMPOSE_TARGET = .wforce_image_docker
 WFORCE_IMAGE_SERVICE = wforce_image
 WFORCE_MINIMAL_IMAGE_SERVICE = wforce_minimal
@@ -27,7 +27,7 @@ kill:
 	$(DCMP) kill
 
 clean_docker:
-	docker-compose down -v
+	$(DCMP) down -v
 
 clean: clean_docker