From 72877af3cc22cedfc2b8bf3df53b8ea81be837d2 Mon Sep 17 00:00:00 2001
From: Andrei Piankouski <andrei_piankouski@epam.com>
Date: Mon, 12 Feb 2024 15:52:55 +0300
Subject: [PATCH] EPMRPP-82701 || Update Search configs and naming

---
 build.gradle                                              | 2 +-
 docker-compose.yml                                        | 8 ++++----
 .../epam/ta/reportportal/core/log/ElasticLogService.java  | 2 +-
 src/main/resources/application-elastic.yaml               | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index 693542e907..84c4a26131 100644
--- a/build.gradle
+++ b/build.gradle
@@ -72,7 +72,7 @@ dependencies {
         implementation 'com.epam.reportportal:plugin-api'
     } else {
         implementation 'com.github.reportportal:commons-events:e337f8b7be'
-        implementation 'com.github.reportportal:commons-dao:458b67ab61'
+        implementation 'com.github.reportportal:commons-dao:b299f80'
         implementation 'com.github.reportportal:commons-rules:42d4dd5634'
         implementation 'com.github.reportportal:commons-model:c800793'
         implementation 'com.github.reportportal:commons:07566b8e'
diff --git a/docker-compose.yml b/docker-compose.yml
index ee9e4e2b8d..e23d9c8c6f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -24,11 +24,11 @@ services:
     ports:
       - "5432:5432"
 
-  elastic:
-    image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.3.0
+  opensearch:
+    image: opensearchproject/opensearch:2.11.0
     restart: always
     volumes:
-      - elastic:/usr/share/elasticsearch/data
+      - opensearch:/usr/share/opensearch/data
     environment:
       - "bootstrap.memory_lock=true"
       - "discovery.type=single-node"
@@ -77,5 +77,5 @@ services:
 
 volumes:
   reportportal-database:
-  elastic:
+  opensearch:
   minio:
\ No newline at end of file
diff --git a/src/main/java/com/epam/ta/reportportal/core/log/ElasticLogService.java b/src/main/java/com/epam/ta/reportportal/core/log/ElasticLogService.java
index c836c6d521..afa2e92f3a 100644
--- a/src/main/java/com/epam/ta/reportportal/core/log/ElasticLogService.java
+++ b/src/main/java/com/epam/ta/reportportal/core/log/ElasticLogService.java
@@ -39,7 +39,7 @@
 
 @Primary
 @Service
-@ConditionalOnProperty(prefix = "rp.elasticsearch", name = "host")
+@ConditionalOnProperty(prefix = "rp.searchengine", name = "host")
 public class ElasticLogService implements LogService {
 
   private final AmqpTemplate amqpTemplate;
diff --git a/src/main/resources/application-elastic.yaml b/src/main/resources/application-elastic.yaml
index 359c09f7a8..8e7bba8cf1 100644
--- a/src/main/resources/application-elastic.yaml
+++ b/src/main/resources/application-elastic.yaml
@@ -1,5 +1,5 @@
 rp:
-  elasticsearchLogmessage:
+  searchengine:
     host: elasticsearch
     port: 9200
     username: