From 0313e840f3f9fe5137549528d9846f5fb65a8f43 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Mon, 7 Oct 2024 10:01:12 +0530
Subject: [PATCH] x-pack/metricbeat/module/mssql: Update mssql image version to
 avoid SIGABRT and update HEALTHCHECK (#41104) (#41113)

(cherry picked from commit 43301bc328ff8c3750f5f43af4f81a5f3f6a2514)

Co-authored-by: subham sarkar <subham.sarkar@elastic.co>
---
 x-pack/metricbeat/module/mssql/_meta/Dockerfile             | 2 +-
 x-pack/metricbeat/module/mssql/_meta/supported-versions.yml | 2 +-
 x-pack/metricbeat/module/mssql/docker-compose.yml           | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/x-pack/metricbeat/module/mssql/_meta/Dockerfile b/x-pack/metricbeat/module/mssql/_meta/Dockerfile
index 29c116faf71..e677897fa56 100644
--- a/x-pack/metricbeat/module/mssql/_meta/Dockerfile
+++ b/x-pack/metricbeat/module/mssql/_meta/Dockerfile
@@ -6,4 +6,4 @@ ENV SA_PASSWORD='1234_asdf'
 
 # Use the same healthcheck as the Windows version of the image.
 # https://github.com/Microsoft/mssql-docker/blob/a3020afeec9be1eb2d67645ac739438eb8f2c545/windows/mssql-server-windows/dockerfile#L31
-HEALTHCHECK --interval=1s --retries=90 CMD /opt/mssql-tools/bin/sqlcmd -U SA -P ${SA_PASSWORD} -Q "select 1"
+HEALTHCHECK --interval=10s --timeout=3s --start-period=10s --retries=3 CMD /opt/mssql-tools18/bin/sqlcmd -S localhost -U SA -P ${SA_PASSWORD} -No -Q "SELECT 1" || exit 1
diff --git a/x-pack/metricbeat/module/mssql/_meta/supported-versions.yml b/x-pack/metricbeat/module/mssql/_meta/supported-versions.yml
index 6d68c61adeb..bbc287f30de 100644
--- a/x-pack/metricbeat/module/mssql/_meta/supported-versions.yml
+++ b/x-pack/metricbeat/module/mssql/_meta/supported-versions.yml
@@ -1,2 +1,2 @@
 variants:
-  - MSSQL_VERSION: 2017-CU31-GDR2-ubuntu-18.04
+  - MSSQL_VERSION: 2019-CU28-ubuntu-20.04
diff --git a/x-pack/metricbeat/module/mssql/docker-compose.yml b/x-pack/metricbeat/module/mssql/docker-compose.yml
index eccea7bda05..27e59522cba 100644
--- a/x-pack/metricbeat/module/mssql/docker-compose.yml
+++ b/x-pack/metricbeat/module/mssql/docker-compose.yml
@@ -2,10 +2,10 @@ version: '2.3'
 
 services:
   mssql:
-    image: docker.elastic.co/integrations-ci/beats-mssql:${MSSQL_VERSION:-2017-CU31-GDR2-ubuntu-18.04}-1
+    image: docker.elastic.co/integrations-ci/beats-mssql:${MSSQL_VERSION:-2019-CU28-ubuntu-20.04}-1
     build:
       context: ./_meta
       args:
-        MSSQL_VERSION: ${MSSQL_VERSION:-2017-CU31-GDR2-ubuntu-18.04}
+        MSSQL_VERSION: ${MSSQL_VERSION:-2019-CU28-ubuntu-20.04}
     ports:
       - 1433