Show previous to offline status in details

elastic · Sep 14, 2022 · a28866e · a28866e
1 parent 960a161
commit a28866e
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 6 deletions.
diff --git a/x-pack/plugins/fleet/common/services/agent_status.ts b/x-pack/plugins/fleet/common/services/agent_status.ts
@@ -54,6 +54,32 @@ export function getAgentStatus(agent: Agent | FleetServerAgent): AgentStatus {
   return 'online';
 }
 
+export function getPreviousAgentStatusForOfflineAgents(
+  agent: Agent | FleetServerAgent
+): AgentStatus | undefined {
+  if (agent.unenrollment_started_at && !agent.unenrolled_at) {
+    return 'unenrolling';
+  }
+
+  if (agent.last_checkin_status === 'error') {
+    return 'error';
+  }
+  if (agent.last_checkin_status === '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.upgrade_status !== 'completed')) {
+    return 'updating';
+  }
+}
+
 export function buildKueryForEnrollingAgents(path: string = ''): string {
   return `not (${path}last_checkin:*)`;
 }

diff --git a/...et/sections/agents/agent_details_page/components/agent_details/agent_details_overview.tsx b/...et/sections/agents/agent_details_page/components/agent_details/agent_details_overview.tsx
@@ -46,7 +46,7 @@ export const AgentDetailsOverviewSection: React.FunctionComponent<{
             title: i18n.translate('xpack.fleet.agentDetails.statusLabel', {
               defaultMessage: 'Status',
             }),
-            description: <AgentHealth agent={agent} />,
+            description: <AgentHealth agent={agent} showOfflinePreviousStatus={true} />,
           },
           {
             title: i18n.translate('xpack.fleet.agentDetails.lastActivityLabel', {

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
@@ -5,16 +5,18 @@
  * 2.0.
  */
 
-import React from 'react';
+import React, { useMemo } from 'react';
 import { FormattedMessage, FormattedRelative } from '@kbn/i18n-react';
 import { EuiBadge, EuiToolTip } from '@elastic/eui';
 
 import { euiLightVars as euiVars } from '@kbn/ui-theme';
 
 import type { Agent } from '../../../types';
+import { getPreviousAgentStatusForOfflineAgents } from '@kbn/fleet-plugin/common/services/agent_status';
 
 interface Props {
   agent: Agent;
+  showOfflinePreviousStatus?: boolean;
 }
 
 const Status = {
@@ -48,8 +50,8 @@ const Status = {
   ),
 };
 
-function getStatusComponent(agent: Agent): React.ReactElement {
-  switch (agent.status) {
+function getStatusComponent(status: Agent['status']): React.ReactElement {
+  switch (status) {
     case 'warning':
     case 'error':
     case 'degraded':
@@ -67,10 +69,21 @@ function getStatusComponent(agent: Agent): React.ReactElement {
   }
 }
 
-export const AgentHealth: React.FunctionComponent<Props> = ({ agent }) => {
+export const AgentHealth: React.FunctionComponent<Props> = ({
+  agent,
+  showOfflinePreviousStatus,
+}) => {
   const { last_checkin: lastCheckIn } = agent;
   const msLastCheckIn = new Date(lastCheckIn || 0).getTime();
 
+  const previousToOfflineStatus = useMemo(() => {
+    if (!showOfflinePreviousStatus || agent.status !== 'offline') {
+      return;
+    }
+
+    return getPreviousAgentStatusForOfflineAgents(agent);
+  }, [showOfflinePreviousStatus]);
+
   return (
     <EuiToolTip
       position="top"
@@ -93,7 +106,10 @@ export const AgentHealth: React.FunctionComponent<Props> = ({ agent }) => {
         )
       }
     >
-      {getStatusComponent(agent)}
+      <>
+        {getStatusComponent(agent.status)}
+        {previousToOfflineStatus ? getStatusComponent(previousToOfflineStatus) : null}
+      </>
     </EuiToolTip>
   );
 };