Skip to content

Commit

Permalink
Disable reading preconfig from kibana.yml in plugin setup
Browse files Browse the repository at this point in the history
  • Loading branch information
Zacqary committed Mar 24, 2021
1 parent 8f72a6f commit edc5cf7
Showing 1 changed file with 1 addition and 19 deletions.
20 changes: 1 addition & 19 deletions x-pack/plugins/fleet/server/services/setup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import type { PackagePolicy } from '../../common';

import { SO_SEARCH_LIMIT } from '../constants';

import { appContextService } from './app_context';
import { agentPolicyService } from './agent_policy';
import { outputService } from './output';
import {
Expand All @@ -30,10 +29,7 @@ import { awaitIfPending } from './setup_utils';
import { createDefaultSettings } from './settings';
import { ensureAgentActionPolicyChangeExists } from './agents';
import { awaitIfFleetServerSetupPending } from './fleet_server';
import {
ensurePreconfiguredPackagesAndPolicies,
addPackageToAgentPolicy,
} from './policy_preconfig';
import { addPackageToAgentPolicy } from './policy_preconfig';

const FLEET_ENROLL_USERNAME = 'fleet_enroll';
const FLEET_ENROLL_ROLE = 'fleet_enroll';
Expand Down Expand Up @@ -156,20 +152,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 };
}

Expand Down

0 comments on commit edc5cf7

Please sign in to comment.