From 4eee3a1818876eea7815ff4edbb2fa374e6a29da Mon Sep 17 00:00:00 2001
From: Alireza Baloochi <Dev.AlirezaBaloochi@gmail.com>
Date: Thu, 8 Aug 2024 13:46:29 +0330
Subject: [PATCH 1/2] Fix Elasticsearch broken ci (#2282)

* Fix Elasticsearch ci

* nit
---
 .github/workflows/healthchecks_elasticsearch_ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/healthchecks_elasticsearch_ci.yml b/.github/workflows/healthchecks_elasticsearch_ci.yml
index 14a9014c56..6c44e1780d 100644
--- a/.github/workflows/healthchecks_elasticsearch_ci.yml
+++ b/.github/workflows/healthchecks_elasticsearch_ci.yml
@@ -43,6 +43,8 @@ jobs:
             6.0.x
             7.0.x
             8.0.x
+      - run:
+          ln -s /usr/libexec/docker/cli-plugins/docker-compose /usr/local/bin/docker-compose
       - name: Restore
         run: |
           dotnet restore ./src/HealthChecks.Elasticsearch/HealthChecks.Elasticsearch.csproj &&

From 76c1ad21552f65e8d8dfdd6a2107a2c6eaf25794 Mon Sep 17 00:00:00 2001
From: Alireza Baloochi <Dev.AlirezaBaloochi@gmail.com>
Date: Thu, 8 Aug 2024 13:57:35 +0330
Subject: [PATCH 2/2] Fix Kafka ci (#2283)

---
 .github/workflows/healthchecks_kafka_ci.yml      | 16 ++++++++++++----
 .../Functional/KafkaHealthCheckTests.cs          |  2 +-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/healthchecks_kafka_ci.yml b/.github/workflows/healthchecks_kafka_ci.yml
index d1ad792f0a..d85f42b1be 100644
--- a/.github/workflows/healthchecks_kafka_ci.yml
+++ b/.github/workflows/healthchecks_kafka_ci.yml
@@ -30,17 +30,25 @@ jobs:
     runs-on: ubuntu-latest
     services:
       zookeeper:
-        image: confluent/zookeeper
+        image: confluentinc/cp-zookeeper:latest
         ports:
           - 2181:2181
+        env:
+         ZOOKEEPER_CLIENT_PORT: 2181
+         ZOOKEEPER_TICK_TIME: 2000
       kafka:
-        image: confluent/kafka
+        image: confluentinc/cp-kafka:latest
         ports:
-          - 9092:9092
+         - 9092:9092	
+         - 29092:29092
         env:
           KAFKA_ADVERTISED_HOST_NAME: localhost
           KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
-          KAFKA_ADVERTISED_PORT: 9092
+          KAFKA_BROKER_ID: 1
+          KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://localhost:9092,PLAINTEXT_HOST://localhost:29092
+          KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT
+          KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
+          KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
     steps:
       - uses: actions/checkout@v3
       - name: Setup .NET
diff --git a/test/HealthChecks.Kafka.Tests/Functional/KafkaHealthCheckTests.cs b/test/HealthChecks.Kafka.Tests/Functional/KafkaHealthCheckTests.cs
index 606b5f0ed2..2b3bf7c606 100644
--- a/test/HealthChecks.Kafka.Tests/Functional/KafkaHealthCheckTests.cs
+++ b/test/HealthChecks.Kafka.Tests/Functional/KafkaHealthCheckTests.cs
@@ -43,7 +43,7 @@ public async Task be_healthy_if_kafka_is_available()
     {
         var configuration = new ProducerConfig()
         {
-            BootstrapServers = "localhost:9092",
+            BootstrapServers = "localhost:29092",
             MessageSendMaxRetries = 0
         };