Merge branch '8.x' into 8.0

Author: untergeek

.github/workflows/docs-build.yml

@@ -1,9 +1,10 @@
 name: docs-build
 
 on:
+  workflow_dispatch: ~
   push:
     branches:
-      - main
+      - master
   pull_request_target: ~
   merge_group: ~
 

curator/_version.py

@@ -1,3 +1,3 @@
 """Curator Version"""
 
-__version__ = '8.0.20'
+__version__ = '8.0.21'

curator/cli_singletons/alias.py

@@ -1,5 +1,6 @@
 """Alias Singleton"""
 
+# pylint: disable=R0913,R0917
 import logging
 import click
 from curator.cli_singletons.object_class import CLIAction

curator/cli_singletons/delete.py

@@ -1,11 +1,10 @@
 """Delete Index and Delete Snapshot Singletons"""
 
+# pylint: disable=R0913,R0917
 import click
 from curator.cli_singletons.object_class import CLIAction
 from curator.cli_singletons.utils import validate_filter_json
 
-# pylint: disable=R0913
-
 
 # Indices
 @click.command()

curator/cli_singletons/forcemerge.py

@@ -1,5 +1,6 @@
 """ForceMerge Singleton"""
 
+# pylint: disable=R0913,R0917
 import click
 from curator.cli_singletons.object_class import CLIAction
 from curator.cli_singletons.utils import validate_filter_json

curator/cli_singletons/object_class.py

@@ -1,5 +1,6 @@
 """Object builder"""
 
+# pylint: disable=W0718,R0902,R0912,R0913,R0914,R0917
 import logging
 import sys
 from voluptuous import Schema
@@ -261,10 +262,15 @@ def do_singleton_action(self, dry_run=False):
                 action_obj.do_dry_run()
             else:
                 action_obj.do_action()
-        # pylint: disable=broad-except
+        except NoIndices:  # Speficically to address #1704
+            if not self.ignore:
+                self.logger.critical('No indices in list after filtering. Exiting.')
+                sys.exit(1)
+            self.logger.info('No indices in list after filtering. Skipping action.')
         except Exception as exc:
             self.logger.critical(
-                'Failed to complete action: %s.  %s: %s', self.action, type(exc), exc
+                'Failed to complete action: %s. Exception: %s', self.action, exc
             )
             sys.exit(1)
         self.logger.info('"%s" action completed.', self.action)
+        sys.exit(0)

curator/indexlist.py

@@ -1,5 +1,6 @@
 """Index List Class"""
 
+# pylint: disable=R0904,R0913,R0917
 import re
 import itertools
 import logging
@@ -449,7 +450,9 @@ def empty_list_check(self):
         """Raise :py:exc:`~.curator.exceptions.NoIndices` if ``indices`` is empty"""
         self.loggit.debug('Checking for empty list')
         if not self.indices:
-            raise NoIndices('index_list object is empty.')
+            msg = 'IndexList object is empty. No indices to act on.'
+            self.loggit.debug(msg)
+            raise NoIndices(msg)
 
     def working_list(self):
         """

docs/Changelog.rst

@@ -3,8 +3,24 @@
 Changelog
 =========
 
-(8.0.20) (21 March 2025)
-------------------------
+8.0.21 (1 April 2025)
+---------------------
+
+**Bugfix Release**
+
+As was reported in #1704, the ``--ignore_empty_list`` option was not being respected.
+Code changes were made to each singleton that uses the ``--ignore_empty_list`` option
+to ensure that the option is respected.
+
+**Changes**
+
+  * Fix ``--ignore_empty_list`` option to be respected in all singletons.
+  * Add debug message to IndexList class when an empty list condition is encountered.
+  * Dependency version bump: ``es_client`` to ``8.17.5``
+
+
+8.0.20 (21 March 2025)
+----------------------
 
 **Patch Release**
 
@@ -29,8 +45,8 @@ as expected before this release.
   * Update asciidoc files to reflect the new version numbers.
 
 
-(8.0.19) (5 March 2025)
------------------------
+8.0.19 (5 March 2025)
+---------------------
 
 **Announcement**
 

docs/asciidoc/ilm.asciidoc

@@ -59,16 +59,15 @@ Read more about Filebeat and ILM {fbref}/ilm.html[here].
 NOTE: The Index Lifecycle Management feature requires version 9.3.1 or higher of the
 `logstash-output-elasticsearch` plugin.
 
-Logstash can use {esref}/index-lifecycle-management.html[Index Lifecycle Management]
+Logstash can use [Index Lifecycle Management](docs-content://manage-data/lifecycle/index-lifecycle-management/index-lifecycle.md)
 to automate the management of indices over time.
 
 The use of Index Lifecycle Management is controlled by the `ilm_enabled` setting. By
 default, this will automatically detect whether the Elasticsearch instance
 supports ILM, and will use it if it is available. `ilm_enabled` can also be set to
 `true` or `false` to override the automatic detection, or disable ILM.
 
-Read more about Logstash and ILM
-{lsref}/plugins-outputs-elasticsearch.html#plugins-outputs-elasticsearch-ilm[here].
+Read more about [Logstash and ILM](logstash-docs-md://lsr/plugins-outputs-elasticsearch.html#plugins-outputs-elasticsearch-ilm).
 
 
 [[ilm-and-curator]]