[Fleet] Make default integration install explicit

x-pack/plugins/fleet/common/constants/epm.ts

@@ -23,16 +23,9 @@ export const STANDALONE_RUN_INSTRUCTIONS_WINDOWS = '.\\elastic-agent.exe install
 
 /*
  Package rules:
-|               | unremovablePackages | defaultPackages | autoUpdatePackages |
-|---------------|:---------------------:|:---------------:|:------------------:|
-| Removable     |         ❌             |        ✔️        |          ✔️         |
-| Auto-installs |         ❌             |        ✔️        |          ❌         |
-| Auto-updates  |         ❌             |        ✔️        |          ✔️         |
-
-`endpoint` is a special package. It needs to autoupdate, it needs to _not_ be
-removable, but it doesn't install by default. Following the table, it needs to
-be in `unremovablePackages` and in `autoUpdatePackages`, but not in
-`defaultPackages`.
+|               | autoUpdatePackages |
+|---------------|:------------------:|
+| Auto-updates  |          ✔️         |
 
 
 We also define "auto upgrade policies" packages below. These are packages that are considered "stack-aligned"
@@ -42,15 +35,6 @@ in their custom policy editor implementations.
 
 */
 
-export const unremovablePackages = [
-  FLEET_SYSTEM_PACKAGE,
-  FLEET_ELASTIC_AGENT_PACKAGE,
-  FLEET_SERVER_PACKAGE,
-  FLEET_ENDPOINT_PACKAGE,
-];
-
-export const defaultPackages = unremovablePackages.filter((p) => p !== FLEET_ENDPOINT_PACKAGE);
-
 export const autoUpdatePackages = [
   FLEET_ENDPOINT_PACKAGE,
   FLEET_APM_PACKAGE,

x-pack/plugins/fleet/common/constants/preconfiguration.ts

@@ -6,18 +6,8 @@
  */
 
 import { uniqBy } from 'lodash';
-import uuidv5 from 'uuid/v5';
 
-import type { PreconfiguredAgentPolicy } from '../types';
-
-import {
-  defaultPackages,
-  FLEET_SYSTEM_PACKAGE,
-  FLEET_SERVER_PACKAGE,
-  autoUpdatePackages,
-  monitoringTypes,
-  autoUpgradePoliciesPackages,
-} from './epm';
+import { autoUpdatePackages, autoUpgradePoliciesPackages } from './epm';
 
 // UUID v5 values require a namespace. We use UUID v5 for some of our preconfigured ID values.
 export const UUID_V5_NAMESPACE = 'dde7c2de-1370-4c19-9975-b473d0e03508';
@@ -27,63 +17,6 @@ export const PRECONFIGURATION_DELETION_RECORD_SAVED_OBJECT_TYPE =
 
 export const PRECONFIGURATION_LATEST_KEYWORD = 'latest';
 
-type PreconfiguredAgentPolicyWithDefaultInputs = Omit<
-  PreconfiguredAgentPolicy,
-  'package_policies'
-> & {
-  package_policies: Array<Omit<PreconfiguredAgentPolicy['package_policies'][0], 'inputs'>>;
-};
-
-export const DEFAULT_AGENT_POLICY_ID_SEED = 'default-agent-policy';
-export const DEFAULT_SYSTEM_PACKAGE_POLICY_ID = 'default-system-policy';
-
-export const DEFAULT_AGENT_POLICY: PreconfiguredAgentPolicyWithDefaultInputs = {
-  id: uuidv5(DEFAULT_AGENT_POLICY_ID_SEED, UUID_V5_NAMESPACE),
-  name: 'Default policy',
-  namespace: 'default',
-  description: 'Default agent policy created by Kibana',
-  package_policies: [
-    {
-      id: DEFAULT_SYSTEM_PACKAGE_POLICY_ID,
-      name: `${FLEET_SYSTEM_PACKAGE}-1`,
-      package: {
-        name: FLEET_SYSTEM_PACKAGE,
-      },
-    },
-  ],
-  is_default: true,
-  is_managed: false,
-  monitoring_enabled: monitoringTypes,
-};
-
-export const DEFAULT_FLEET_SERVER_POLICY_ID = 'default-fleet-server-agent-policy';
-export const DEFAULT_FLEET_SERVER_AGENT_POLICY_ID_SEED = 'default-fleet-server';
-
-export const DEFAULT_FLEET_SERVER_AGENT_POLICY: PreconfiguredAgentPolicyWithDefaultInputs = {
-  id: uuidv5(DEFAULT_FLEET_SERVER_AGENT_POLICY_ID_SEED, UUID_V5_NAMESPACE),
-  name: 'Default Fleet Server policy',
-  namespace: 'default',
-  description: 'Default Fleet Server agent policy created by Kibana',
-  package_policies: [
-    {
-      id: DEFAULT_FLEET_SERVER_POLICY_ID,
-      name: `${FLEET_SERVER_PACKAGE}-1`,
-      package: {
-        name: FLEET_SERVER_PACKAGE,
-      },
-    },
-  ],
-  is_default: false,
-  is_default_fleet_server: true,
-  is_managed: false,
-  monitoring_enabled: monitoringTypes,
-};
-
-export const DEFAULT_PACKAGES = defaultPackages.map((name) => ({
-  name,
-  version: PRECONFIGURATION_LATEST_KEYWORD,
-}));
-
 export const AUTO_UPDATE_PACKAGES = autoUpdatePackages.map((name) => ({
   name,
   version: PRECONFIGURATION_LATEST_KEYWORD,
@@ -97,7 +30,7 @@ export const AUTO_UPGRADE_POLICIES_PACKAGES = autoUpgradePoliciesPackages.map((n
 
 // Controls whether the `Keep Policies up to date` setting is exposed to the user
 export const KEEP_POLICIES_UP_TO_DATE_PACKAGES = uniqBy(
-  [...AUTO_UPGRADE_POLICIES_PACKAGES, ...DEFAULT_PACKAGES, ...AUTO_UPDATE_PACKAGES],
+  [...AUTO_UPGRADE_POLICIES_PACKAGES, ...AUTO_UPDATE_PACKAGES],
   ({ name }) => name
 );
 

x-pack/plugins/fleet/common/openapi/bundled.json

@@ -3002,9 +3002,14 @@
             ]
           },
           "is_default": {
-            "type": "boolean"
+            "type": "boolean",
+            "deprecated": true
           },
           "is_default_fleet_server": {
+            "type": "boolean",
+            "deprecated": true
+          },
+          "has_fleet_server": {
             "type": "boolean"
           },
           "data_output_id": {

x-pack/plugins/fleet/common/openapi/bundled.yaml

@@ -1850,8 +1850,12 @@ components:
             - type: number
         is_default:
           type: boolean
+          deprecated: true
         is_default_fleet_server:
           type: boolean
+          deprecated: true
+        has_fleet_server:
+          type: boolean
         data_output_id:
           type: string
         monitoring_output_id:

x-pack/plugins/fleet/common/openapi/components/schemas/preconfigured_agent_policies.yaml

@@ -24,8 +24,12 @@ properties:
       - type: number
   is_default:
     type: boolean
+    deprecated: true
   is_default_fleet_server:
     type: boolean
+    deprecated: true
+  has_fleet_server:
+    type: boolean  
   data_output_id:
     type: string
   monitoring_output_id:

x-pack/plugins/fleet/common/types/models/agent_policy.ts

@@ -19,6 +19,7 @@ export interface NewAgentPolicy {
   description?: string;
   is_default?: boolean;
   is_default_fleet_server?: boolean; // Optional when creating a policy
+  has_fleet_server?: boolean;
   is_managed?: boolean; // Optional when creating a policy
   monitoring_enabled?: MonitoringType;
   unenroll_timeout?: number;