[Fleet] Make datastream rollover lazy

elastic · Jan 12, 2024 · 09beceb · 09beceb
1 parent 7b69611
commit 09beceb
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 36 deletions.
diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/template.test.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/template.test.ts
@@ -1611,7 +1611,14 @@ describe('EPM template', () => {
         },
       ]);
 
-      expect(esClient.indices.rollover).toHaveBeenCalled();
+      expect(esClient.transport.request).toHaveBeenCalledWith(
+        expect.objectContaining({
+          path: '/test.prefix1-default/_rollover',
+          querystring: {
+            lazy: true,
+          },
+        })
+      );
     });
     it('should skip rollover on expected error when flag is on', async () => {
       const esClient = elasticsearchServiceMock.createElasticsearchClient();

diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/template.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/template.ts
@@ -933,8 +933,12 @@ const getDataStreams = async (
 const rolloverDataStream = (dataStreamName: string, esClient: ElasticsearchClient) => {
   try {
     // Do no wrap rollovers in retryTransientEsErrors since it is not idempotent
-    return esClient.indices.rollover({
-      alias: dataStreamName,
+    return esClient.transport.request({
+      method: 'POST',
+      path: `/${dataStreamName}/_rollover`,
+      querystring: {
+        lazy: true,
+      },
     });
   } catch (error) {
     throw new PackageESError(

diff --git a/x-pack/test/fleet_api_integration/apis/epm/data_stream.ts b/x-pack/test/fleet_api_integration/apis/epm/data_stream.ts
@@ -41,43 +41,46 @@ export default function (providerContext: FtrProviderContext) {
       skipIfNoDockerRegistry(providerContext);
       setupFleetAndAgents(providerContext);
 
+      const writeMetricsDoc = (namespace: string) =>
+        es.transport.request(
+          {
+            method: 'POST',
+            path: `/${metricsTemplateName}-${namespace}/_doc?refresh=true`,
+            body: {
+              '@timestamp': '2015-01-01',
+              logs_test_name: 'test',
+              data_stream: {
+                dataset: `${pkgName}.test_metrics`,
+                namespace,
+                type: 'metrics',
+              },
+            },
+          },
+          { meta: true }
+        );
+
+      const writeLogsDoc = (namespace: string) =>
+        es.transport.request(
+          {
+            method: 'POST',
+            path: `/${logsTemplateName}-${namespace}/_doc?refresh=true`,
+            body: {
+              '@timestamp': '2015-01-01',
+              logs_test_name: 'test',
+              data_stream: {
+                dataset: `${pkgName}.test_logs`,
+                namespace,
+                type: 'logs',
+              },
+            },
+          },
+          { meta: true }
+        );
       beforeEach(async () => {
         await installPackage(pkgName, pkgVersion);
         await Promise.all(
           namespaces.map(async (namespace) => {
-            const createLogsRequest = es.transport.request(
-              {
-                method: 'POST',
-                path: `/${logsTemplateName}-${namespace}/_doc`,
-                body: {
-                  '@timestamp': '2015-01-01',
-                  logs_test_name: 'test',
-                  data_stream: {
-                    dataset: `${pkgName}.test_logs`,
-                    namespace,
-                    type: 'logs',
-                  },
-                },
-              },
-              { meta: true }
-            );
-            const createMetricsRequest = es.transport.request(
-              {
-                method: 'POST',
-                path: `/${metricsTemplateName}-${namespace}/_doc`,
-                body: {
-                  '@timestamp': '2015-01-01',
-                  logs_test_name: 'test',
-                  data_stream: {
-                    dataset: `${pkgName}.test_metrics`,
-                    namespace,
-                    type: 'metrics',
-                  },
-                },
-              },
-              { meta: true }
-            );
-            return Promise.all([createLogsRequest, createMetricsRequest]);
+            return Promise.all([writeLogsDoc(namespace), writeMetricsDoc(namespace)]);
           })
         );
       });
@@ -267,6 +270,7 @@ export default function (providerContext: FtrProviderContext) {
             .expect(200);
 
           // Datastream should have been rolled over
+          await writeLogsDoc('default');
           expect(await getLogsDefaultBackingIndicesLength()).to.be(2);
         });