Merge branch '7.x' into reporting/fn-testing-job-listing-iii-7x

x-pack/plugins/ingest_manager/README.md

@@ -3,7 +3,7 @@
 ## Plugin
 
 - The plugin is enabled by default. See the TypeScript type for the [the available plugin configuration options](https://github.com/elastic/kibana/blob/master/x-pack/plugins/ingest_manager/common/types/index.ts#L9-L27)
-- Adding `xpack.ingestManager.enabled=false` will disable the plugin including the EPM and Fleet features. It will also remove the `PACKAGE_CONFIG_API_ROUTES` and `AGENT_CONFIG_API_ROUTES` values in [`common/constants/routes.ts`](./common/constants/routes.ts)
+- Adding `xpack.ingestManager.enabled=false` will disable the plugin including the EPM and Fleet features. It will also remove the `PACKAGE_POLICY_API_ROUTES` and `AGENT_POLICY_API_ROUTES` values in [`common/constants/routes.ts`](./common/constants/routes.ts)
 - Adding `--xpack.ingestManager.fleet.enabled=false` will disable the Fleet API & UI
   - [code for adding the routes](https://github.com/elastic/kibana/blob/1f27d349533b1c2865c10c45b2cf705d7416fb36/x-pack/plugins/ingest_manager/server/plugin.ts#L115-L133)
   - [Integration tests](server/integration_tests/router.test.ts)

x-pack/plugins/ingest_manager/common/constants/agent.ts

@@ -17,5 +17,5 @@ export const AGENT_POLLING_INTERVAL = 1000;
 export const AGENT_UPDATE_LAST_CHECKIN_INTERVAL_MS = 30000;
 export const AGENT_UPDATE_ACTIONS_INTERVAL_MS = 5000;
 
-export const AGENT_CONFIG_ROLLOUT_RATE_LIMIT_INTERVAL_MS = 5000;
-export const AGENT_CONFIG_ROLLOUT_RATE_LIMIT_REQUEST_PER_INTERVAL = 25;
+export const AGENT_POLICY_ROLLOUT_RATE_LIMIT_INTERVAL_MS = 5000;
+export const AGENT_POLICY_ROLLOUT_RATE_LIMIT_REQUEST_PER_INTERVAL = 25;

x-pack/plugins/ingest_manager/common/constants/agent_policy.ts

@@ -0,0 +1,20 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { AgentPolicyStatus, DefaultPackages } from '../types';
+
+export const AGENT_POLICY_SAVED_OBJECT_TYPE = 'ingest-agent-policies';
+
+export const DEFAULT_AGENT_POLICY = {
+  name: 'Default policy',
+  namespace: 'default',
+  description: 'Default agent policy created by Kibana',
+  status: AgentPolicyStatus.Active,
+  package_policies: [],
+  is_default: true,
+  monitoring_enabled: ['logs', 'metrics'] as Array<'logs' | 'metrics'>,
+};
+
+export const DEFAULT_AGENT_POLICIES_PACKAGES = [DefaultPackages.system];

x-pack/plugins/ingest_manager/common/constants/index.ts

@@ -7,8 +7,8 @@ export * from './plugin';
 export * from './routes';
 
 export * from './agent';
-export * from './agent_config';
-export * from './package_config';
+export * from './agent_policy';
+export * from './package_policy';
 export * from './epm';
 export * from './output';
 export * from './enrollment_api_key';

x-pack/plugins/ingest_manager/common/constants/package_config.ts → x-pack/plugins/ingest_manager/common/constants/package_policy.ts

@@ -4,4 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export const PACKAGE_CONFIG_SAVED_OBJECT_TYPE = 'ingest-package-policies';
+export const PACKAGE_POLICY_SAVED_OBJECT_TYPE = 'ingest-package-policies';

x-pack/plugins/ingest_manager/common/constants/routes.ts

@@ -7,8 +7,8 @@
 export const API_ROOT = `/api/ingest_manager`;
 export const EPM_API_ROOT = `${API_ROOT}/epm`;
 export const DATA_STREAM_API_ROOT = `${API_ROOT}/data_streams`;
-export const PACKAGE_CONFIG_API_ROOT = `${API_ROOT}/package_configs`;
-export const AGENT_CONFIG_API_ROOT = `${API_ROOT}/agent_configs`;
+export const PACKAGE_POLICY_API_ROOT = `${API_ROOT}/package_policies`;
+export const AGENT_POLICY_API_ROOT = `${API_ROOT}/agent_policies`;
 export const FLEET_API_ROOT = `${API_ROOT}/fleet`;
 
 export const LIMITED_CONCURRENCY_ROUTE_TAG = 'ingest:limited-concurrency';
@@ -32,25 +32,25 @@ export const DATA_STREAM_API_ROUTES = {
   LIST_PATTERN: `${DATA_STREAM_API_ROOT}`,
 };
 
-// Package config API routes
-export const PACKAGE_CONFIG_API_ROUTES = {
-  LIST_PATTERN: `${PACKAGE_CONFIG_API_ROOT}`,
-  INFO_PATTERN: `${PACKAGE_CONFIG_API_ROOT}/{packageConfigId}`,
-  CREATE_PATTERN: `${PACKAGE_CONFIG_API_ROOT}`,
-  UPDATE_PATTERN: `${PACKAGE_CONFIG_API_ROOT}/{packageConfigId}`,
-  DELETE_PATTERN: `${PACKAGE_CONFIG_API_ROOT}/delete`,
+// Package policy API routes
+export const PACKAGE_POLICY_API_ROUTES = {
+  LIST_PATTERN: `${PACKAGE_POLICY_API_ROOT}`,
+  INFO_PATTERN: `${PACKAGE_POLICY_API_ROOT}/{packagePolicyId}`,
+  CREATE_PATTERN: `${PACKAGE_POLICY_API_ROOT}`,
+  UPDATE_PATTERN: `${PACKAGE_POLICY_API_ROOT}/{packagePolicyId}`,
+  DELETE_PATTERN: `${PACKAGE_POLICY_API_ROOT}/delete`,
 };
 
-// Agent config API routes
-export const AGENT_CONFIG_API_ROUTES = {
-  LIST_PATTERN: `${AGENT_CONFIG_API_ROOT}`,
-  INFO_PATTERN: `${AGENT_CONFIG_API_ROOT}/{agentConfigId}`,
-  CREATE_PATTERN: `${AGENT_CONFIG_API_ROOT}`,
-  UPDATE_PATTERN: `${AGENT_CONFIG_API_ROOT}/{agentConfigId}`,
-  COPY_PATTERN: `${AGENT_CONFIG_API_ROOT}/{agentConfigId}/copy`,
-  DELETE_PATTERN: `${AGENT_CONFIG_API_ROOT}/delete`,
-  FULL_INFO_PATTERN: `${AGENT_CONFIG_API_ROOT}/{agentConfigId}/full`,
-  FULL_INFO_DOWNLOAD_PATTERN: `${AGENT_CONFIG_API_ROOT}/{agentConfigId}/download`,
+// Agent policy API routes
+export const AGENT_POLICY_API_ROUTES = {
+  LIST_PATTERN: `${AGENT_POLICY_API_ROOT}`,
+  INFO_PATTERN: `${AGENT_POLICY_API_ROOT}/{agentPolicyId}`,
+  CREATE_PATTERN: `${AGENT_POLICY_API_ROOT}`,
+  UPDATE_PATTERN: `${AGENT_POLICY_API_ROOT}/{agentPolicyId}`,
+  COPY_PATTERN: `${AGENT_POLICY_API_ROOT}/{agentPolicyId}/copy`,
+  DELETE_PATTERN: `${AGENT_POLICY_API_ROOT}/delete`,
+  FULL_INFO_PATTERN: `${AGENT_POLICY_API_ROOT}/{agentPolicyId}/full`,
+  FULL_INFO_DOWNLOAD_PATTERN: `${AGENT_POLICY_API_ROOT}/{agentPolicyId}/download`,
 };
 
 // Output API routes

x-pack/plugins/ingest_manager/common/mocks.ts

@@ -4,15 +4,15 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { NewPackageConfig, PackageConfig } from './types/models/package_config';
+import { NewPackagePolicy, PackagePolicy } from './types';
 
-export const createNewPackageConfigMock = (): NewPackageConfig => {
+export const createNewPackagePolicyMock = (): NewPackagePolicy => {
   return {
     name: 'endpoint-1',
     description: '',
     namespace: 'default',
     enabled: true,
-    config_id: '93c46720-c217-11ea-9906-b5b8a21b268e',
+    policy_id: '93c46720-c217-11ea-9906-b5b8a21b268e',
     output_id: '',
     package: {
       name: 'endpoint',
@@ -23,10 +23,10 @@ export const createNewPackageConfigMock = (): NewPackageConfig => {
   };
 };
 
-export const createPackageConfigMock = (): PackageConfig => {
-  const newPackageConfig = createNewPackageConfigMock();
+export const createPackagePolicyMock = (): PackagePolicy => {
+  const newPackagePolicy = createNewPackagePolicyMock();
   return {
-    ...newPackageConfig,
+    ...newPackagePolicy,
     id: 'c6d16e42-c32d-4dce-8a88-113cfe276ad1',
     version: 'abcd',
     revision: 1,