From 04155a0fd08dd5c37b544e524f871288423f2dea Mon Sep 17 00:00:00 2001
From: Santeri Hurnanen <santeri.hurnanen@fame.fi>
Date: Mon, 4 Nov 2024 09:07:39 +0200
Subject: [PATCH 1/3] Update elasticsearch settings

---
 public/sites/default/all.settings.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/public/sites/default/all.settings.php b/public/sites/default/all.settings.php
index 0ac7a394d..e07af3ba0 100644
--- a/public/sites/default/all.settings.php
+++ b/public/sites/default/all.settings.php
@@ -7,13 +7,12 @@
 
 // Elasticsearch settings.
 if (getenv('ELASTICSEARCH_URL')) {
-  $config['elasticsearch_connector.cluster.kymp']['url'] = getenv('ELASTICSEARCH_URL');
+  $config['search_api.server.elastic_rekry']['backend_config']['connector_config']['url'] = getenv('ELASTICSEARCH_URL');
 
   if (getenv('ELASTIC_USER') && getenv('ELASTIC_PASSWORD')) {
-    $config['elasticsearch_connector.cluster.kymp']['options']['use_authentication'] = '1';
-    $config['elasticsearch_connector.cluster.kymp']['options']['authentication_type'] = 'Basic';
-    $config['elasticsearch_connector.cluster.kymp']['options']['username'] = getenv('ELASTIC_USER');
-    $config['elasticsearch_connector.cluster.kymp']['options']['password'] = getenv('ELASTIC_PASSWORD');
+    $config['search_api.server.elastic_rekry']['backend_config']['connector'] = 'basicauth';
+    $config['search_api.server.elastic_rekry']['backend_config']['connector_config']['username'] = getenv('ELASTIC_USER');
+    $config['search_api.server.elastic_rekry']['backend_config']['connector_config']['password'] = getenv('ELASTIC_PASSWORD');
   }
 }
 // Elastic proxy URL.

From e8fc57cd48eb73100c7bce0c421e9fedec86ca22 Mon Sep 17 00:00:00 2001
From: Santeri Hurnanen <santeri.hurnanen@fame.fi>
Date: Mon, 4 Nov 2024 10:11:18 +0200
Subject: [PATCH 2/3] UHF-10719: Export config

---
 .../elasticsearch_connector.cluster.kymp.yml  | 19 -------------------
 conf/cmi/search_api.server.elastic_kymp.yml   | 11 ++++++++---
 2 files changed, 8 insertions(+), 22 deletions(-)
 delete mode 100644 conf/cmi/elasticsearch_connector.cluster.kymp.yml

diff --git a/conf/cmi/elasticsearch_connector.cluster.kymp.yml b/conf/cmi/elasticsearch_connector.cluster.kymp.yml
deleted file mode 100644
index b94b08d69..000000000
--- a/conf/cmi/elasticsearch_connector.cluster.kymp.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-uuid: 8caed881-457b-4d95-9881-1efe2a3148da
-langcode: en
-status: '1'
-dependencies: {  }
-cluster_id: kymp
-name: KYMP
-url: 'http://elastic:9200'
-options:
-  multiple_nodes_connection: false
-  use_authentication: true
-  authentication_type: Basic
-  username: ''
-  password: ''
-  timeout: 3
-  rewrite:
-    rewrite_index: true
-    index:
-      prefix: ''
-      suffix: ''
diff --git a/conf/cmi/search_api.server.elastic_kymp.yml b/conf/cmi/search_api.server.elastic_kymp.yml
index f7bf3e747..e7537d840 100644
--- a/conf/cmi/search_api.server.elastic_kymp.yml
+++ b/conf/cmi/search_api.server.elastic_kymp.yml
@@ -9,6 +9,11 @@ name: 'Elastic KYMP'
 description: ''
 backend: elasticsearch
 backend_config:
-  cluster_settings:
-    cluster: kymp
-  fuzziness: auto
+  connector: standard
+  connector_config:
+    url: 'http://elastic:9200'
+    enable_debug_logging: false
+  advanced:
+    prefix: ''
+    suffix: ''
+    fuzziness: auto

From 362a93c30c38119c02d04a429d1c1c3923566062 Mon Sep 17 00:00:00 2001
From: Santeri Hurnanen <santeri.hurnanen@fame.fi>
Date: Tue, 5 Nov 2024 07:56:50 +0200
Subject: [PATCH 3/3] UHF-10719: Fix search_api settings

---
 public/sites/default/all.settings.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/public/sites/default/all.settings.php b/public/sites/default/all.settings.php
index e07af3ba0..260e6c538 100644
--- a/public/sites/default/all.settings.php
+++ b/public/sites/default/all.settings.php
@@ -7,12 +7,12 @@
 
 // Elasticsearch settings.
 if (getenv('ELASTICSEARCH_URL')) {
-  $config['search_api.server.elastic_rekry']['backend_config']['connector_config']['url'] = getenv('ELASTICSEARCH_URL');
+  $config['search_api.server.elastic_kymp']['backend_config']['connector_config']['url'] = getenv('ELASTICSEARCH_URL');
 
   if (getenv('ELASTIC_USER') && getenv('ELASTIC_PASSWORD')) {
-    $config['search_api.server.elastic_rekry']['backend_config']['connector'] = 'basicauth';
-    $config['search_api.server.elastic_rekry']['backend_config']['connector_config']['username'] = getenv('ELASTIC_USER');
-    $config['search_api.server.elastic_rekry']['backend_config']['connector_config']['password'] = getenv('ELASTIC_PASSWORD');
+    $config['search_api.server.elastic_kymp']['backend_config']['connector'] = 'basicauth';
+    $config['search_api.server.elastic_kymp']['backend_config']['connector_config']['username'] = getenv('ELASTIC_USER');
+    $config['search_api.server.elastic_kymp']['backend_config']['connector_config']['password'] = getenv('ELASTIC_PASSWORD');
   }
 }
 // Elastic proxy URL.