[Ingest Manager] Better default value for fleet long polling timeout

elastic · Sep 1, 2020 · 33e7f7d · 33e7f7d
1 parent 9a27beb
commit 33e7f7d
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 5 deletions.
diff --git a/x-pack/plugins/ingest_manager/common/constants/agent.ts b/x-pack/plugins/ingest_manager/common/constants/agent.ts
@@ -12,6 +12,7 @@ export const AGENT_TYPE_PERMANENT = 'PERMANENT';
 export const AGENT_TYPE_EPHEMERAL = 'EPHEMERAL';
 export const AGENT_TYPE_TEMPORARY = 'TEMPORARY';
 
+export const AGENT_POLLING_REQUEST_TIMEOUT_MS = 300000; // 5 minutes
 export const AGENT_POLLING_THRESHOLD_MS = 30000;
 export const AGENT_POLLING_INTERVAL = 1000;
 export const AGENT_UPDATE_LAST_CHECKIN_INTERVAL_MS = 30000;

diff --git a/x-pack/plugins/ingest_manager/server/index.ts b/x-pack/plugins/ingest_manager/server/index.ts
@@ -9,6 +9,7 @@ import { IngestManagerPlugin } from './plugin';
 import {
  AGENT_POLICY_ROLLOUT_RATE_LIMIT_INTERVAL_MS,
  AGENT_POLICY_ROLLOUT_RATE_LIMIT_REQUEST_PER_INTERVAL,
+ AGENT_POLLING_REQUEST_TIMEOUT_MS,
 } from '../common';
 export { AgentService, ESIndexPatternService, getRegistryUrl } from './services';
 export {
@@ -29,7 +30,10 @@ export const config = {
  fleet: schema.object({
  enabled: schema.boolean({ defaultValue: true }),
  tlsCheckDisabled: schema.boolean({ defaultValue: false }),
- pollingRequestTimeout: schema.number({ defaultValue: 60000 }),
+ pollingRequestTimeout: schema.number({
+ defaultValue: AGENT_POLLING_REQUEST_TIMEOUT_MS,
+ min: 5000,
+ }),
  maxConcurrentConnections: schema.number({ defaultValue: 0 }),
  kibana: schema.object({
  host: schema.maybe(schema.string()),

diff --git a/x-pack/plugins/ingest_manager/server/plugin.ts b/x-pack/plugins/ingest_manager/server/plugin.ts
@@ -238,7 +238,7 @@ export class IngestManagerPlugin
  // we currently only use this global interceptor if fleet is enabled
  // since it would run this func on *every* req (other plugins, CSS, etc)
  registerLimitedConcurrencyRoutes(core, config);
- registerAgentRoutes(router);
+ registerAgentRoutes(router, config);
  registerEnrollmentApiKeyRoutes(router);
  registerInstallScriptRoutes({
  router,

diff --git a/x-pack/plugins/ingest_manager/server/routes/agent/index.ts b/x-pack/plugins/ingest_manager/server/routes/agent/index.ts
@@ -41,8 +41,9 @@ import * as AgentService from '../../services/agents';
 import { postNewAgentActionHandlerBuilder } from './actions_handlers';
 import { appContextService } from '../../services';
 import { postAgentsUnenrollHandler } from './unenroll_handler';
+import { IngestManagerConfigType } from '../..';
 
-export const registerRoutes = (router: IRouter) => {
+export const registerRoutes = (router: IRouter, config: IngestManagerConfigType) => {
  // Get one
  router.get(
  {
@@ -80,12 +81,22 @@ export const registerRoutes = (router: IRouter) => {
  getAgentsHandler
  );
 
+ const pollingRequestTimeout = config.fleet.pollingRequestTimeout;
  // Agent checkin
  router.post(
  {
  path: AGENT_API_ROUTES.CHECKIN_PATTERN,
  validate: PostAgentCheckinRequestSchema,
- options: { tags: [] },
+ options: {
+ tags: [],
+ ...(pollingRequestTimeout
+ ? {
+ timeout: {
+ idleSocket: pollingRequestTimeout,
+ },
+ }
+ : {}),
+ },
  },
  postAgentCheckinHandler
  );

diff --git a/x-pack/plugins/ingest_manager/server/services/agents/checkin/state_new_actions.ts b/x-pack/plugins/ingest_manager/server/services/agents/checkin/state_new_actions.ts
@@ -170,7 +170,10 @@ export function agentCheckinStateNewActionsFactory() {
  }
 
  const stream$ = agentPolicy$.pipe(
- timeout(appContextService.getConfig()?.fleet.pollingRequestTimeout || 0),
+ timeout(
+ // Set a timeout 3s before the real timeout to have a chance to respond an empty response before socket timeout
+ Math.max((appContextService.getConfig()?.fleet.pollingRequestTimeout ?? 0) - 3000, 3000)
+ ),
  filter((agentPolicy) => shouldCreateAgentPolicyAction(agent, agentPolicy)),
  rateLimiter(),
  mergeMap((agentPolicy) => createAgentActionFromAgentPolicy(soClient, agent, agentPolicy)),