[Ingest Manager] Improve agent enrollment perfomance (#68480) (#68926)

elastic · Jun 12, 2020 · 23a2381 · 23a2381
1 parent 3f5daeb
commit 23a2381
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 3 deletions.
diff --git a/x-pack/plugins/ingest_manager/server/services/agents/enroll.ts b/x-pack/plugins/ingest_manager/server/services/agents/enroll.ts
@@ -42,7 +42,9 @@ export async function enroll(
 
   let agent;
   if (existingAgent) {
-    await soClient.update<AgentSOAttributes>(AGENT_SAVED_OBJECT_TYPE, existingAgent.id, agentData);
+    await soClient.update<AgentSOAttributes>(AGENT_SAVED_OBJECT_TYPE, existingAgent.id, agentData, {
+      refresh: false,
+    });
     agent = {
       ...existingAgent,
       ...agentData,
@@ -52,7 +54,9 @@ export async function enroll(
     } as Agent;
   } else {
     agent = savedObjectToAgent(
-      await soClient.create<AgentSOAttributes>(AGENT_SAVED_OBJECT_TYPE, agentData)
+      await soClient.create<AgentSOAttributes>(AGENT_SAVED_OBJECT_TYPE, agentData, {
+        refresh: false,
+      })
     );
   }
 

diff --git a/x-pack/plugins/ingest_manager/server/services/output.ts b/x-pack/plugins/ingest_manager/server/services/output.ts
@@ -11,6 +11,8 @@ import { decodeCloudId } from '../../common';
 
 const SAVED_OBJECT_TYPE = OUTPUT_SAVED_OBJECT_TYPE;
 
+let cachedAdminUser: null | { username: string; password: string } = null;
+
 class OutputService {
   public async ensureDefaultOutput(soClient: SavedObjectsClientContract) {
     const outputs = await soClient.find<Output>({
@@ -61,6 +63,10 @@ class OutputService {
   }
 
   public async getAdminUser(soClient: SavedObjectsClientContract) {
+    if (cachedAdminUser) {
+      return cachedAdminUser;
+    }
+
     const defaultOutputId = await this.getDefaultOutputId(soClient);
     if (!defaultOutputId) {
       return null;
@@ -73,10 +79,12 @@ class OutputService {
       return null;
     }
 
-    return {
+    cachedAdminUser = {
       username: so!.attributes.fleet_enroll_username,
       password: so!.attributes.fleet_enroll_password,
     };
+
+    return cachedAdminUser;
   }
 
   public async create(
@@ -136,6 +144,12 @@ class OutputService {
       perPage: 1000,
     };
   }
+
+  // Warning! This method is not going to working in a scenario with multiple Kibana instances,
+  // in this case Kibana should be restarted if the Admin User change
+  public invalidateCache() {
+    cachedAdminUser = null;
+  }
 }
 
 export const outputService = new OutputService();
diff --git a/x-pack/plugins/ingest_manager/server/services/setup.ts b/x-pack/plugins/ingest_manager/server/services/setup.ts
@@ -135,6 +135,8 @@ export async function setupFleet(
     },
   });
 
+  await outputService.invalidateCache();
+
   // save fleet admin user
   const defaultOutputId = await outputService.getDefaultOutputId(soClient);
   if (!defaultOutputId) {