[Fleet] added CPU metrics to request diagnostics

x-pack/plugins/fleet/common/openapi/bundled.json

@@ -15,8 +15,7 @@
   },
   "servers": [
     {
-      "url": "http://localhost:5601/api/fleet",
-      "description": "local"
+      "url": "http://KIBANA_HOST:5601/api/fleet"
     }
   ],
   "paths": {
@@ -1530,6 +1529,9 @@
           "Elastic Package Manager (EPM)"
         ],
         "responses": {
+          "200": {
+            "description": "OK"
+          },
           "400": {
             "$ref": "#/components/responses/error"
           }
@@ -3076,6 +3078,30 @@
         "tags": [
           "Agents"
         ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "additional_metrics": {
+                    "type": "array",
+                    "items": {
+                      "oneOf": [
+                        {
+                          "type": "string",
+                          "enum": [
+                            "CPU"
+                          ]
+                        }
+                      ]
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
         "responses": {
           "200": {
             "description": "OK",
@@ -3159,6 +3185,19 @@
                         "description": "list of agent IDs"
                       }
                     ]
+                  },
+                  "additional_metrics": {
+                    "type": "array",
+                    "items": {
+                      "oneOf": [
+                        {
+                          "type": "string",
+                          "enum": [
+                            "CPU"
+                          ]
+                        }
+                      ]
+                    }
                   }
                 },
                 "required": [

x-pack/plugins/fleet/common/openapi/bundled.yaml

@@ -10,8 +10,7 @@ info:
     name: Elastic License 2.0
     url: https://www.elastic.co/licensing/elastic-license
 servers:
-  - url: http://localhost:5601/api/fleet
-    description: local
+  - url: http://KIBANA_HOST:5601/api/fleet
 paths:
   /health_check:
     post:
@@ -966,6 +965,8 @@ paths:
       tags:
         - Elastic Package Manager (EPM)
       responses:
+        '200':
+          description: OK
         '400':
           $ref: '#/components/responses/error'
       operationId: get-inputs-template
@@ -1928,6 +1929,19 @@ paths:
       summary: Request agent diagnostics
       tags:
         - Agents
+      requestBody:
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                additional_metrics:
+                  type: array
+                  items:
+                    oneOf:
+                      - type: string
+                        enum:
+                          - CPU
       responses:
         '200':
           description: OK
@@ -1979,6 +1993,13 @@ paths:
                       items:
                         type: string
                       description: list of agent IDs
+                additional_metrics:
+                  type: array
+                  items:
+                    oneOf:
+                      - type: string
+                        enum:
+                          - CPU
               required:
                 - agents
             example:

x-pack/plugins/fleet/common/openapi/entrypoint.yaml

@@ -10,8 +10,7 @@ info:
     name: Elastic License 2.0
     url: https://www.elastic.co/licensing/elastic-license
 servers:
-  - url: 'http://localhost:5601/api/fleet'
-    description: local
+  - url: 'http://KIBANA_HOST:5601/api/fleet'
 paths:
   # Fleet internals
   /health_check:

x-pack/plugins/fleet/common/openapi/paths/agents@bulk_request_diagnostics.yaml

@@ -33,6 +33,13 @@ post:
                   items:
                     type: string
                   description: list of agent IDs
+            additional_metrics:
+              type: array
+              items:
+                oneOf:
+                  - type: string
+                    enum:
+                      - "CPU"
           required:
             - agents
         example:

x-pack/plugins/fleet/common/openapi/paths/agents@{agent_id}@request_diagnostics.yaml

@@ -8,6 +8,19 @@ post:
   summary: Request agent diagnostics
   tags:
     - Agents
+  requestBody:
+    content:
+      application/json:
+        schema:
+          type: object
+          properties:
+            additional_metrics:
+              type: array
+              items:
+                oneOf:
+                  - type: string
+                    enum:
+                      - "CPU"
   responses:
     '200':
       description: OK

x-pack/plugins/fleet/common/openapi/paths/epm@templates@{pkg_name}@{pkg_version}@inputs.yaml

@@ -5,6 +5,8 @@ get:
   responses:
     '400':
       $ref: ../components/responses/error.yaml
+    '200':
+      description: OK
   operationId: get-inputs-template
   security:
     - basicAuth: []

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

@@ -152,13 +152,24 @@ export interface PostBulkAgentReassignRequest {
   };
 }
 
+export enum RequestDiagnosticsAdditionalMetrics {
+  'CPU' = 'CPU',
+}
+
+export interface PostRequestDiagnosticsRequest {
+  body: {
+    additional_metrics: RequestDiagnosticsAdditionalMetrics[];
+  };
+}
+
 export type PostRequestDiagnosticsResponse = BulkAgentAction;
 export type PostBulkRequestDiagnosticsResponse = BulkAgentAction;
 
 export interface PostRequestBulkDiagnosticsRequest {
   body: {
     agents: string[] | string;
     batchSize?: number;
+    additional_metrics: RequestDiagnosticsAdditionalMetrics[];
   };
 }
 

x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_diagnostics/index.tsx

@@ -6,6 +6,7 @@
  */
 
 import type { EuiTableFieldDataColumnType } from '@elastic/eui';
+import { EuiPortal } from '@elastic/eui';
 import { EuiToolTip } from '@elastic/eui';
 import {
   EuiBasicTable,
@@ -30,14 +31,9 @@ import {
   MINIMUM_DIAGNOSTICS_AGENT_VERSION,
 } from '../../../../../../../../common/services';
 
-import {
-  sendGetAgentUploads,
-  sendPostRequestDiagnostics,
-  useAuthz,
-  useLink,
-  useStartServices,
-} from '../../../../../hooks';
+import { sendGetAgentUploads, useAuthz, useLink, useStartServices } from '../../../../../hooks';
 import type { AgentDiagnostics, Agent } from '../../../../../../../../common/types/models';
+import { AgentRequestDiagnosticsModal } from '../../../components/agent_request_diagnostics_modal';
 
 const FlexStartEuiFlexItem = styled(EuiFlexItem)`
   align-self: flex-start;
@@ -55,11 +51,11 @@ export const AgentDiagnosticsTab: React.FunctionComponent<AgentDiagnosticsProps>
   const authz = useAuthz();
   const { notifications } = useStartServices();
   const { getAbsolutePath } = useLink();
-  const [isSubmitting, setIsSubmitting] = useState(false);
   const [isLoading, setIsLoading] = useState(true);
   const [diagnosticsEntries, setDiagnosticEntries] = useState<AgentDiagnostics[]>([]);
   const [prevDiagnosticsEntries, setPrevDiagnosticEntries] = useState<AgentDiagnostics[]>([]);
   const [loadInterval, setLoadInterval] = useState(10000);
+  const [isRequestDiagnosticsModalOpen, setIsRequestDiagnosticsModalOpen] = useState(false);
 
   const loadData = useCallback(async () => {
     try {
@@ -194,93 +190,78 @@ export const AgentDiagnosticsTab: React.FunctionComponent<AgentDiagnosticsProps>
     },
   ];
 
-  async function onSubmit() {
-    try {
-      setIsSubmitting(true);
-      const { error } = await sendPostRequestDiagnostics(agent.id);
-      if (error) {
-        throw error;
-      }
-      setIsSubmitting(false);
-      const successMessage = i18n.translate(
-        'xpack.fleet.requestDiagnostics.successSingleNotificationTitle',
-        {
-          defaultMessage: 'Request diagnostics submitted',
-        }
-      );
-      notifications.toasts.addSuccess(successMessage);
-      loadData();
-    } catch (error) {
-      setIsSubmitting(false);
-      notifications.toasts.addError(error, {
-        title: i18n.translate('xpack.fleet.requestDiagnostics.fatalErrorNotificationTitle', {
-          defaultMessage:
-            'Error requesting diagnostics {count, plural, one {agent} other {agents}}',
-          values: { count: 1 },
-        }),
-      });
-    }
-  }
-
   const requestDiagnosticsButton = (
     <EuiButton
       fill
       size="m"
-      onClick={onSubmit}
-      disabled={
-        isSubmitting || !isAgentRequestDiagnosticsSupported(agent) || !authz.fleet.readAgents
-      }
+      onClick={() => {
+        setIsRequestDiagnosticsModalOpen(true);
+      }}
+      disabled={!isAgentRequestDiagnosticsSupported(agent) || !authz.fleet.readAgents}
     >
       <FormattedMessage
-        id="xpack.fleet.agentList.diagnosticsOneButton"
+        id="xpack.fleet.requestDiagnostics.diagnosticsOneButton"
         defaultMessage="Request diagnostics .zip"
       />
     </EuiButton>
   );
 
   return (
-    <EuiFlexGroup direction="column" gutterSize="l">
-      <EuiFlexItem>
-        <EuiCallOut
-          iconType="warning"
-          color="warning"
-          title={
-            <FormattedMessage
-              id="xpack.fleet.fleetServerSetup.calloutTitle"
-              defaultMessage="Agent diagnostics"
-            />
-          }
-        >
-          <FormattedMessage
-            id="xpack.fleet.requestDiagnostics.calloutText"
-            defaultMessage="Diagnostics files are stored in Elasticsearch, and as such can incur storage costs."
+    <>
+      {isRequestDiagnosticsModalOpen && (
+        <EuiPortal>
+          <AgentRequestDiagnosticsModal
+            agents={[agent]}
+            agentCount={1}
+            onClose={() => {
+              setIsRequestDiagnosticsModalOpen(false);
+            }}
           />
-        </EuiCallOut>
-      </EuiFlexItem>
-      <FlexStartEuiFlexItem>
-        {isAgentRequestDiagnosticsSupported(agent) ? (
-          requestDiagnosticsButton
-        ) : (
-          <EuiToolTip
-            content={
+        </EuiPortal>
+      )}
+      <EuiFlexGroup direction="column" gutterSize="l">
+        <EuiFlexItem>
+          <EuiCallOut
+            iconType="warning"
+            color="warning"
+            title={
               <FormattedMessage
-                id="xpack.fleet.requestDiagnostics.notSupportedTooltip"
-                defaultMessage="Requesting agent diagnostics is not supported for agents before version {version}."
-                values={{ version: MINIMUM_DIAGNOSTICS_AGENT_VERSION }}
+                id="xpack.fleet.fleetServerSetup.calloutTitle"
+                defaultMessage="Agent diagnostics"
               />
             }
           >
-            {requestDiagnosticsButton}
-          </EuiToolTip>
-        )}
-      </FlexStartEuiFlexItem>
-      <EuiFlexItem>
-        {isLoading ? (
-          <EuiSkeletonText lines={3} />
-        ) : (
-          <EuiBasicTable<AgentDiagnostics> items={diagnosticsEntries} columns={columns} />
-        )}
-      </EuiFlexItem>
-    </EuiFlexGroup>
+            <FormattedMessage
+              id="xpack.fleet.requestDiagnostics.calloutText"
+              defaultMessage="Diagnostics files are stored in Elasticsearch, and as such can incur storage costs."
+            />
+          </EuiCallOut>
+        </EuiFlexItem>
+        <FlexStartEuiFlexItem>
+          {isAgentRequestDiagnosticsSupported(agent) ? (
+            requestDiagnosticsButton
+          ) : (
+            <EuiToolTip
+              content={
+                <FormattedMessage
+                  id="xpack.fleet.requestDiagnostics.notSupportedTooltip"
+                  defaultMessage="Requesting agent diagnostics is not supported for agents before version {version}."
+                  values={{ version: MINIMUM_DIAGNOSTICS_AGENT_VERSION }}
+                />
+              }
+            >
+              {requestDiagnosticsButton}
+            </EuiToolTip>
+          )}
+        </FlexStartEuiFlexItem>
+        <EuiFlexItem>
+          {isLoading ? (
+            <EuiSkeletonText lines={3} />
+          ) : (
+            <EuiBasicTable<AgentDiagnostics> items={diagnosticsEntries} columns={columns} />
+          )}
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </>
   );
 };