Merge branch 'main' of github.com:elastic/kibana into implement/babel…

…-register-packages
elastic · Dec 21, 2022 · 3509e0c · 3509e0c
2 parents 7fc347a + a9166da
commit 3509e0c
Show file tree

Hide file tree

Showing 66 changed files with 2,253 additions and 1,215 deletions.
diff --git a/x-pack/plugins/fleet/common/openapi/bundled.json b/x-pack/plugins/fleet/common/openapi/bundled.json
@@ -1178,6 +1178,9 @@
                     "inactive": {
                       "type": "integer"
                     },
+                    "unenrolled": {
+                      "type": "integer"
+                    },
                     "offline": {
                       "type": "integer"
                     },

diff --git a/x-pack/plugins/fleet/common/openapi/bundled.yaml b/x-pack/plugins/fleet/common/openapi/bundled.yaml
@@ -735,6 +735,8 @@ paths:
                     type: integer
                   inactive:
                     type: integer
+                  unenrolled:
+                    type: integer
                   offline:
                     type: integer
                   online:

diff --git a/x-pack/plugins/fleet/common/openapi/paths/agent_status.yaml b/x-pack/plugins/fleet/common/openapi/paths/agent_status.yaml
@@ -15,6 +15,8 @@ get:
                 type: integer
               inactive:
                 type: integer
+              unenrolled:
+                type: integer
               offline:
                 type: integer
               online:

diff --git a/x-pack/plugins/fleet/common/services/agent_status.ts b/x-pack/plugins/fleet/common/services/agent_status.ts
@@ -5,55 +5,8 @@
  * 2.0.
  */
 
-import { AGENT_POLLING_THRESHOLD_MS } from '../constants';
 import type { Agent, AgentStatus, FleetServerAgent } from '../types';
 
-const offlineTimeoutIntervalCount = 10; // 30s*10 = 5m timeout
-
-export function getAgentStatus(agent: Agent | FleetServerAgent): AgentStatus {
-  const { last_checkin: lastCheckIn } = agent;
-
-  if (!agent.active) {
-    return 'inactive';
-  }
-
-  if (!agent.last_checkin) {
-    return 'enrolling';
-  }
-
-  const msLastCheckIn = new Date(lastCheckIn || 0).getTime();
-  const msSinceLastCheckIn = new Date().getTime() - msLastCheckIn;
-  const intervalsSinceLastCheckIn = Math.floor(msSinceLastCheckIn / AGENT_POLLING_THRESHOLD_MS);
-
-  if (intervalsSinceLastCheckIn >= offlineTimeoutIntervalCount) {
-    return 'offline';
-  }
-
-  if (agent.unenrollment_started_at && !agent.unenrolled_at) {
-    return 'unenrolling';
-  }
-
-  if (agent.last_checkin_status?.toLowerCase() === 'error') {
-    return 'error';
-  }
-  if (agent.last_checkin_status?.toLowerCase() === 'degraded') {
-    return 'degraded';
-  }
-
-  const policyRevision =
-    'policy_revision' in agent
-      ? agent.policy_revision
-      : 'policy_revision_idx' in agent
-      ? agent.policy_revision_idx
-      : undefined;
-
-  if (!policyRevision || (agent.upgrade_started_at && !agent.upgraded_at)) {
-    return 'updating';
-  }
-
-  return 'online';
-}
-
 export function getPreviousAgentStatusForOfflineAgents(
   agent: Agent | FleetServerAgent
 ): AgentStatus | undefined {
@@ -80,55 +33,26 @@ export function getPreviousAgentStatusForOfflineAgents(
   }
 }
 
