Merge branch 'master' into 74111-migrate-es-client

api_docs/fleet.mdx

@@ -45,6 +45,9 @@ import fleetObj from './fleet.json';
 ### Functions
 <DocDefinitionList data={fleetObj.server.functions}/>
 
+### Classes
+<DocDefinitionList data={fleetObj.server.classes}/>
+
 ### Interfaces
 <DocDefinitionList data={fleetObj.server.interfaces}/>
 

package.json

@@ -283,7 +283,7 @@
     "react-resizable": "^1.7.5",
     "react-router": "^5.2.0",
     "react-router-dom": "^5.2.0",
-    "react-use": "^15.3.4",
+    "react-use": "^15.3.8",
     "recompose": "^0.26.0",
     "redux": "^4.0.5",
     "redux-actions": "^2.6.5",

src/plugins/data/server/kql_telemetry/route.ts

@@ -25,7 +25,7 @@ export function registerKqlTelemetryRoute(
     },
     async (context, request, response) => {
       const [{ savedObjects }] = await getStartServices();
-      const internalRepository = savedObjects.createScopedRepository(request);
+      const internalRepository = savedObjects.createInternalRepository();
 
       const {
         body: { opt_in: optIn },

x-pack/plugins/fleet/common/services/agent_status.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { AGENT_POLLING_THRESHOLD_MS, AGENT_SAVED_OBJECT_TYPE } from '../constants';
+import { AGENT_POLLING_THRESHOLD_MS } from '../constants';
 import type { Agent, AgentStatus } from '../types';
 
 export function getAgentStatus(agent: Agent, now: number = Date.now()): AgentStatus {
@@ -42,35 +42,35 @@ export function getAgentStatus(agent: Agent, now: number = Date.now()): AgentSta
 }
 
 export function buildKueryForEnrollingAgents() {
-  return `not (${AGENT_SAVED_OBJECT_TYPE}.last_checkin:*)`;
+  return 'not (last_checkin:*)';
 }
 
 export function buildKueryForUnenrollingAgents() {
-  return `${AGENT_SAVED_OBJECT_TYPE}.unenrollment_started_at:*`;
+  return 'unenrollment_started_at:*';
 }
 
 export function buildKueryForOnlineAgents() {
   return `not (${buildKueryForOfflineAgents()}) AND not (${buildKueryForErrorAgents()}) AND not (${buildKueryForUpdatingAgents()})`;
 }
 
 export function buildKueryForErrorAgents() {
-  return `${AGENT_SAVED_OBJECT_TYPE}.last_checkin_status:error or ${AGENT_SAVED_OBJECT_TYPE}.last_checkin_status:degraded`;
+  return 'last_checkin_status:error or .last_checkin_status:degraded';
 }
 
 export function buildKueryForOfflineAgents() {
-  return `${AGENT_SAVED_OBJECT_TYPE}.last_checkin < now-${
+  return `last_checkin < now-${
     (4 * AGENT_POLLING_THRESHOLD_MS) / 1000
   }s AND not (${buildKueryForErrorAgents()}) AND not ( ${buildKueryForUpdatingAgents()} )`;
 }
 
 export function buildKueryForUpgradingAgents() {
-  return `(${AGENT_SAVED_OBJECT_TYPE}.upgrade_started_at:*) and not (${AGENT_SAVED_OBJECT_TYPE}.upgraded_at:*)`;
+  return '(upgrade_started_at:*) and not (upgraded_at:*)';
 }
 
 export function buildKueryForUpdatingAgents() {
   return `(${buildKueryForUpgradingAgents()}) or (${buildKueryForEnrollingAgents()}) or (${buildKueryForUnenrollingAgents()})`;
 }
 
 export function buildKueryForInactiveAgents() {
-  return `${AGENT_SAVED_OBJECT_TYPE}.active:false`;
+  return `active:false`;
 }

x-pack/plugins/fleet/common/types/index.ts

@@ -13,7 +13,6 @@ export interface FleetConfigType {
   registryUrl?: string;
   registryProxyUrl?: string;
   agents: {
-    fleetServerEnabled: boolean;
     enabled: boolean;
     tlsCheckDisabled: boolean;
     pollingRequestTimeout: number;

x-pack/plugins/fleet/public/applications/fleet/mock/plugin_configuration.ts

@@ -14,7 +14,6 @@ export const createConfigurationMock = (): FleetConfigType => {
     registryProxyUrl: '',
     agents: {
       enabled: true,
-      fleetServerEnabled: false,
       tlsCheckDisabled: true,
       pollingRequestTimeout: 1000,
       maxConcurrentConnections: 100,

x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/search_and_filter_bar.tsx

@@ -19,8 +19,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
 
 import { AgentPolicy } from '../../../../types';
 import { SearchBar } from '../../../../components';
-import { AGENTS_INDEX, AGENT_SAVED_OBJECT_TYPE } from '../../../../constants';
-import { useConfig } from '../../../../hooks';
+import { AGENTS_INDEX } from '../../../../constants';
 
 const statusFilters = [
   {
@@ -78,7 +77,6 @@ export const SearchAndFilterBar: React.FunctionComponent<{
   showUpgradeable,
   onShowUpgradeableChange,
 }) => {
-  const config = useConfig();
   // Policies state for filtering
   const [isAgentPoliciesFilterOpen, setIsAgentPoliciesFilterOpen] = useState<boolean>(false);
 
@@ -112,13 +110,7 @@ export const SearchAndFilterBar: React.FunctionComponent<{
                     onSubmitSearch(newSearch);
                   }
                 }}
-                {...(config.agents.fleetServerEnabled
-                  ? {
-                      indexPattern: AGENTS_INDEX,
-                    }
-                  : {
-                      fieldPrefix: AGENT_SAVED_OBJECT_TYPE,
-                    })}
+                indexPattern={AGENTS_INDEX}
               />
             </EuiFlexItem>
             <EuiFlexItem grow={2}>

x-pack/plugins/fleet/public/applications/fleet/sections/agents/enrollment_token_list_page/index.tsx

@@ -21,10 +21,7 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage, FormattedDate } from '@kbn/i18n/react';
 
-import {
-  ENROLLMENT_API_KEYS_INDEX,
-  ENROLLMENT_API_KEYS_SAVED_OBJECT_TYPE,
-} from '../../../constants';
+import { ENROLLMENT_API_KEYS_INDEX } from '../../../constants';
 import {
   useBreadcrumbs,
   usePagination,
@@ -33,7 +30,6 @@ import {
   sendGetOneEnrollmentAPIKey,
   useStartServices,
   sendDeleteOneEnrollmentAPIKey,
-  useConfig,
 } from '../../../hooks';
 import { EnrollmentAPIKey } from '../../../types';
 import { SearchBar } from '../../../components/search_bar';
@@ -160,7 +156,6 @@ const DeleteButton: React.FunctionComponent<{ apiKey: EnrollmentAPIKey; refresh:
 
 export const EnrollmentTokenListPage: React.FunctionComponent<{}> = () => {
   useBreadcrumbs('fleet_enrollment_tokens');
-  const config = useConfig();
   const [flyoutOpen, setFlyoutOpen] = useState(false);
   const [search, setSearch] = useState('');
   const { pagination, setPagination, pageSizeOptions } = usePagination();
@@ -288,13 +283,7 @@ export const EnrollmentTokenListPage: React.FunctionComponent<{}> = () => {
               });
               setSearch(newSearch);
             }}
-            {...(config.agents.fleetServerEnabled
-              ? {
-                  indexPattern: ENROLLMENT_API_KEYS_INDEX,
-                }
-              : {
-                  fieldPrefix: ENROLLMENT_API_KEYS_SAVED_OBJECT_TYPE,
-                })}
+            indexPattern={ENROLLMENT_API_KEYS_INDEX}
           />
         </EuiFlexItem>
         <EuiFlexItem grow={false}>

x-pack/plugins/fleet/server/collectors/agent_collectors.ts

@@ -25,8 +25,7 @@ export const getAgentUsage = async (
   esClient?: ElasticsearchClient
 ): Promise<AgentUsage> => {
   // TODO: unsure if this case is possible at all.
-  const fleetServerMissing = config.agents.fleetServerEnabled && !(await isFleetServerSetup());
-  if (!soClient || !esClient || fleetServerMissing) {
+  if (!soClient || !esClient || !(await isFleetServerSetup())) {
     return {
       total: 0,
       online: 0,

x-pack/plugins/fleet/server/errors/handlers.ts

@@ -24,6 +24,7 @@ import {
   AgentPolicyNameExistsError,
   PackageUnsupportedMediaTypeError,
   ConcurrentInstallOperationError,
+  AgentNotFoundError,
 } from './index';
 
 type IngestErrorHandler = (
@@ -78,6 +79,9 @@ const getHTTPResponseCode = (error: IngestManagerError): number => {
   if (error instanceof ConcurrentInstallOperationError) {
     return 409; // Conflict
   }
+  if (error instanceof AgentNotFoundError) {
+    return 404;
+  }
   return 400; // Bad Request
 };
 

x-pack/plugins/fleet/server/errors/index.ts

@@ -19,6 +19,7 @@ export class IngestManagerError extends Error {
     this.name = this.constructor.name; // for stack traces
   }
 }
+
 export class RegistryError extends IngestManagerError {}
 export class RegistryConnectionError extends RegistryError {}
 export class RegistryResponseError extends RegistryError {
@@ -30,6 +31,7 @@ export class PackageNotFoundError extends IngestManagerError {}
 export class PackageKeyInvalidError extends IngestManagerError {}
 export class PackageOutdatedError extends IngestManagerError {}
 export class AgentPolicyError extends IngestManagerError {}
+export class AgentNotFoundError extends IngestManagerError {}
 export class AgentPolicyNameExistsError extends AgentPolicyError {}
 export class PackageUnsupportedMediaTypeError extends IngestManagerError {}
 export class PackageInvalidArchiveError extends IngestManagerError {}

x-pack/plugins/fleet/server/index.ts

@@ -26,23 +26,24 @@ export {
   AgentPolicyServiceInterface,
 } from './services';
 export { FleetSetupContract, FleetSetupDeps, FleetStartContract, ExternalCallback } from './plugin';
+export { AgentNotFoundError } from './errors';
 
 export const config: PluginConfigDescriptor = {
   exposeToBrowser: {
     epm: true,
     agents: true,
   },
-  deprecations: ({ renameFromRoot }) => [
+  deprecations: ({ renameFromRoot, unused }) => [
     renameFromRoot('xpack.ingestManager', 'xpack.fleet'),
     renameFromRoot('xpack.fleet.fleet', 'xpack.fleet.agents'),
+    unused('agents.fleetServerEnabled'),
   ],
   schema: schema.object({
     enabled: schema.boolean({ defaultValue: true }),
     registryUrl: schema.maybe(schema.uri({ scheme: ['http', 'https'] })),
     registryProxyUrl: schema.maybe(schema.uri({ scheme: ['http', 'https'] })),
     agents: schema.object({
       enabled: schema.boolean({ defaultValue: true }),
-      fleetServerEnabled: schema.boolean({ defaultValue: false }),
       tlsCheckDisabled: schema.boolean({ defaultValue: false }),
       pollingRequestTimeout: schema.number({
         defaultValue: AGENT_POLLING_REQUEST_TIMEOUT_MS,

x-pack/plugins/fleet/server/plugin.ts

@@ -299,10 +299,7 @@ export class FleetPlugin
     licenseService.start(this.licensing$);
     agentCheckinState.start();
 
-    if (appContextService.getConfig()?.agents?.fleetServerEnabled) {
-      // Break the promise chain, the error handling is done in startFleetServerSetup
-      startFleetServerSetup();
-    }
+    startFleetServerSetup();
 
     return {
       esIndexPatternService: new ESIndexPatternSavedObjectService(),

x-pack/plugins/fleet/server/routes/agent/acks_handlers.ts

@@ -21,7 +21,7 @@ export const postAgentAcksHandlerBuilder = function (
     try {
       const soClient = ackService.getSavedObjectsClientContract(request);
       const esClient = ackService.getElasticsearchClientContract();
-      const agent = await ackService.authenticateAgentWithAccessToken(soClient, esClient, request);
+      const agent = await ackService.authenticateAgentWithAccessToken(esClient, request);
       const agentEvents = request.body.events as AgentEvent[];
 
       // validate that all events are for the authorized agent obtained from the api key

x-pack/plugins/fleet/server/routes/agent/actions_handlers.ts

@@ -27,7 +27,7 @@ export const postNewAgentActionHandlerBuilder = function (
       const soClient = context.core.savedObjects.client;
       const esClient = context.core.elasticsearch.client.asInternalUser;
 
-      const agent = await actionsService.getAgent(soClient, esClient, request.params.agentId);
+      const agent = await actionsService.getAgent(esClient, request.params.agentId);
 
       const newAgentAction = request.body.action;
 

x-pack/plugins/fleet/server/routes/agent/handlers.ts

@@ -44,7 +44,7 @@ export const getAgentHandler: RequestHandler<
   const esClient = context.core.elasticsearch.client.asCurrentUser;
 
   try {
-    const agent = await AgentService.getAgent(soClient, esClient, request.params.agentId);
+    const agent = await AgentService.getAgent(esClient, request.params.agentId);
 
     const body: GetOneAgentResponse = {
       item: {
@@ -101,11 +101,10 @@ export const getAgentEventsHandler: RequestHandler<
 export const deleteAgentHandler: RequestHandler<
   TypeOf<typeof DeleteAgentRequestSchema.params>
 > = async (context, request, response) => {
-  const soClient = context.core.savedObjects.client;
   const esClient = context.core.elasticsearch.client.asCurrentUser;
 
   try {
-    await AgentService.deleteAgent(soClient, esClient, request.params.agentId);
+    await AgentService.deleteAgent(esClient, request.params.agentId);
 
     const body = {
       action: 'deleted',
@@ -129,14 +128,13 @@ export const updateAgentHandler: RequestHandler<
   undefined,
   TypeOf<typeof UpdateAgentRequestSchema.body>
 > = async (context, request, response) => {
-  const soClient = context.core.savedObjects.client;
   const esClient = context.core.elasticsearch.client.asCurrentUser;
 
   try {
-    await AgentService.updateAgent(soClient, esClient, request.params.agentId, {
+    await AgentService.updateAgent(esClient, request.params.agentId, {
       user_provided_metadata: request.body.user_provided_metadata,
     });
-    const agent = await AgentService.getAgent(soClient, esClient, request.params.agentId);
+    const agent = await AgentService.getAgent(esClient, request.params.agentId);
 
     const body = {
       item: {
@@ -165,7 +163,7 @@ export const postAgentCheckinHandler: RequestHandler<
   try {
     const soClient = appContextService.getInternalUserSOClient(request);
     const esClient = appContextService.getInternalUserESClient();
-    const agent = await AgentService.authenticateAgentWithAccessToken(soClient, esClient, request);
+    const agent = await AgentService.authenticateAgentWithAccessToken(esClient, request);
     const abortController = new AbortController();
     request.events.aborted$.subscribe(() => {
       abortController.abort();
@@ -209,11 +207,7 @@ export const postAgentEnrollHandler: RequestHandler<
     const soClient = appContextService.getInternalUserSOClient(request);
     const esClient = context.core.elasticsearch.client.asInternalUser;
     const { apiKeyId } = APIKeyService.parseApiKeyFromHeaders(request.headers);
-    const enrollmentAPIKey = await APIKeyService.getEnrollmentAPIKeyById(
-      soClient,
-      esClient,
-      apiKeyId
-    );
+    const enrollmentAPIKey = await APIKeyService.getEnrollmentAPIKeyById(esClient, apiKeyId);
 
     if (!enrollmentAPIKey || !enrollmentAPIKey.active) {
       return response.unauthorized({
@@ -248,19 +242,18 @@ export const getAgentsHandler: RequestHandler<
   undefined,
   TypeOf<typeof GetAgentsRequestSchema.query>
 > = async (context, request, response) => {
-  const soClient = context.core.savedObjects.client;
   const esClient = context.core.elasticsearch.client.asCurrentUser;
 
   try {
-    const { agents, total, page, perPage } = await AgentService.listAgents(soClient, esClient, {
+    const { agents, total, page, perPage } = await AgentService.listAgents(esClient, {
       page: request.query.page,
       perPage: request.query.perPage,
       showInactive: request.query.showInactive,
       showUpgradeable: request.query.showUpgradeable,
       kuery: request.query.kuery,
     });
     const totalInactive = request.query.showInactive
-      ? await AgentService.countInactiveAgents(soClient, esClient, {
+      ? await AgentService.countInactiveAgents(esClient, {
           kuery: request.query.kuery,
         })
       : 0;

x-pack/plugins/fleet/server/routes/agent/upgrade_handler.ts

@@ -36,7 +36,7 @@ export const postAgentUpgradeHandler: RequestHandler<
       },
     });
   }
-  const agent = await getAgent(soClient, esClient, request.params.agentId);
+  const agent = await getAgent(esClient, request.params.agentId);
   if (agent.unenrollment_started_at || agent.unenrolled_at) {
     return response.customError({
       statusCode: 400,

x-pack/plugins/fleet/server/routes/agent_policy/handlers.ts

@@ -58,7 +58,7 @@ export const getAgentPoliciesHandler: RequestHandler<
     await bluebird.map(
       items,
       (agentPolicy: GetAgentPoliciesResponseItem) =>
-        listAgents(soClient, esClient, {
+        listAgents(esClient, {
           showInactive: false,
           perPage: 0,
           page: 1,