From 5979ab23c4f0b60b3eddb8caf5c77632fa509f20 Mon Sep 17 00:00:00 2001
From: Julien Maupetit <julien@maupetit.net>
Date: Wed, 21 Jun 2023 15:29:24 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7(kibana)=20remove=20server=20UUID?=
 =?UTF-8?q?=20generation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Recent Kibana releases auto-generates a uuid to uniquely identify a
server instance. It is no longer required to generate and set it
manually.
---
 CHANGELOG.md                                             | 4 ++++
 apps/kibana/templates/services/app/configs/kibana.yml.j2 | 1 -
 apps/kibana/templates/services/app/deploy.yml.j2         | 2 --
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e6713584..d0406ee1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,10 @@ Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## Unreleased
 
+### Changed
+
+- Remove UUID generation for kibana
+
 ## [6.17.0] - 2023-06-15
 
 ### Changed
diff --git a/apps/kibana/templates/services/app/configs/kibana.yml.j2 b/apps/kibana/templates/services/app/configs/kibana.yml.j2
index d7225d74..0d11f964 100644
--- a/apps/kibana/templates/services/app/configs/kibana.yml.j2
+++ b/apps/kibana/templates/services/app/configs/kibana.yml.j2
@@ -2,7 +2,6 @@
 
 # The server name/uuid should be unique for all replica
 server.name: ${HOSTNAME}
-server.uuid: ${SERVER_UUID}
 xpack.security.cookieName: "{{ kibana_host + '-' + deployment_stamp }}"
 
 # Accept requests from all hosts
diff --git a/apps/kibana/templates/services/app/deploy.yml.j2 b/apps/kibana/templates/services/app/deploy.yml.j2
index 90184326..143d305b 100644
--- a/apps/kibana/templates/services/app/deploy.yml.j2
+++ b/apps/kibana/templates/services/app/deploy.yml.j2
@@ -48,8 +48,6 @@ spec:
         - name: kibana
           image: "{{ kibana_image_name }}:{{ kibana_image_tag }}"
           imagePullPolicy: Always
-          command: ["/bin/bash"]
-          args: ["-c", "SERVER_UUID=$(uuidgen) /usr/local/bin/kibana-docker"]
           livenessProbe:
             exec:
               command: