[Fleet] Enable per policy outputs

x-pack/plugins/fleet/common/constants/output.ts

@@ -23,3 +23,5 @@ export const DEFAULT_OUTPUT: NewOutput = {
   type: outputType.Elasticsearch,
   hosts: [''],
 };
+
+export const LICENCE_FOR_PER_POLICY_OUTPUT = 'platinum';

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

@@ -3825,6 +3825,14 @@
                 "logs"
               ]
             }
+          },
+          "data_output_id": {
+            "type": "string",
+            "nullable": true
+          },
+          "monitoring_output_id": {
+            "type": "string",
+            "nullable": true
           }
         },
         "required": [
@@ -3981,6 +3989,12 @@
               "updated_by": {
                 "type": "string"
               },
+              "data_output_id": {
+                "type": "string"
+              },
+              "monitoring_output_id": {
+                "type": "string"
+              },
               "revision": {
                 "type": "number"
               },

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

@@ -2402,6 +2402,12 @@ components:
             enum:
               - metrics
               - logs
+        data_output_id:
+          type: string
+          nullable: true
+        monitoring_output_id:
+          type: string
+          nullable: true
       required:
         - name
         - namespace
@@ -2501,6 +2507,10 @@ components:
               format: date-time
             updated_by:
               type: string
+            data_output_id:
+              type: string
+            monitoring_output_id:
+              type: string
             revision:
               type: number
             agents:

x-pack/plugins/fleet/common/openapi/components/schemas/agent_policy.yaml

@@ -22,6 +22,10 @@ allOf:
         format: date-time
       updated_by:
         type: string
+      data_output_id:
+        type: string
+      monitoring_output_id:
+        type: string
       revision:
         type: number
       agents:

x-pack/plugins/fleet/common/openapi/components/schemas/new_agent_policy.yaml

@@ -16,6 +16,12 @@ properties:
       enum:
         - metrics
         - logs
+  data_output_id:
+    type: string
+    nullable: true
+  monitoring_output_id:
+    type: string
+    nullable: true
 required:
   - name
   - namespace

x-pack/plugins/fleet/common/services/license.ts

@@ -40,18 +40,10 @@ export class LicenseService {
   }
 
   public isGoldPlus() {
-    return (
-      this.licenseInformation?.isAvailable &&
-      this.licenseInformation?.isActive &&
-      this.licenseInformation?.hasAtLeast('gold')
-    );
+    return this.hasAtLeast('gold');
   }
   public isEnterprise() {
-    return (
-      this.licenseInformation?.isAvailable &&
-      this.licenseInformation?.isActive &&
-      this.licenseInformation?.hasAtLeast('enterprise')
-    );
+    return this.hasAtLeast('enterprise');
   }
   public hasAtLeast(licenseType: LicenseType) {
     return (

x-pack/plugins/fleet/common/types/models/agent_policy.ts

@@ -25,8 +25,9 @@ export interface NewAgentPolicy {
   monitoring_enabled?: MonitoringType;
   unenroll_timeout?: number;
   is_preconfigured?: boolean;
-  data_output_id?: string;
-  monitoring_output_id?: string;
+  // Nullable to allow user to reset to default outputs
+  data_output_id?: string | null;
+  monitoring_output_id?: string | null;
 }
 
 export interface AgentPolicy extends Omit<NewAgentPolicy, 'id'> {

x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/components/agent_policy_advanced_fields/hooks.test.tsx

@@ -0,0 +1,181 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { createFleetTestRendererMock } from '../../../../../../mock';
+import type { MockedFleetStartServices } from '../../../../../../mock';
+import { useLicense } from '../../../../../../hooks/use_license';
+import type { LicenseService } from '../../../../services';
+
+import { useOutputOptions } from './hooks';
+
+jest.mock('../../../../../../hooks/use_license');
+
+const mockedUseLicence = useLicense as jest.MockedFunction<typeof useLicense>;
+
+function defaultHttpClientGetImplementation(path: any) {
+  if (typeof path !== 'string') {
+    throw new Error('Invalid request');
+  }
+  const err = new Error(`API [GET ${path}] is not MOCKED!`);
+  // eslint-disable-next-line no-console
+  console.log(err);
+  throw err;
+}
+
+const mockApiCallsWithOutputs = (http: MockedFleetStartServices['http']) => {
+  http.get.mockImplementation(async (path) => {
+    if (typeof path !== 'string') {
+      throw new Error('Invalid request');
+    }
+    if (path === '/api/fleet/outputs') {
+      return {
+        data: {
+          items: [
+            {
+              id: 'output1',
+              name: 'Output 1',
+              is_default: true,
+              is_default_monitoring: true,
+            },
+            {
+              id: 'output2',
+              name: 'Output 2',
+              is_default: true,
+              is_default_monitoring: true,
+            },
+            {
+              id: 'output3',
+              name: 'Output 3',
+              is_default: true,
+              is_default_monitoring: true,
+            },
+          ],
+        },
+      };
+    }
+
+    return defaultHttpClientGetImplementation(path);
+  });
+};
+
+describe('useOutputOptions', () => {
+  it('should generate enabled options if the licence is platinium', async () => {
+    const testRenderer = createFleetTestRendererMock();
+    mockedUseLicence.mockReturnValue({
+      hasAtLeast: () => true,
+    } as unknown as LicenseService);
+    mockApiCallsWithOutputs(testRenderer.startServices.http);
+    const { result, waitForNextUpdate } = testRenderer.renderHook(() => useOutputOptions());
+    expect(result.current.isLoading).toBeTruthy();
+
+    await waitForNextUpdate();
+    expect(result.current.dataOutputOptions).toMatchInlineSnapshot(`
+      Array [
+        Object {
+          "inputDisplay": "Default (currently Output 1)",
+          "value": "@@##DEFAULT_OUTPUT_VALUE##@@",
+        },
+        Object {
+          "disabled": false,
+          "inputDisplay": "Output 1",
+          "value": "output1",
+        },
+        Object {
+          "disabled": false,
+          "inputDisplay": "Output 2",
+          "value": "output2",
+        },
+        Object {
+          "disabled": false,
+          "inputDisplay": "Output 3",
+          "value": "output3",
+        },
+      ]
+    `);
+    expect(result.current.monitoringOutputOptions).toMatchInlineSnapshot(`
+      Array [
+        Object {
+          "inputDisplay": "Default (currently Output 1)",
+          "value": "@@##DEFAULT_OUTPUT_VALUE##@@",
+        },
+        Object {
+          "disabled": false,
+          "inputDisplay": "Output 1",
+          "value": "output1",
+        },
+        Object {
+          "disabled": false,
+          "inputDisplay": "Output 2",
+          "value": "output2",
+        },
+        Object {
+          "disabled": false,
+          "inputDisplay": "Output 3",
+          "value": "output3",
+        },
+      ]
+    `);
+  });
+
+  it('should only enable the default options if the licence is not platinium', async () => {
+    const testRenderer = createFleetTestRendererMock();
+    mockedUseLicence.mockReturnValue({
+      hasAtLeast: () => false,
+    } as unknown as LicenseService);
+    mockApiCallsWithOutputs(testRenderer.startServices.http);
+    const { result, waitForNextUpdate } = testRenderer.renderHook(() => useOutputOptions());
+    expect(result.current.isLoading).toBeTruthy();
+
+    await waitForNextUpdate();
+    expect(result.current.dataOutputOptions).toMatchInlineSnapshot(`
+      Array [
+        Object {
+          "inputDisplay": "Default (currently Output 1)",
+          "value": "@@##DEFAULT_OUTPUT_VALUE##@@",
+        },
+        Object {
+          "disabled": true,
+          "inputDisplay": "Output 1",
+          "value": "output1",
+        },
+        Object {
+          "disabled": true,
+          "inputDisplay": "Output 2",
+          "value": "output2",
+        },
+        Object {
+          "disabled": true,
+          "inputDisplay": "Output 3",
+          "value": "output3",
+        },
+      ]
+    `);
+    expect(result.current.monitoringOutputOptions).toMatchInlineSnapshot(`
+      Array [
+        Object {
+          "inputDisplay": "Default (currently Output 1)",
+          "value": "@@##DEFAULT_OUTPUT_VALUE##@@",
+        },
+        Object {
+          "disabled": true,
+          "inputDisplay": "Output 1",
+          "value": "output1",
+        },
+        Object {
+          "disabled": true,
+          "inputDisplay": "Output 2",
+          "value": "output2",
+        },
+        Object {
+          "disabled": true,
+          "inputDisplay": "Output 3",
+          "value": "output3",
+        },
+      ]
+    `);
+  });
+});

x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/components/agent_policy_advanced_fields/hooks.tsx

@@ -0,0 +1,74 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { useMemo } from 'react';
+import { i18n } from '@kbn/i18n';
+import type { EuiSuperSelectOption } from '@elastic/eui';
+
+import { useGetOutputs, useLicense } from '../../../../hooks';
+import { LICENCE_FOR_PER_POLICY_OUTPUT } from '../../../../../../../common';
+
+// The super select component do not support null or '' as a value
+export const DEFAULT_OUTPUT_VALUE = '@@##DEFAULT_OUTPUT_VALUE##@@';
+
+function getDefaultOutput(defaultOutputName?: string) {
+  return {
+    inputDisplay: i18n.translate('xpack.fleet.agentPolicy.outputOptions.defaultOutputText', {
+      defaultMessage: 'Default (currently {defaultOutputName})',
+      values: { defaultOutputName },
+    }),
+    value: DEFAULT_OUTPUT_VALUE,
+  };
+}
+
+export function useOutputOptions() {
+  const outputsRequest = useGetOutputs();
+  const licenseService = useLicense();
+
+  const isLicenceAllowingPolicyPerOutput = licenseService.hasAtLeast(LICENCE_FOR_PER_POLICY_OUTPUT);
+
+  const outputOptions: Array<EuiSuperSelectOption<string>> = useMemo(() => {
+    if (outputsRequest.isLoading || !outputsRequest.data) {
+      return [];
+    }
+
+    return outputsRequest.data.items.map((item) => ({
+      value: item.id,
+      inputDisplay: item.name,
+      disabled: !isLicenceAllowingPolicyPerOutput,
+    }));
+  }, [outputsRequest, isLicenceAllowingPolicyPerOutput]);
+
+  const dataOutputOptions = useMemo(() => {
+    if (outputsRequest.isLoading || !outputsRequest.data) {
+      return [];
+    }
+
+    const defaultOutputName = outputsRequest.data.items.find((item) => item.is_default)?.name;
+    return [getDefaultOutput(defaultOutputName), ...outputOptions];
+  }, [outputsRequest, outputOptions]);
+
+  const monitoringOutputOptions = useMemo(() => {
+    if (outputsRequest.isLoading || !outputsRequest.data) {
+      return [];
+    }
+
+    const defaultOutputName = outputsRequest.data.items.find(
+      (item) => item.is_default_monitoring
+    )?.name;
+    return [getDefaultOutput(defaultOutputName), ...outputOptions];
+  }, [outputsRequest, outputOptions]);
+
+  return useMemo(
+    () => ({
+      dataOutputOptions,
+      monitoringOutputOptions,
+      isLoading: outputsRequest.isLoading,
+    }),
+    [dataOutputOptions, monitoringOutputOptions, outputsRequest.isLoading]
+  );
+}