From 82b6c016d3268e35fa22f7b529c3122402a71ec6 Mon Sep 17 00:00:00 2001
From: Ben Martin <ben@brmartin.co.uk>
Date: Wed, 18 Dec 2024 15:08:07 +0000
Subject: [PATCH] feat(elk): remove consul connect configuration

- elk nodes don't use consul service discovery
---
 modules/elk/jobspec.nomad.hcl | 66 +++++------------------------------
 1 file changed, 8 insertions(+), 58 deletions(-)

diff --git a/modules/elk/jobspec.nomad.hcl b/modules/elk/jobspec.nomad.hcl
index e714771..07e99dc 100644
--- a/modules/elk/jobspec.nomad.hcl
+++ b/modules/elk/jobspec.nomad.hcl
@@ -31,34 +31,6 @@ job "elk" {
       }
     }
 
-    service {
-      provider = "consul"
-      port     = "9200"
-
-      meta {
-        envoy_metrics_port = "${NOMAD_HOST_PORT_envoy_metrics}"
-      }
-
-      connect {
-        sidecar_service {
-          proxy {
-            expose {
-              path {
-                path            = "/metrics"
-                protocol        = "http"
-                local_path_port = 9102
-                listener_port   = "envoy_metrics"
-              }
-            }
-            transparent_proxy {
-              exclude_inbound_ports  = ["9200", "9300"]
-              exclude_outbound_ports = [9200, 9300]
-            }
-          }
-        }
-      }
-    }
-
     task "elasticsearch" {
       driver = "docker"
 
@@ -97,6 +69,9 @@ job "elk" {
           {{ range service "elk-node-elasticsearch-transport" }}
           {{ .Address }}:{{ .Port }}
           {{ end }}
+          {{ range service "elk-tiebreaker-elasticsearch-transport" }}
+          {{ .Address }}:{{ .Port }}
+          {{ end }}
           EOF
 
         destination = "local/unicast_hosts.txt"
@@ -137,34 +112,6 @@ job "elk" {
       }
     }
 
-    service {
-      provider = "consul"
-      port     = "9200"
-
-      meta {
-        envoy_metrics_port = "${NOMAD_HOST_PORT_envoy_metrics}"
-      }
-
-      connect {
-        sidecar_service {
-          proxy {
-            expose {
-              path {
-                path            = "/metrics"
-                protocol        = "http"
-                local_path_port = 9102
-                listener_port   = "envoy_metrics"
-              }
-            }
-            transparent_proxy {
-              exclude_inbound_ports  = ["9200", "9300"]
-              exclude_outbound_ports = [9200, 9300]
-            }
-          }
-        }
-      }
-    }
-
     task "elasticsearch" {
       driver = "docker"
 
@@ -203,6 +150,9 @@ job "elk" {
           {{ range service "elk-node-elasticsearch-transport" }}
           {{ .Address }}:{{ .Port }}
           {{ end }}
+          {{ range service "elk-tiebreaker-elasticsearch-transport" }}
+          {{ .Address }}:{{ .Port }}
+          {{ end }}
           EOF
 
         destination = "local/unicast_hosts.txt"
@@ -210,13 +160,13 @@ job "elk" {
       }
 
       service {
-        name     = "elk-node-elasticsearch-http"
+        name     = "elk-tiebreaker-elasticsearch-http"
         provider = "consul"
         port     = "http"
       }
 
       service {
-        name     = "elk-node-elasticsearch-transport"
+        name     = "elk-tiebreaker-elasticsearch-transport"
         provider = "consul"
         port     = "transport"
       }