[UII] Restrict non-local ES output types for agentless integrations and policies

x-pack/platform/plugins/shared/fleet/common/constants/agentless.ts

@@ -7,11 +7,16 @@
 
 import type { MonitoringType } from '../types';
 
+import { outputType } from './output';
+
 export const AGENTLESS_AGENT_POLICY_INACTIVITY_TIMEOUT = 3600;
 export const AGENTLESS_AGENT_POLICY_MONITORING: MonitoringType = ['logs', 'metrics'];
 export const AGENTLESS_GLOBAL_TAG_NAME_ORGANIZATION = 'organization';
 export const AGENTLESS_GLOBAL_TAG_NAME_DIVISION = 'division';
 export const AGENTLESS_GLOBAL_TAG_NAME_TEAM = 'team';
 
+// Allowed output types for agentless integrations
+export const AGENTLESS_ALLOWED_OUTPUT_TYPES = [outputType.Elasticsearch];
+
 // Input types to disable for agentless integrations
 export const AGENTLESS_DISABLED_INPUTS = ['tcp', 'udp', 'filestream', 'http_endpoint', 'winlog'];

x-pack/platform/plugins/shared/fleet/common/services/index.ts

@@ -66,7 +66,7 @@ export {
   mapPackageReleaseToIntegrationCardRelease,
 } from './package_prerelease';
 
-export { getAllowedOutputTypeForPolicy } from './output_helpers';
+export { getAllowedOutputTypesForAgentPolicy } from './output_helpers';
 export { agentStatusesToSummary } from './agent_statuses_to_summary';
 
 export {

x-pack/platform/plugins/shared/fleet/common/services/output_helpers.test.ts

@@ -8,26 +8,29 @@
 import { load } from 'js-yaml';
 
 import {
-  getAllowedOutputTypeForPolicy,
+  getAllowedOutputTypesForAgentPolicy,
   outputYmlIncludesReservedPerformanceKey,
 } from './output_helpers';
 
-describe('getAllowedOutputTypeForPolicy', () => {
+describe('getAllowedOutputTypesForAgentPolicy', () => {
   it('should return all available output type for an agent policy without APM and Fleet Server', () => {
-    const res = getAllowedOutputTypeForPolicy({
+    const res = getAllowedOutputTypesForAgentPolicy({
       package_policies: [
         {
           package: { name: 'nginx' },
         },
       ],
     } as any);
 
+    expect(res).toHaveLength(4);
     expect(res).toContain('elasticsearch');
     expect(res).toContain('logstash');
+    expect(res).toContain('kafka');
+    expect(res).toContain('remote_elasticsearch');
   });
 
   it('should return only elasticsearch for an agent policy with APM', () => {
-    const res = getAllowedOutputTypeForPolicy({
+    const res = getAllowedOutputTypesForAgentPolicy({
       package_policies: [
         {
           package: { name: 'apm' },
@@ -39,7 +42,7 @@ describe('getAllowedOutputTypeForPolicy', () => {
   });
 
   it('should return only elasticsearch for an agent policy with Fleet Server', () => {
-    const res = getAllowedOutputTypeForPolicy({
+    const res = getAllowedOutputTypesForAgentPolicy({
       package_policies: [
         {
           package: { name: 'fleet_server' },
@@ -49,6 +52,32 @@ describe('getAllowedOutputTypeForPolicy', () => {
 
     expect(res).toEqual(['elasticsearch']);
   });
+
+  it('should return only elasticsearch for an agentless agent policy', () => {
+    const res = getAllowedOutputTypesForAgentPolicy({ supports_agentless: true } as any);
+
+    expect(res).toEqual(['elasticsearch']);
+  });
+});
+
+describe('getAllowedOutputTypesForPackagePolicy', () => {
+  it('should return all available output type for a package policy without agentless support', () => {
+    const res = getAllowedOutputTypesForAgentPolicy({
+      package_policies: [
+        {
+          package: { name: 'nginx' },
+        },
+      ],
+    } as any);
+
+    expect(res).toHaveLength(4);
+  });
+
+  it('should return only elasticsearch for a package policy with agentless support', () => {
+    const res = getAllowedOutputTypesForAgentPolicy({ supports_agentless: true } as any);
+
+    expect(res).toEqual(['elasticsearch']);
+  });
 });
 
 describe('outputYmlIncludesReservedPerformanceKey', () => {

x-pack/platform/plugins/shared/fleet/common/services/output_helpers.ts

@@ -9,14 +9,15 @@ import { isObject } from 'lodash';
 
 import { getFlattenedObject } from '@kbn/std';
 
-import type { AgentPolicy, OutputType, ValueOf } from '../types';
+import type { AgentPolicy, PackagePolicy, OutputType, ValueOf } from '../types';
 import {
   FLEET_APM_PACKAGE,
   FLEET_SERVER_PACKAGE,
   FLEET_SYNTHETICS_PACKAGE,
   outputType,
   OUTPUT_TYPES_WITH_PRESET_SUPPORT,
   RESERVED_CONFIG_YML_KEYS,
+  AGENTLESS_ALLOWED_OUTPUT_TYPES,
 } from '../constants';
 
 const sameClusterRestrictedPackages = [
@@ -29,7 +30,7 @@ const sameClusterRestrictedPackages = [
  * Return allowed output type for a given agent policy,
  * Fleet Server and APM cannot use anything else than same cluster ES
  */
-export function getAllowedOutputTypeForPolicy(agentPolicy: AgentPolicy): string[] {
+export function getAllowedOutputTypesForAgentPolicy(agentPolicy: Partial<AgentPolicy>): string[] {
   const isRestrictedToSameClusterES =
     agentPolicy.package_policies &&
     agentPolicy.package_policies.some(
@@ -40,14 +41,33 @@ export function getAllowedOutputTypeForPolicy(agentPolicy: AgentPolicy): string[
     return [outputType.Elasticsearch];
   }
 
+  if (agentPolicy.supports_agentless) {
+    return AGENTLESS_ALLOWED_OUTPUT_TYPES;
+  }
+
   return Object.values(outputType);
 }
 
-export function getAllowedOutputTypesForIntegration(packageName: string): string[] {
-  const isRestrictedToSameClusterES = sameClusterRestrictedPackages.includes(packageName);
+/**
+ * Return allowed output type for a given package policy
+ */
+export function getAllowedOutputTypesForPackagePolicy(
+  packagePolicy: Pick<PackagePolicy, 'supports_agentless'>
+): string[] {
+  if (packagePolicy.supports_agentless) {
+    return AGENTLESS_ALLOWED_OUTPUT_TYPES;
+  }
 
-  if (isRestrictedToSameClusterES) {
-    return [outputType.Elasticsearch];
+  return Object.values(outputType);
+}
+
+export function getAllowedOutputTypesForIntegration(packageName?: string): string[] {
+  if (packageName) {
+    const isRestrictedToSameClusterES = sameClusterRestrictedPackages.includes(packageName);
+
+    if (isRestrictedToSameClusterES) {
+      return [outputType.Elasticsearch];
+    }
   }
 
   return Object.values(outputType);