[REF] connector_elasticsearch: elasticsearch v8 compatibility

ThomasBinsfeld · ThomasBinsfeld · commit 78fbf1c838c0 · 2025-07-30T16:52:50.000+02:00
diff --git a/connector_elasticsearch/README.rst b/connector_elasticsearch/README.rst
@@ -1,7 +1,3 @@
-.. image:: https://odoo-community.org/readme-banner-image
-   :target: https://odoo-community.org/get-involved?utm_source=readme
-   :alt: Odoo Community Association
-
 =======================
 connector_elasticsearch
 =======================
@@ -17,7 +13,7 @@ connector_elasticsearch
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
     :target: https://odoo-community.org/page/development-status
     :alt: Beta
-.. |badge2| image:: https://img.shields.io/badge/license-AGPL--3-blue.png
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fsearch--engine-lightgray.png?logo=github
@@ -45,6 +41,12 @@ Elasticsearch_ indexes.
 Changelog
 =========
 
+16.0.0.3.0
+~~~~~~~~~~
+
+* elasticsearch v8 compatibility: The connector now supports Elasticsearch
+  v8.*.* versions.
+
 12.0.?.?.? (unreleased)
 ~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -78,6 +80,7 @@ Contributors
 * Raphaël Reverdy <raphael.reverdy@akretion.com>
 * Simone Orsi <simone.orsi@camptocamp.com>
 * Iván Todorovich <ivan.todorovich@camptocamp.com>
+* Thomas Binsfeld <thomas.binsfeld@acsone.eu>
 
 Maintainers
 ~~~~~~~~~~~
diff --git a/connector_elasticsearch/__manifest__.py b/connector_elasticsearch/__manifest__.py
@@ -5,7 +5,7 @@
     "name": "connector_elasticsearch",
     "category": "Connector",
     "summary": "Connector For Elasticsearch Search Engine",
-    "version": "16.0.0.2.2",
+    "version": "16.0.0.3.0",
     "license": "AGPL-3",
     "author": "ACSONE SA/NV, Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/search-engine",
@@ -15,6 +15,12 @@
     ],
     "demo": ["demo/backend_demo.xml"],
     # TODO: Get latest improvements from elasticsearch library
-    "external_dependencies": {"python": ["elasticsearch>=7.0.0,<=7.13.4", "requests"]},
+    "external_dependencies": {
+        "python": [
+            "elasticsearch>=7.0.0,<9.0.0",
+            "elastic-transport>=8.15.1,<9.0.0",
+            "requests",
+        ]
+    },
     "installable": True,
 }
diff --git a/connector_elasticsearch/readme/CONTRIBUTORS.rst b/connector_elasticsearch/readme/CONTRIBUTORS.rst
@@ -3,3 +3,4 @@
 * Raphaël Reverdy <raphael.reverdy@akretion.com>
 * Simone Orsi <simone.orsi@camptocamp.com>
 * Iván Todorovich <ivan.todorovich@camptocamp.com>
+* Thomas Binsfeld <thomas.binsfeld@acsone.eu>
diff --git a/connector_elasticsearch/readme/HISTORY.rst b/connector_elasticsearch/readme/HISTORY.rst
@@ -1,3 +1,9 @@
+16.0.0.3.0
+~~~~~~~~~~
+
+* elasticsearch v8 compatibility: The connector now supports Elasticsearch
+  v8.*.* versions.
+
 12.0.?.?.? (unreleased)
 ~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/connector_elasticsearch/static/description/index.html b/connector_elasticsearch/static/description/index.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
