Fix Elasticsearch index behavior in case of missing settings (#42426) (…

…#42475) * Unskip test * Bold move: assumes we can drop test coverage for unsupported versions * Added test case: index with no cluster state entry or settings * Added comment about "race situation" * Logged index settings error as debug, fixed test case * Handling for multi version tests * Added changelog entry --------- Co-authored-by: Valentin Crettaz <[email protected]> Co-authored-by: Valentin Crettaz <[email protected]> (cherry picked from commit 074a201) Co-authored-by: Alexis Charveriat <[email protected]>
elastic · Jan 30, 2025 · a66e657 · a66e657
1 parent 3da4be4
commit a66e657
Show file tree

Hide file tree

Showing 31 changed files with 171,281 additions and 14,549 deletions.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -140,6 +140,7 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff]
 - Add AWS OwningAccount support for cross account monitoring {issue}40570[40570] {pull}40691[40691]
 - Use namespace for GetListMetrics when exists in AWS {pull}41022[41022]
 - Continue collecting metrics even if the Cisco Meraki `getDeviceLicenses` operation fails. {pull}42397[42397]
+- Fixed errors in the `elasticsearch.index` metricset when index settings are missing. {issue}42424[42424] {pull}42426[42426]
 
 *Osquerybeat*
 

diff --git a/filebeat/tests/system/test_input.py b/filebeat/tests/system/test_input.py
@@ -704,7 +704,7 @@ def test_restart_recursive_glob(self):
         filebeat = self.start_beat()
 
         self.wait_until(
-            lambda: self.output_has_message("entry2", output_file="output/filebeat-"+self.today+"-1.ndjson"),
+            lambda: self.output_has_message("entry2", output_file="output/filebeat-" + self.today + "-1.ndjson"),
             max_timeout=10,
             name="output contains 'entry2'")
 

diff --git a/libbeat/tests/system/beat/common_tests.py b/libbeat/tests/system/beat/common_tests.py
@@ -103,7 +103,7 @@ def test_export_config(self):
 class TestDashboardMixin:
 
     @unittest.skipUnless(INTEGRATION_TESTS, "integration test")
-    @pytest.mark.timeout(5*60, func_only=True)
+    @pytest.mark.timeout(5 * 60, func_only=True)
     def test_dashboards(self):
         """
         Test that the dashboards can be loaded with `setup --dashboards`

diff --git a/libbeat/tests/system/idxmgmt.py b/libbeat/tests/system/idxmgmt.py
@@ -35,7 +35,7 @@ def delete_index_and_alias(self, index=""):
             index = self._index
 
         for pattern in self.patterns:
-            index_with_pattern = index+"-"+pattern
+            index_with_pattern = index + "-" + pattern
             try:
                 self._client.indices.delete(index_with_pattern)
                 self._client.indices.delete_alias(index, index_with_pattern)

diff --git a/libbeat/tests/system/test_cmd_setup_index_management.py b/libbeat/tests/system/test_cmd_setup_index_management.py
@@ -79,7 +79,7 @@ def test_setup_template_disabled(self):
                                               "-E", "setup.template.enabled=false"])
 
         assert exit_code == 0
-        self.idxmgmt.assert_index_template_not_loaded(self.data_stream+"ba")
+        self.idxmgmt.assert_index_template_not_loaded(self.data_stream + "ba")
         self.idxmgmt.assert_policy_created(self.policy_name)
 
     @unittest.skipUnless(INTEGRATION_TESTS, "integration test")