[Fleet] Fix preconfigured remote ES outputs with secrets

x-pack/plugins/fleet/server/types/models/preconfiguration.test.ts

@@ -29,6 +29,7 @@ describe('Test preconfiguration schema', () => {
         ]);
       }).toThrowError('preconfigured outputs can only have one default output.');
     });
+
     it('should not allow multiple default monitoring output', () => {
       expect(() => {
         PreconfiguredOutputsSchema.validate([
@@ -49,6 +50,7 @@ describe('Test preconfiguration schema', () => {
         ]);
       }).toThrowError('preconfigured outputs can only have one default monitoring output.');
     });
+
     it('should not allow multiple output with same ids', () => {
       expect(() => {
         PreconfiguredOutputsSchema.validate([
@@ -67,6 +69,7 @@ describe('Test preconfiguration schema', () => {
         ]);
       }).toThrowError('preconfigured outputs need to have unique ids.');
     });
+
     it('should not allow multiple output with same names', () => {
       expect(() => {
         PreconfiguredOutputsSchema.validate([
@@ -85,5 +88,63 @@ describe('Test preconfiguration schema', () => {
         ]);
       }).toThrowError('preconfigured outputs need to have unique names.');
     });
+
+    it('should allow logstash type outputs', () => {
+      expect(() => {
+        PreconfiguredOutputsSchema.validate([
+          {
+            id: 'output-1',
+            name: 'my logstash output',
+            type: 'logstash',
+            hosts: ['localhost:9200'],
+            ssl: {
+              certificate: 'xxxxx',
+            },
+            secrets: {
+              ssl: {
+                key: 'mykey',
+              },
+            },
+          },
+        ]);
+      }).not.toThrowError();
+    });
+
+    it('should allow kafka type outputs', () => {
+      expect(() => {
+        PreconfiguredOutputsSchema.validate([
+          {
+            id: 'output-1',
+            name: 'my kafka output',
+            type: 'kafka',
+            hosts: ['localhost:9200'],
+            auth_type: 'ssl',
+            topics: [{ topic: 'topic1' }],
+            secrets: {
+              password: 'mypassword',
+              ssl: {
+                key: 'mykey',
+              },
+            },
+          },
+        ]);
+      }).not.toThrowError();
+    });
+
+    it('should allow remote elasticsearch type outputs', () => {
+      expect(() => {
+        PreconfiguredOutputsSchema.validate([
+          {
+            id: 'output-1',
+            name: 'my remote elasticsearch output',
+            type: 'remote_elasticsearch',
+            hosts: ['http://test.fr:9200'],
+            secrets: {
+              service_token: 'myservicetoken',
+            },
+          },
+        ]);
+      }).not.toThrowError();
+    });
   });
 });

x-pack/plugins/fleet/server/types/models/preconfiguration.ts

@@ -11,7 +11,12 @@ import semverValid from 'semver/functions/valid';
 import { PRECONFIGURATION_LATEST_KEYWORD } from '../../constants';
 import type { PreconfiguredOutput } from '../../../common/types';
 
-import { ElasticSearchSchema, KafkaSchema, LogstashSchema } from './output';
+import {
+  ElasticSearchSchema,
+  KafkaSchema,
+  LogstashSchema,
+  RemoteElasticSearchSchema,
+} from './output';
 
 import { AgentPolicyBaseSchema } from './agent_policy';
 import { NamespaceSchema } from './package_policy';
@@ -87,6 +92,7 @@ export const PreconfiguredOutputsSchema = schema.arrayOf(
     schema.object({ ...ElasticSearchSchema }).extends(PreconfiguredOutputBaseSchema),
     schema.object({ ...LogstashSchema }).extends(PreconfiguredOutputBaseSchema),
     schema.object({ ...KafkaSchema }).extends(PreconfiguredOutputBaseSchema),
+    schema.object({ ...RemoteElasticSearchSchema }).extends(PreconfiguredOutputBaseSchema),
   ]),
   { defaultValue: [], validate: validatePreconfiguredOutputs }
 );