-<title>README.rst</title>
+<title>connector_elasticsearch</title>
 <style type="text/css">
 
 /*
@@ -360,43 +360,46 @@
 </style>
 </head>
 <body>
-<div class="document">
+<div class="document" id="connector-elasticsearch">
+<h1 class="title">connector_elasticsearch</h1>
 
-
-<a class="reference external image-reference" href="https://odoo-community.org/get-involved?utm_source=readme">
-<img alt="Odoo Community Association" src="https://odoo-community.org/readme-banner-image" />
-</a>
-<div class="section" id="connector-elasticsearch">
-<h1>connector_elasticsearch</h1>
 <!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! source digest: sha256:78a5e739fb7a867f6a968d7a4cae5e9778d3e5b3afa33a598b232e03ceb48b07
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/license-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/search-engine/tree/16.0/connector_elasticsearch"><img alt="OCA/search-engine" src="https://img.shields.io/badge/github-OCA%2Fsearch--engine-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/search-engine-16-0/search-engine-16-0-connector_elasticsearch"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/search-engine&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/search-engine/tree/16.0/connector_elasticsearch"><img alt="OCA/search-engine" src="https://img.shields.io/badge/github-OCA%2Fsearch--engine-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/search-engine-16-0/search-engine-16-0-connector_elasticsearch"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/search-engine&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This addon provides the bases to implement addons to export information to
 <a class="reference external" href="https://www.elastic.co/">Elasticsearch</a> indexes.</p>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
 <ul class="simple">
 <li><a class="reference internal" href="#changelog" id="toc-entry-1">Changelog</a><ul>
-<li><a class="reference internal" href="#unreleased" id="toc-entry-2">12.0.?.?.? (unreleased)</a></li>
+<li><a class="reference internal" href="#section-1" id="toc-entry-2">16.0.0.3.0</a></li>
+<li><a class="reference internal" href="#unreleased" id="toc-entry-3">12.0.?.?.? (unreleased)</a></li>
 </ul>
 </li>
-<li><a class="reference internal" href="#bug-tracker" id="toc-entry-3">Bug Tracker</a></li>
-<li><a class="reference internal" href="#credits" id="toc-entry-4">Credits</a><ul>
-<li><a class="reference internal" href="#authors" id="toc-entry-5">Authors</a></li>
-<li><a class="reference internal" href="#contributors" id="toc-entry-6">Contributors</a></li>
-<li><a class="reference internal" href="#maintainers" id="toc-entry-7">Maintainers</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-4">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-5">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-6">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="toc-entry-7">Contributors</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-8">Maintainers</a></li>
 </ul>
 </li>
 </ul>
 </div>
 <div class="section" id="changelog">
-<h2><a class="toc-backref" href="#toc-entry-1">Changelog</a></h2>
+<h1><a class="toc-backref" href="#toc-entry-1">Changelog</a></h1>
+<div class="section" id="section-1">
+<h2><a class="toc-backref" href="#toc-entry-2">16.0.0.3.0</a></h2>
+<ul class="simple">
+<li>elasticsearch v8 compatibility: The connector now supports Elasticsearch
+v8.*.* versions.</li>
+</ul>
+</div>
 <div class="section" id="unreleased">
-<h3><a class="toc-backref" href="#toc-entry-2">12.0.?.?.? (unreleased)</a></h3>
+<h2><a class="toc-backref" href="#toc-entry-3">12.0.?.?.? (unreleased)</a></h2>
 <ul class="simple">
 <li>connector_elasticsearch: Makes the config on index required only if the
 index is linked to an elastisearch backend. This change allows the usage
@@ -405,33 +408,34 @@ <h3><a class="toc-backref" href="#toc-entry-2">12.0.?.?.? (unreleased)</a></h3>
 </div>
 </div>
 <div class="section" id="bug-tracker">
-<h2><a class="toc-backref" href="#toc-entry-3">Bug Tracker</a></h2>
+<h1><a class="toc-backref" href="#toc-entry-4">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/search-engine/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
 <a class="reference external" href="https://github.com/OCA/search-engine/issues/new?body=module:%20connector_elasticsearch%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
-<h2><a class="toc-backref" href="#toc-entry-4">Credits</a></h2>
+<h1><a class="toc-backref" href="#toc-entry-5">Credits</a></h1>
 <div class="section" id="authors">
-<h3><a class="toc-backref" href="#toc-entry-5">Authors</a></h3>
+<h2><a class="toc-backref" href="#toc-entry-6">Authors</a></h2>
 <ul class="simple">
 <li>ACSONE SA/NV</li>
 </ul>
 </div>
 <div class="section" id="contributors">
-<h3><a class="toc-backref" href="#toc-entry-6">Contributors</a></h3>
+<h2><a class="toc-backref" href="#toc-entry-7">Contributors</a></h2>
 <ul class="simple">
 <li>Laurent Corron &lt;<a class="reference external" href="mailto:laurentcorron&#64;gmail.com">laurentcorron&#64;gmail.com</a>&gt;</li>
 <li>Laurent Mignon &lt;<a class="reference external" href="mailto:laurent.mignon&#64;acsone.eu">laurent.mignon&#64;acsone.eu</a>&gt;</li>
 <li>Raphaël Reverdy &lt;<a class="reference external" href="mailto:raphael.reverdy&#64;akretion.com">raphael.reverdy&#64;akretion.com</a>&gt;</li>
 <li>Simone Orsi &lt;<a class="reference external" href="mailto:simone.orsi&#64;camptocamp.com">simone.orsi&#64;camptocamp.com</a>&gt;</li>
 <li>Iván Todorovich &lt;<a class="reference external" href="mailto:ivan.todorovich&#64;camptocamp.com">ivan.todorovich&#64;camptocamp.com</a>&gt;</li>
+<li>Thomas Binsfeld &lt;<a class="reference external" href="mailto:thomas.binsfeld&#64;acsone.eu">thomas.binsfeld&#64;acsone.eu</a>&gt;</li>
 </ul>
 </div>
 <div class="section" id="maintainers">
-<h3><a class="toc-backref" href="#toc-entry-7">Maintainers</a></h3>
+<h2><a class="toc-backref" href="#toc-entry-8">Maintainers</a></h2>
 <p>This module is maintained by the OCA.</p>
 <a class="reference external image-reference" href="https://odoo-community.org">
 <img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
@@ -444,6 +448,5 @@ <h3><a class="toc-backref" href="#toc-entry-7">Maintainers</a></h3>
 </div>
 </div>
 </div>
-</div>
 </body>
 </html>
diff --git a/connector_elasticsearch/tools/adapter.py b/connector_elasticsearch/tools/adapter.py
@@ -67,14 +67,18 @@ def _get_es_client(self):
             )
         if backend.auth_type == "http":
             auth = (backend.es_user, backend.es_password)
-            return elasticsearch.Elasticsearch(
-                [backend.es_server_host],
-                http_auth=auth,
-                use_ssl=backend.ssl,
-                timeout=max(backend.es_timeout, 1),
-                retry_on_timeout=backend.es_retry_on_timeout,
-                max_retries=max(0, backend.es_max_retries),
-            )
+            es_kwargs = {
+                "hosts": [backend.es_server_host],
+                "http_auth": auth,
+                "timeout": max(backend.es_timeout, 1),
+                "retry_on_timeout": backend.es_retry_on_timeout,
+                "max_retries": max(0, backend.es_max_retries),
+            }
+            # Pass use_ssl only if elasticsearch < 8
+            es_version = elasticsearch.__version__
+            if es_version and es_version[0] < 8:
+                es_kwargs["use_ssl"] = backend.ssl
+            return elasticsearch.Elasticsearch(**es_kwargs)
 
     def test_connection(self):
         es = self._es_client
@@ -156,7 +160,7 @@ def each(self) -> Iterator[dict[str, Any]]:
 
     def settings(self) -> None:
         es = self._es_client
-        if not es.indices.exists(self._index_name):
+        if not es.indices.exists(index=self._index_name):
             client = self._es_client
             # To allow rolling updates, we work with index aliases
             aliased_index_name = self._get_next_aliased_index_name()
diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,6 @@
 # generated from manifests external_dependencies
-elasticsearch>=7.0.0,<=7.13.4
+elastic-transport>=8.15.1,<9.0.0
+elasticsearch>=7.0.0,<9.0.0
 pydantic
 requests
 typing-extensions