-export function buildKueryForEnrollingAgents(path: string = ''): string {
-  return `not (${path}last_checkin:*)`;
-}
-
-export function buildKueryForUnenrollingAgents(path: string = ''): string {
-  return `${path}unenrollment_started_at:*`;
-}
-
-export function buildKueryForOnlineAgents(path: string = ''): string {
-  return `${path}last_checkin:* ${addExclusiveKueryFilter(
-    [buildKueryForOfflineAgents, buildKueryForUpdatingAgents, buildKueryForErrorAgents],
-    path
-  )}`;
-}
-
-export function buildKueryForErrorAgents(path: string = ''): string {
-  return `(${path}last_checkin_status:error or ${path}last_checkin_status:degraded or ${path}last_checkin_status:DEGRADED or ${path}last_checkin_status:ERROR) ${addExclusiveKueryFilter(
-    [buildKueryForOfflineAgents, buildKueryForUnenrollingAgents],
-    path
-  )}`;
+export function buildKueryForUnenrolledAgents(): string {
+  return 'status:unenrolled';
 }
 
-export function buildKueryForOfflineAgents(path: string = ''): string {
-  return `${path}last_checkin < now-${
-    (offlineTimeoutIntervalCount * AGENT_POLLING_THRESHOLD_MS) / 1000
-  }s`;
+export function buildKueryForOnlineAgents(): string {
+  return 'status:online';
 }
 
-export function buildKueryForUpgradingAgents(path: string = ''): string {
-  return `(${path}upgrade_started_at:*) and not (${path}upgraded_at:*)`;
+export function buildKueryForErrorAgents(): string {
+  return '(status:error or status:degraded)';
 }
 
-export function buildKueryForUpdatingAgents(path: string = ''): string {
-  return `((${buildKueryForUpgradingAgents(path)}) or (${buildKueryForEnrollingAgents(
-    path
-  )}) or (${buildKueryForUnenrollingAgents(
-    path
-  )}) or (not ${path}policy_revision_idx:*)) ${addExclusiveKueryFilter(
-    [buildKueryForOfflineAgents, buildKueryForErrorAgents],
-    path
-  )}`;
+export function buildKueryForOfflineAgents(): string {
+  return 'status:offline';
 }
 
-export function buildKueryForInactiveAgents(path: string = '') {
-  return `${path}active:false`;
+export function buildKueryForUpdatingAgents(): string {
+  return '(status:updating or status:unenrolling or status:enrolling)';
 }
 
-function addExclusiveKueryFilter(kueryBuilders: Array<(path?: string) => string>, path?: string) {
-  return ` AND not (${kueryBuilders
-    .map((kueryBuilder) => `(${kueryBuilder(path)})`)
-    .join(' or ')})`;
+export function buildKueryForInactiveAgents() {
+  return 'status:inactive';
 }
diff --git a/x-pack/plugins/fleet/common/types/models/agent.ts b/x-pack/plugins/fleet/common/types/models/agent.ts
@@ -24,10 +24,17 @@ export type AgentStatus =
   | 'inactive'
   | 'enrolling'
   | 'unenrolling'
+  | 'unenrolled'
   | 'updating'
   | 'degraded';
 
-export type SimplifiedAgentStatus = 'healthy' | 'unhealthy' | 'updating' | 'offline' | 'inactive';
+export type SimplifiedAgentStatus =
+  | 'healthy'
+  | 'unhealthy'
+  | 'updating'
+  | 'offline'
+  | 'inactive'
+  | 'unenrolled';
 
 export type AgentActionType =
   | 'UNENROLL'

diff --git a/x-pack/plugins/fleet/common/types/rest_spec/agent.ts b/x-pack/plugins/fleet/common/types/rest_spec/agent.ts
@@ -186,6 +186,8 @@ export interface GetAgentStatusResponse {
     offline: number;
     other: number;
     updating: number;
+    inactive: number;
+    unenrolled: number;
   };
 }
 

diff --git a/x-pack/plugins/fleet/cypress/e2e/agent_list.cy.ts b/x-pack/plugins/fleet/cypress/e2e/agent_list.cy.ts
@@ -166,9 +166,17 @@ describe('View agents list', () => {
   });
 
   describe('Agent status filter', () => {
+    const clearFilters = () => {
+      cy.getBySel(FLEET_AGENT_LIST_PAGE.STATUS_FILTER).click();
+      cy.get('button').contains('Healthy').click();
+      cy.get('button').contains('Unhealthy').click();
+      cy.get('button').contains('Updating').click();
+      cy.get('button').contains('Offline').click();
+      cy.getBySel(FLEET_AGENT_LIST_PAGE.STATUS_FILTER).click();
+    };
     it('should filter on healthy (16 result)', () => {
       cy.visit('/app/fleet/agents');
-
+      clearFilters();
       cy.getBySel(FLEET_AGENT_LIST_PAGE.STATUS_FILTER).click();
 
       cy.get('button').contains('Healthy').click();
@@ -179,7 +187,7 @@ describe('View agents list', () => {
 
     it('should filter on unhealthy (1 result)', () => {
       cy.visit('/app/fleet/agents');
-
+      clearFilters();
       cy.getBySel(FLEET_AGENT_LIST_PAGE.STATUS_FILTER).click();
 
       cy.get('button').contains('Unhealthy').click();
@@ -190,6 +198,7 @@ describe('View agents list', () => {
 
     it('should filter on inactive (0 result)', () => {
       cy.visit('/app/fleet/agents');
+      clearFilters();
 
       cy.getBySel(FLEET_AGENT_LIST_PAGE.STATUS_FILTER).click();
 
@@ -200,6 +209,7 @@ describe('View agents list', () => {
 
     it('should filter on healthy and unhealthy', () => {
       cy.visit('/app/fleet/agents');
+      clearFilters();
 
       cy.getBySel(FLEET_AGENT_LIST_PAGE.STATUS_FILTER).click();
 

diff --git a/...c/applications/fleet/sections/agents/agent_list_page/components/search_and_filter_bar.tsx b/...c/applications/fleet/sections/agents/agent_list_page/components/search_and_filter_bar.tsx
@@ -63,6 +63,12 @@ const statusFilters = [
       defaultMessage: 'Inactive',
     }),
   },
+  {
+    status: 'unenrolled',
+    label: i18n.translate('xpack.fleet.agentList.statusUnenrolledFilterText', {
+      defaultMessage: 'Unenrolled',
+    }),
+  },
 ];
 
 const ClearAllTagsFilterItem = styled(EuiFilterSelectItem)`

diff --git a/...et/public/applications/fleet/sections/agents/agent_list_page/components/status_badges.tsx b/...et/public/applications/fleet/sections/agents/agent_list_page/components/status_badges.tsx
@@ -20,7 +20,9 @@ export const AgentStatusBadges: React.FC<{
   agentStatus: { [k in SimplifiedAgentStatus]: number };
 }> = memo(({ agentStatus, showInactive }) => {
   const agentStatuses = useMemo(() => {
-    return AGENT_STATUSES.filter((status) => (showInactive ? true : status !== 'inactive'));
+    return AGENT_STATUSES.filter((status) =>
+      showInactive ? true : status !== 'inactive' && status !== 'unenrolled'
+    );
   }, [showInactive]);
 
   return (

diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/index.tsx
@@ -87,7 +87,12 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
   const [selectedAgentPolicies, setSelectedAgentPolicies] = useState<string[]>([]);
 
   // Status for filtering
-  const [selectedStatus, setSelectedStatus] = useState<string[]>([]);
+  const [selectedStatus, setSelectedStatus] = useState<string[]>([
+    'healthy',
+    'unhealthy',
+    'updating',
+    'offline',
+  ]);
 
   const [selectedTags, setSelectedTags] = useState<string[]>([]);
 
@@ -183,6 +188,8 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
               return AgentStatusKueryHelper.buildKueryForUpdatingAgents();
             case 'inactive':
               return AgentStatusKueryHelper.buildKueryForInactiveAgents();
+            case 'unenrolled':
+              return AgentStatusKueryHelper.buildKueryForUnenrolledAgents();
           }
 
           return undefined;
@@ -201,7 +208,7 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
   }, [search, selectedAgentPolicies, selectedTags, selectedStatus]);
 
   const showInactive = useMemo(() => {
-    return selectedStatus.includes('inactive');
+    return selectedStatus.some((status) => status === 'inactive' || status === 'unenrolled');
   }, [selectedStatus]);
 
   const [agents, setAgents] = useState<Agent[]>([]);
@@ -309,7 +316,8 @@ export const AgentListPage: React.FunctionComponent<{}> = () => {
             unhealthy: agentsStatusResponse.data.results.error,
             offline: agentsStatusResponse.data.results.offline,
             updating: agentsStatusResponse.data.results.updating,
-            inactive: agentsResponse.data.totalInactive,
+            inactive: agentsStatusResponse.data.results.inactive,
+            unenrolled: agentsStatusResponse.data.results.unenrolled,
           });
 
           const newAllTags = agentTagsResponse.data.items;

diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_health.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_health.tsx
@@ -36,6 +36,14 @@ const Status = {
       <FormattedMessage id="xpack.fleet.agentHealth.inactiveStatusText" defaultMessage="Inactive" />
     </EuiBadge>
   ),
+  Unenrolled: (
+    <EuiBadge color="hollow">
+      <FormattedMessage
+        id="xpack.fleet.agentHealth.unenrolledStatusText"
+        defaultMessage="Unenrolled"
+      />
+    </EuiBadge>
+  ),
   Unhealthy: (
     <EuiBadge color="warning">
       <FormattedMessage
@@ -64,6 +72,8 @@ function getStatusComponent(status: Agent['status']): React.ReactElement {
     case 'enrolling':
     case 'updating':
       return Status.Updating;
+    case 'unenrolled':
+      return Status.Unenrolled;
     default:
       return Status.Healthy;
   }

diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/services/agent_status.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/services/agent_status.tsx
@@ -21,6 +21,7 @@ const colorToHexMap = {
   warning: visColors[5],
   danger: visColors[9],
   inactive: euiLightVars.euiColorDarkShade,
+  lightest: euiLightVars.euiColorDisabled,
 };
 
 export const AGENT_STATUSES: SimplifiedAgentStatus[] = [
@@ -29,6 +30,7 @@ export const AGENT_STATUSES: SimplifiedAgentStatus[] = [
   'updating',
   'offline',
   'inactive',
+  'unenrolled',
 ];
 
 export function getColorForAgentStatus(agentStatus: SimplifiedAgentStatus): string {
@@ -43,6 +45,8 @@ export function getColorForAgentStatus(agentStatus: SimplifiedAgentStatus): stri
       return colorToHexMap.warning;
     case 'updating':
       return colorToHexMap.primary;
+    case 'unenrolled':
+      return colorToHexMap.lightest;
     default:
       throw new Error(`Unsupported Agent status ${agentStatus}`);
   }
@@ -62,6 +66,10 @@ export function getLabelForAgentStatus(agentStatus: SimplifiedAgentStatus): stri
       return i18n.translate('xpack.fleet.agentStatus.inactiveLabel', {
         defaultMessage: 'Inactive',
       });
+    case 'unenrolled':
+      return i18n.translate('xpack.fleet.agentStatus.unenrolledLabel', {
+        defaultMessage: 'Unenrolled',
+      });
     case 'unhealthy':
       return i18n.translate('xpack.fleet.agentStatus.unhealthyLabel', {
         defaultMessage: 'Unhealthy',