From 5391d5f25c877f31982817a0b2571d8b73a47982 Mon Sep 17 00:00:00 2001
From: Mike Cote <michel.cote@elastic.co>
Date: Thu, 14 Apr 2022 16:58:04 -0400
Subject: [PATCH 1/2] Add require_alias to index event log documents

---
 .../server/es/cluster_client_adapter.test.ts     | 16 +++++++++++-----
 .../server/es/cluster_client_adapter.ts          |  2 +-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/x-pack/plugins/event_log/server/es/cluster_client_adapter.test.ts b/x-pack/plugins/event_log/server/es/cluster_client_adapter.test.ts
index 56a708ef51b67..920a6a7d34e16 100644
--- a/x-pack/plugins/event_log/server/es/cluster_client_adapter.test.ts
+++ b/x-pack/plugins/event_log/server/es/cluster_client_adapter.test.ts
@@ -44,7 +44,7 @@ describe('indexDocument', () => {
     });
 
     expect(clusterClient.bulk).toHaveBeenCalledWith({
-      body: [{ create: { _index: 'event-log' } }, { message: 'foo' }],
+      body: [{ create: { _index: 'event-log', require_alias: true } }, { message: 'foo' }],
     });
   });
 
@@ -92,7 +92,10 @@ describe('buffering documents', () => {
 
     const expectedBody = [];
     for (let i = 0; i < EVENT_BUFFER_LENGTH - 1; i++) {
-      expectedBody.push({ create: { _index: 'event-log' } }, { message: `foo ${i}` });
+      expectedBody.push(
+        { create: { _index: 'event-log', require_alias: true } },
+        { message: `foo ${i}` }
+      );
     }
 
     expect(clusterClient.bulk).toHaveBeenCalledWith({
@@ -112,7 +115,10 @@ describe('buffering documents', () => {
 
     const expectedBody = [];
     for (let i = 0; i < EVENT_BUFFER_LENGTH; i++) {
-      expectedBody.push({ create: { _index: 'event-log' } }, { message: `foo ${i}` });
+      expectedBody.push(
+        { create: { _index: 'event-log', require_alias: true } },
+        { message: `foo ${i}` }
+      );
     }
 
     expect(clusterClient.bulk).toHaveBeenNthCalledWith(1, {
@@ -120,7 +126,7 @@ describe('buffering documents', () => {
     });
 
     expect(clusterClient.bulk).toHaveBeenNthCalledWith(2, {
-      body: [{ create: { _index: 'event-log' } }, { message: `foo 100` }],
+      body: [{ create: { _index: 'event-log', require_alias: true } }, { message: `foo 100` }],
     });
   });
 
@@ -146,7 +152,7 @@ describe('buffering documents', () => {
       const expectedBody = [];
       for (let j = 0; j < EVENT_BUFFER_LENGTH; j++) {
         expectedBody.push(
-          { create: { _index: 'event-log' } },
+          { create: { _index: 'event-log', require_alias: true } },
           { message: `foo ${i * EVENT_BUFFER_LENGTH + j}` }
         );
       }
diff --git a/x-pack/plugins/event_log/server/es/cluster_client_adapter.ts b/x-pack/plugins/event_log/server/es/cluster_client_adapter.ts
index 502e48795f0cc..e190ce39f6b54 100644
--- a/x-pack/plugins/event_log/server/es/cluster_client_adapter.ts
+++ b/x-pack/plugins/event_log/server/es/cluster_client_adapter.ts
@@ -123,7 +123,7 @@ export class ClusterClientAdapter<TDoc extends { body: AliasAny; index: string }
     for (const doc of docs) {
       if (doc.body === undefined) continue;
 
-      bulkBody.push({ create: { _index: doc.index } });
+      bulkBody.push({ create: { _index: doc.index, require_alias: true } });
       bulkBody.push(doc.body);
     }
 

From 890280456ff1a4aa0e8088f6cc6347ed70752853 Mon Sep 17 00:00:00 2001
From: Mike Cote <michel.cote@elastic.co>
Date: Mon, 18 Apr 2022 09:15:57 -0400
Subject: [PATCH 2/2] Fix jest test

---
 .../plugins/event_log/server/es/cluster_client_adapter.test.ts  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x-pack/plugins/event_log/server/es/cluster_client_adapter.test.ts b/x-pack/plugins/event_log/server/es/cluster_client_adapter.test.ts
index dbcfb085de3b1..ed740a27b81e4 100644
--- a/x-pack/plugins/event_log/server/es/cluster_client_adapter.test.ts
+++ b/x-pack/plugins/event_log/server/es/cluster_client_adapter.test.ts
@@ -55,7 +55,7 @@ describe('indexDocument', () => {
       return logger.error.mock.calls.length !== 0;
     });
 
-    const expectedMessage = `error writing bulk events: "expected failure"; docs: [{"create":{"_index":"event-log"}},{"message":"foo"}]`;
+    const expectedMessage = `error writing bulk events: "expected failure"; docs: [{"create":{"_index":"event-log","require_alias":true}},{"message":"foo"}]`;
     expect(logger.error).toHaveBeenCalledWith(expectedMessage);
   });
 });