Merge branch 'master' into 8.x

curator/actions/allocation.py

@@ -29,7 +29,7 @@ def __init__(
 
         .. note::
             See:
-            https://www.elastic.co/guide/en/elasticsearch/reference/6.8/shard-allocation-filtering.html
+            https://www.elastic.co/guide/en/elasticsearch/reference/8.6/shard-allocation-filtering.html
         """
         verify_index_list(ilo)
         if not key:

curator/actions/cluster_routing.py

@@ -12,7 +12,7 @@ def __init__(
         """
         For now, the cluster routing settings are hardcoded to be ``transient``
 
-        :arg client: An :class:`elasticsearch8.Elasticsearch` client object
+        :arg client: An :class:`elasticsearch.Elasticsearch` client object
         :arg routing_type: Type of routing to apply. Either `allocation` or
             `rebalance`
         :arg setting: Currently, the only acceptable value for `setting` is
@@ -31,7 +31,7 @@ def __init__(
         """
         verify_client_object(client)
         #: Instance variable.
-        #: An :class:`elasticsearch8.Elasticsearch` client object
+        #: An :class:`elasticsearch.Elasticsearch` client object
         self.client = client
         self.loggit = logging.getLogger('curator.actions.cluster_routing')
         #: Instance variable.

curator/actions/create_index.py

@@ -9,12 +9,12 @@ class CreateIndex:
     """Create Index Action Class"""
     def __init__(self, client, name=None, extra_settings=None, ignore_existing=False):
         """
-        :arg client: An :class:`elasticsearch8.Elasticsearch` client object
+        :arg client: An :class:`elasticsearch.Elasticsearch` client object
         :arg name: A name, which can contain :py:func:`time.strftime`
             strings
         :arg extra_settings: The `settings` and `mappings` for the index. For
             more information see
-            https://www.elastic.co/guide/en/elasticsearch/reference/6.8/indices-create-index.html
+            https://www.elastic.co/guide/en/elasticsearch/reference/8.6/indices-create-index.html
         :type extra_settings: dict, representing the settings and mappings.
         :arg ignore_existing: If an index already exists, and this setting is ``True``,
             ignore the 400 error that results in a `resource_already_exists_exception` and
@@ -32,7 +32,7 @@ def __init__(self, client, name=None, extra_settings=None, ignore_existing=False
         #: whether to ignore the error if the index already exists.
         self.ignore_existing = ignore_existing
         #: Instance variable.
-        #: An :class:`elasticsearch8.Elasticsearch` client object
+        #: An :class:`elasticsearch.Elasticsearch` client object
         self.client = client
 
         self.extra_settings = extra_settings

curator/actions/reindex.py

@@ -21,7 +21,7 @@ def __init__(
         """
         :arg ilo: A :class:`curator.indexlist.IndexList` object
         :arg request_body: The body to send to
-            :py:meth:`elasticsearch8.Elasticsearch.reindex`, which must be complete and
+            :py:meth:`elasticsearch.Elasticsearch.reindex`, which must be complete and
             usable, as Curator will do no vetting of the request_body. If it
             fails to function, Curator will return an exception.
         :arg refresh: Whether to refresh the entire target index after the
@@ -334,7 +334,7 @@ def do_dry_run(self):
 
     def do_action(self):
         """
-        Execute :py:meth:`elasticsearch8.Elasticsearch.reindex` operation with the
+        Execute :py:meth:`elasticsearch.Elasticsearch.reindex` operation with the
         provided request_body and arguments.
         """
         try:

curator/actions/rollover.py

@@ -12,7 +12,7 @@ def __init__(
             wait_for_active_shards=1
         ):
         """
-        :arg client: An :class:`elasticsearch8.Elasticsearch` client object
+        :arg client: An :class:`elasticsearch.Elasticsearch` client object
         :arg name: The name of the single-index-mapped alias to test for
             rollover conditions.
         :new_index: The new index name

curator/actions/shrink.py

@@ -185,7 +185,7 @@ def most_available_node(self):
         Determine which data node name has the most available free space, and
         meets the other node filters settings.
 
-        :arg client: An :class:`elasticsearch8.Elasticsearch` client object
+        :arg client: An :class:`elasticsearch.Elasticsearch` client object
         """
         mvn_avail = 0
         # mvn_total = 0