Revert "Upgrade Elasticsearch client to 8.x (#1669)" (#1682)

This reverts commit bc4625c.
elastic · Mar 4, 2023 · e01b1e0 · e01b1e0
1 parent bc4625c
commit e01b1e0
Show file tree

Hide file tree

Showing 28 changed files with 849 additions and 1,570 deletions.
diff --git a/docs/command_line_reference.rst b/docs/command_line_reference.rst
@@ -765,31 +765,34 @@ Define a JSON file containing a list of objects with the following properties:
 
 * ``path``: A path or path pattern that should be matched. Only leading and trailing wildcards (``*``) are supported. A path containing only a wildcard acts matches any path.
 * ``body``: The respective response body.
+* ``body-encoding``: Either ``raw`` or ``json``. Use ``json`` by default and ``raw`` for the operation-type ``bulk`` and ``search``.
 
 Here we define the necessary responses for a track that bulk-indexes data::
 
     [
-      {
-        "path": "/_cluster/settings",
-        "body": {
-          "transient": {
-              "action.destructive_requires_name": "true"
-          }
-        }
-      },
       {
         "path": "*/_bulk",
         "body": {
           "errors": false,
           "took": 1
-        }
+        },
+        "body-encoding": "raw"
       },
       {
         "path": "/_cluster/health*",
         "body": {
           "status": "green",
           "relocating_shards": 0
-        }
+        },
+        "body-encoding": "json"
+      },
+      {
+        "path": "/_cluster/settings",
+        "body": {
+          "persistent": {},
+          "transient": {}
+        },
+        "body-encoding": "json"
       },
       {
         "path": "/_all/_stats/_all",
@@ -801,11 +804,13 @@ Here we define the necessary responses for a track that bulk-indexes data::
               }
             }
           }
-        }
+        },
+        "body-encoding": "json"
       },
       {
         "path": "*",
-        "body": {}
+        "body": {},
+        "body-encoding": "json"
       }
     ]
 

diff --git a/docs/migrate.rst b/docs/migrate.rst
@@ -4,10 +4,6 @@ Migration Guide
 Migrating to Rally 2.7.1
 ------------------------
 
-Elasticsearch client logs are now captured by the `elastic_transport <https://github.com/elastic/elastic-transport-python/>`_ logger
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Rally migrated to the 8.x version of the ``elasticsearch-py`` library which uses a new logger named ``elastic_transport``. Rally will automatically configure this logger to only emit logs of level ``WARNING`` and above, even if a past Rally version configured logging using the ``~./rally/logging.json`` file without that logger.
-
 Snapshot repository plugins are no longer built from source
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^