Ensure default policies after preconfig

elastic · Apr 13, 2021 · 50b682b · 50b682b
1 parent 039cfc5
commit 50b682b
Showing 1 changed file with 27 additions and 24 deletions.
diff --git a/x-pack/plugins/fleet/server/services/setup.ts b/x-pack/plugins/fleet/server/services/setup.ts
@@ -50,17 +50,10 @@ async function createSetupSideEffects(
   soClient: SavedObjectsClientContract,
   esClient: ElasticsearchClient
 ): Promise<SetupStatus> {
-  const [
-    installedPackages,
-    defaultOutput,
-    { created: defaultAgentPolicyCreated, policy: defaultAgentPolicy },
-    { created: defaultFleetServerPolicyCreated, policy: defaultFleetServerPolicy },
-  ] = await Promise.all([
+  const [installedPackages, defaultOutput] = await Promise.all([
     // packages installed by default
     ensureInstalledDefaultPackages(soClient, esClient),
     outputService.ensureDefaultOutput(soClient),
-    agentPolicyService.ensureDefaultAgentPolicy(soClient, esClient),
-    agentPolicyService.ensureDefaultFleetServerAgentPolicy(soClient, esClient),
     updateFleetRoleIfExists(esClient),
     settingsService.getSettings(soClient).catch((e: any) => {
       if (e.isBoom && e.output.statusCode === 404) {
@@ -88,6 +81,32 @@ async function createSetupSideEffects(
     esClient,
   });
 
+  const { agentPolicies: policiesOrUndefined, packages: packagesOrUndefined } =
+    appContextService.getConfig() ?? {};
+
+  const policies = policiesOrUndefined ?? [];
+  const packages = packagesOrUndefined ?? [];
+
+  await ensurePreconfiguredPackagesAndPolicies(
+    soClient,
+    esClient,
+    policies,
+    packages,
+    defaultOutput
+  );
+
+  // Ensure the predefined default policies AFTER loading preconfigured policies. This allows the kibana config
+  // to override the default agent policies.
+
+  const [
+    { created: defaultAgentPolicyCreated, policy: defaultAgentPolicy },
+    { created: defaultFleetServerPolicyCreated, policy: defaultFleetServerPolicy },
+  ] = await Promise.all([
+    agentPolicyService.ensureDefaultAgentPolicy(soClient, esClient),
+    agentPolicyService.ensureDefaultFleetServerAgentPolicy(soClient, esClient),
+  ]);
+
+  // If we just created the default fleet server policy add the fleet server package
   if (defaultFleetServerPolicyCreated) {
     await addPackageToAgentPolicy(
       soClient,
@@ -98,8 +117,6 @@ async function createSetupSideEffects(
     );
   }
 
-  // If we just created the default fleet server policy add the fleet server package
-
   // If we just created the default policy, ensure default packages are added to it
   if (defaultAgentPolicyCreated) {
     const agentPolicyWithPackagePolicies = await agentPolicyService.get(
@@ -153,20 +170,6 @@ async function createSetupSideEffects(
 
   await ensureAgentActionPolicyChangeExists(soClient);
 
-  const { agentPolicies: policiesOrUndefined, packages: packagesOrUndefined } =
-    appContextService.getConfig() ?? {};
-
-  const policies = policiesOrUndefined ?? [];
-  const packages = packagesOrUndefined ?? [];
-
-  await ensurePreconfiguredPackagesAndPolicies(
-    soClient,
-    esClient,
-    policies,
-    packages,
-    defaultOutput
-  );
-
   return { isIntialized: true };
 }