Account for if a stream is enabled by default from registry package d…

…efinition: elastic#59724
jen-huang · Mar 10, 2020 · 017aaf2 · 017aaf2
1 parent e38cc50
commit 017aaf2
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 29 deletions.
diff --git a/x-pack/plugins/ingest_manager/common/services/package_to_config.ts b/x-pack/plugins/ingest_manager/common/services/package_to_config.ts
@@ -26,37 +26,39 @@ export const packageToConfigDatasourceInputs = (packageInfo: PackageInfo): Datas
   if (packageDatasource?.inputs?.length) {
     // Map each package datasource input to agent config datasource input
     packageDatasource.inputs.forEach(packageInput => {
+      // Map each package input stream into datasource input stream
+      const streams: DatasourceInputStream[] = packageInput.streams
+        ? packageInput.streams.map(packageStream => {
+            // Copy input vars into each stream's vars
+            const streamVars: RegistryVarsEntry[] = [
+              ...(packageInput.vars || []),
+              ...(packageStream.vars || []),
+            ];
+            const streamConfig = {};
+            const streamVarsReducer = (
+              configObject: DatasourceInputStream['config'],
+              streamVar: RegistryVarsEntry
+            ): DatasourceInputStream['config'] => {
+              if (!streamVar.default && streamVar.multi) {
+                configObject![streamVar.name] = [];
+              } else {
+                configObject![streamVar.name] = streamVar.default;
+              }
+              return configObject;
+            };
+            return {
+              id: `${packageInput.type}-${packageStream.dataset}`,
+              enabled: packageStream.enabled === false ? false : true,
+              dataset: packageStream.dataset,
+              config: streamVars.reduce(streamVarsReducer, streamConfig),
+            };
+          })
+        : [];
+
       const input: DatasourceInput = {
         type: packageInput.type,
-        enabled: true,
-        // Map each package input stream into datasource input stream
-        streams: packageInput.streams
-          ? packageInput.streams.map(packageStream => {
-              // Copy input vars into each stream's vars
-              const streamVars: RegistryVarsEntry[] = [
-                ...(packageInput.vars || []),
-                ...(packageStream.vars || []),
-              ];
-              const streamConfig = {};
-              const streamVarsReducer = (
-                configObject: DatasourceInputStream['config'],
-                streamVar: RegistryVarsEntry
-              ): DatasourceInputStream['config'] => {
-                if (!streamVar.default && streamVar.multi) {
-                  configObject![streamVar.name] = [];
-                } else {
-                  configObject![streamVar.name] = streamVar.default;
-                }
-                return configObject;
-              };
-              return {
-                id: `${packageInput.type}-${packageStream.dataset}`,
-                enabled: true,
-                dataset: packageStream.dataset,
-                config: streamVars.reduce(streamVarsReducer, streamConfig),
-              };
-            })
-          : [],
+        enabled: streams.length ? !!streams.find(stream => stream.enabled) : true,
+        streams,
       };
 
       inputs.push(input);

diff --git a/x-pack/plugins/ingest_manager/common/types/models/epm.ts b/x-pack/plugins/ingest_manager/common/types/models/epm.ts
@@ -87,6 +87,7 @@ export interface RegistryStream {
   dataset: string;
   title: string;
   description?: string;
+  enabled?: boolean;
   vars?: RegistryVarsEntry[];
 }