[Ingest Manager] Do not show enrolling and unenrolling agents as online in agent counters

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

@@ -4,11 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import {
- AGENT_POLLING_THRESHOLD_MS,
- AGENT_TYPE_PERMANENT,
- AGENT_SAVED_OBJECT_TYPE,
-} from '../constants';
+import { AGENT_POLLING_THRESHOLD_MS, AGENT_SAVED_OBJECT_TYPE } from '../constants';
 import { Agent, AgentStatus } from '../types';
 
 export function getAgentStatus(agent: Agent, now: number = Date.now()): AgentStatus {
@@ -41,16 +37,24 @@ export function getAgentStatus(agent: Agent, now: number = Date.now()): AgentSta
  return 'online';
 }
 
+export function buildKueryForEnrolingAgents() {
+ return `not ${AGENT_SAVED_OBJECT_TYPE}.last_checkin:*`;
+}
+
+export function buildKueryForUnenrolingAgents() {
+ return `${AGENT_SAVED_OBJECT_TYPE}.unenrollment_started_at:*`;
+}
+
 export function buildKueryForOnlineAgents() {
- return `not (${buildKueryForOfflineAgents()}) AND not (${buildKueryForErrorAgents()})`;
+ return `not (${buildKueryForOfflineAgents()}) AND not (${buildKueryForErrorAgents()}) AND not (${buildKueryForEnrolingAgents()}) AND not (${buildKueryForUnenrolingAgents()})`;
 }
 
 export function buildKueryForErrorAgents() {
  return `( ${AGENT_SAVED_OBJECT_TYPE}.last_checkin_status:error or ${AGENT_SAVED_OBJECT_TYPE}.last_checkin_status:degraded )`;
 }
 
 export function buildKueryForOfflineAgents() {
- return `((${AGENT_SAVED_OBJECT_TYPE}.type:${AGENT_TYPE_PERMANENT} AND ${AGENT_SAVED_OBJECT_TYPE}.last_checkin < now-${
+ return `${AGENT_SAVED_OBJECT_TYPE}.last_checkin < now-${
  (4 * AGENT_POLLING_THRESHOLD_MS) / 1000
- }s) AND not ( ${buildKueryForErrorAgents()} ))`;
+ }s AND not (${buildKueryForErrorAgents()})`;
 }

x-pack/plugins/ingest_manager/common/types/rest_spec/agent.ts

@@ -173,5 +173,6 @@ export interface GetAgentStatusResponse {
  online: number;
  error: number;
  offline: number;
+ other: number;
  };
 }

x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/donut_chart.tsx

@@ -31,7 +31,7 @@ export const DonutChart = ({ height, width, data }: DonutChartProps) => {
  .ordinal()
  // @ts-ignore
  .domain(data)
- .range(['#017D73', '#98A2B3', '#BD271E']);
+ .range(['#017D73', '#98A2B3', '#BD271E', '#9b6900']);
  const pieGenerator = d3.layout
  .pie()
  .value(({ value }: any) => value)

x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/list_layout.tsx

@@ -66,6 +66,7 @@ export const ListLayout: React.FunctionComponent<{}> = ({ children }) => {
  online: agentStatus?.online || 0,
  offline: agentStatus?.offline || 0,
  error: agentStatus?.error || 0,
+ other: agentStatus?.other || 0,
  }}
  />
  </EuiFlexItem>

x-pack/plugins/ingest_manager/server/services/agents/status.ts

@@ -25,9 +25,10 @@ export async function getAgentStatusForConfig(
  soClient: SavedObjectsClientContract,
  configId?: string
 ) {
- const [all, error, offline] = await Promise.all(
+ const [all, online, error, offline] = await Promise.all(
  [
  undefined,
+ AgentStatusKueryHelper.buildKueryForOnlineAgents(),
  AgentStatusKueryHelper.buildKueryForErrorAgents(),
  AgentStatusKueryHelper.buildKueryForOfflineAgents(),
  ].map((kuery) =>
@@ -47,9 +48,10 @@ export async function getAgentStatusForConfig(
  return {
  events: await getEventsCount(soClient, configId),
  total: all.total,
- online: all.total - error.total - offline.total,
+ online: online.total,
  error: error.total,
  offline: offline.total,
+ other: all.total - online.total - error.total - offline.total,
  };
 }