Merge branch '7.17' into backport/7.17/pr-182683

x-pack/test/api_integration/apis/ml/indices/field_caps.ts

@@ -30,10 +30,7 @@ export default ({ getService }: FtrProviderContext) => {
     return body;
   }
 
-  // Failing: See https://github.com/elastic/kibana/issues/182837
-  describe.skip('field_caps', function () {
-    // Failing ES Forward Compatibility: https://github.com/elastic/kibana/issues/182514
-    this.onlyEsVersion('>=8');
+  describe('field_caps', function () {
     before(async () => {
       await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote');
     });
@@ -64,9 +61,16 @@ export default ({ getService }: FtrProviderContext) => {
         `Expected number of indices to be 1, but got ${indices.length}`
       );
       const fieldsLength = Object.keys(fields).length;
+
+      // The number of fields returned by the field caps API is different across
+      // ES versions in forward compatibility tests. In ES 8.15.0, the `_ignored_source`
+      // field was added (https://github.com/elastic/elasticsearch/pull/107567).
+      const esVersion = getService('esVersion');
+      const expectedFieldsLength = esVersion.matchRange('>=8.15') ? 22 : 21;
+
       expect(fieldsLength).to.eql(
-        21,
-        `Expected number of fields to be 21, but got ${fieldsLength}`
+        expectedFieldsLength,
+        `Expected number of fields to be ${expectedFieldsLength}, but got ${fieldsLength}`
       );
     });
   });