From c2a849cdad3645c1c00230c0744a8390f09966d8 Mon Sep 17 00:00:00 2001
From: Jen Huang <its.jenetic@gmail.com>
Date: Wed, 9 Oct 2024 00:05:56 -0700
Subject: [PATCH] [UII] Adjust test based on ES version tested against
 (#195508)

## Summary

Follow up to #194764. This test was also failing on 7.17 branch when
they 8.x ES compatibility tests were run, so this PR adjusts the test
based on the ES version it runs against. This will be backported to 8.x
and 7.17.

(cherry picked from commit ab2d7aa5682bb18514a9fbdb2a539914d36b2c7b)

# Conflicts:
#	x-pack/test/fleet_api_integration/apis/epm/install_overrides.ts
---
 .../apis/epm/install_overrides.ts             | 57 +++++++++++--------
 1 file changed, 34 insertions(+), 23 deletions(-)

diff --git a/x-pack/test/fleet_api_integration/apis/epm/install_overrides.ts b/x-pack/test/fleet_api_integration/apis/epm/install_overrides.ts
index 8fa2d11f405d0..bf30840b48586 100644
--- a/x-pack/test/fleet_api_integration/apis/epm/install_overrides.ts
+++ b/x-pack/test/fleet_api_integration/apis/epm/install_overrides.ts
@@ -116,34 +116,45 @@ export default function (providerContext: FtrProviderContext) {
       // omit routings
       delete body.template.settings.index.routing;
 
-      expect(body).to.eql({
-        template: {
-          settings: {
-            index: {
-              codec: 'best_compression',
-              lifecycle: {
-                name: 'overridden by user',
-              },
-              mapping: {
-                total_fields: {
-                  limit: '10000',
-                },
+      expect(Object.keys(body)).to.eql(['template', 'overlapping']);
+      expect(body.template).to.eql({
+        settings: {
+          index: {
+            codec: 'best_compression',
+            lifecycle: {
+              name: 'overridden by user',
+            },
+            mapping: {
+              total_fields: {
+                limit: '10000',
               },
-              number_of_shards: '3',
             },
+            number_of_shards: '3',
           },
-          mappings: {
-            dynamic: 'false',
-          },
-          aliases: {},
         },
-        overlapping: [
-          {
-            name: 'logs',
-            index_patterns: ['logs-*-*'],
-          },
-        ],
+        mappings: {
+          dynamic: 'false',
+        },
+        aliases: {},
       });
+
+      // otel logs templates were added in 8.16 but these tests also run against
+      // previous versions, so we conditionally test based on the ES version
+      const esVersion = getService('esVersion');
+      expect(body.overlapping).to.eql([
+        {
+          name: 'logs',
+          index_patterns: ['logs-*-*'],
+        },
+        ...(esVersion.matchRange('>=8.16.0')
+          ? [
+              {
+                index_patterns: ['logs-*.otel-*'],
+                name: 'logs-otel@template',
+              },
+            ]
+          : []),
+      ]);
     });
   });
 }