[Ingest Manager] Optimize installation of integration

x-pack/plugins/ingest_manager/server/services/epm/elasticsearch/ilm/install.ts

@@ -7,16 +7,8 @@
 import { CallESAsCurrentUser, ElasticsearchAssetType } from '../../../../types';
 import * as Registry from '../../registry';
 
-export async function installILMPolicy(
-  pkgName: string,
-  pkgVersion: string,
-  callCluster: CallESAsCurrentUser
-) {
-  const ilmPaths = await Registry.getArchiveInfo(
-    pkgName,
-    pkgVersion,
-    (entry: Registry.ArchiveEntry) => isILMPolicy(entry)
-  );
+export async function installILMPolicy(paths: string[], callCluster: CallESAsCurrentUser) {
+  const ilmPaths = paths.filter((path) => isILMPolicy(path));
   if (!ilmPaths.length) return;
   await Promise.all(
     ilmPaths.map(async (path) => {
@@ -36,7 +28,7 @@ export async function installILMPolicy(
     })
   );
 }
-const isILMPolicy = ({ path }: Registry.ArchiveEntry) => {
+const isILMPolicy = (path: string) => {
   const pathParts = Registry.pathParts(path);
   return pathParts.type === ElasticsearchAssetType.ilmPolicy;
 };

x-pack/plugins/ingest_manager/server/services/epm/elasticsearch/ingest_pipeline/install.ts

@@ -22,17 +22,19 @@ interface RewriteSubstitution {
 
 export const installPipelines = async (
   registryPackage: RegistryPackage,
+  paths: string[],
   callCluster: CallESAsCurrentUser
 ) => {
   const datasets = registryPackage.datasets;
+  const pipelinePaths = paths.filter((path) => isPipeline(path));
   if (datasets) {
     const pipelines = datasets.reduce<Array<Promise<AssetReference[]>>>((acc, dataset) => {
       if (dataset.ingest_pipeline) {
         acc.push(
           installPipelinesForDataset({
             dataset,
             callCluster,
-            pkgName: registryPackage.name,
+            paths: pipelinePaths,
             pkgVersion: registryPackage.version,
           })
         );
@@ -67,20 +69,16 @@ export function rewriteIngestPipeline(
 
 export async function installPipelinesForDataset({
   callCluster,
-  pkgName,
   pkgVersion,
+  paths,
   dataset,
 }: {
   callCluster: CallESAsCurrentUser;
-  pkgName: string;
   pkgVersion: string;
+  paths: string[];
   dataset: Dataset;
 }): Promise<AssetReference[]> {
-  const pipelinePaths = await Registry.getArchiveInfo(
-    pkgName,
-    pkgVersion,
-    (entry: Registry.ArchiveEntry) => isDatasetPipeline(entry, dataset.path)
-  );
+  const pipelinePaths = paths.filter((path) => isDatasetPipeline(path, dataset.path));
   let pipelines: any[] = [];
   const substitutions: RewriteSubstitution[] = [];
 
@@ -152,8 +150,8 @@ async function installPipeline({
 }
 
 const isDirectory = ({ path }: Registry.ArchiveEntry) => path.endsWith('/');
-const isDatasetPipeline = ({ path }: Registry.ArchiveEntry, datasetName: string) => {
-  // TODO: better way to get particular assets
+
+const isDatasetPipeline = (path: string, datasetName: string) => {
   const pathParts = Registry.pathParts(path);
   return (
     !isDirectory({ path }) &&
@@ -162,6 +160,10 @@ const isDatasetPipeline = ({ path }: Registry.ArchiveEntry, datasetName: string)
     datasetName === pathParts.dataset
   );
 };
+const isPipeline = (path: string) => {
+  const pathParts = Registry.pathParts(path);
+  return pathParts.type === ElasticsearchAssetType.ingestPipeline;
+};
 
 // XXX: assumes path/to/file.ext -- 0..n '/' and exactly one '.'
 const getNameAndExtension = (

x-pack/plugins/ingest_manager/server/services/epm/elasticsearch/template/install.ts

@@ -16,13 +16,14 @@ export const installTemplates = async (
   registryPackage: RegistryPackage,
   callCluster: CallESAsCurrentUser,
   pkgName: string,
-  pkgVersion: string
+  pkgVersion: string,
+  paths: string[]
 ): Promise<TemplateRef[]> => {
   // install any pre-built index template assets,
   // atm, this is only the base package's global index templates
   // Install component templates first, as they are used by the index templates
-  await installPreBuiltComponentTemplates(pkgName, pkgVersion, callCluster);
-  await installPreBuiltTemplates(pkgName, pkgVersion, callCluster);
+  await installPreBuiltComponentTemplates(paths, callCluster);
+  await installPreBuiltTemplates(paths, callCluster);
 
   // build templates per dataset from yml files
   const datasets = registryPackage.datasets;
@@ -44,16 +45,8 @@ export const installTemplates = async (
   return [];
 };
 
-const installPreBuiltTemplates = async (
-  pkgName: string,
-  pkgVersion: string,
-  callCluster: CallESAsCurrentUser
-) => {
-  const templatePaths = await Registry.getArchiveInfo(
-    pkgName,
-    pkgVersion,
-    (entry: Registry.ArchiveEntry) => isTemplate(entry)
-  );
+const installPreBuiltTemplates = async (paths: string[], callCluster: CallESAsCurrentUser) => {
+  const templatePaths = paths.filter((path) => isTemplate(path));
   const templateInstallPromises = templatePaths.map(async (path) => {
     const { file } = Registry.pathParts(path);
     const templateName = file.substr(0, file.lastIndexOf('.'));
@@ -95,15 +88,10 @@ const installPreBuiltTemplates = async (
 };
 
 const installPreBuiltComponentTemplates = async (
-  pkgName: string,
-  pkgVersion: string,
+  paths: string[],
   callCluster: CallESAsCurrentUser
 ) => {
-  const templatePaths = await Registry.getArchiveInfo(
-    pkgName,
-    pkgVersion,
-    (entry: Registry.ArchiveEntry) => isComponentTemplate(entry)
-  );
+  const templatePaths = paths.filter((path) => isComponentTemplate(path));
   const templateInstallPromises = templatePaths.map(async (path) => {
     const { file } = Registry.pathParts(path);
     const templateName = file.substr(0, file.lastIndexOf('.'));
@@ -134,12 +122,12 @@ const installPreBuiltComponentTemplates = async (
   }
 };
 
-const isTemplate = ({ path }: Registry.ArchiveEntry) => {
+const isTemplate = (path: string) => {
   const pathParts = Registry.pathParts(path);
   return pathParts.type === ElasticsearchAssetType.indexTemplate;
 };
 
-const isComponentTemplate = ({ path }: Registry.ArchiveEntry) => {
+const isComponentTemplate = (path: string) => {
   const pathParts = Registry.pathParts(path);
   return pathParts.type === ElasticsearchAssetType.componentTemplate;
 };

x-pack/plugins/ingest_manager/server/services/epm/kibana/index_pattern/install.ts

@@ -14,6 +14,7 @@ import { loadFieldsFromYaml, Fields, Field } from '../../fields/field';
 import { getPackageKeysByStatus } from '../../packages/get';
 import { InstallationStatus, RegistryPackage, CallESAsCurrentUser } from '../../../../types';
 import { appContextService } from '../../../../services';
+import { cacheHas, getCacheKey } from '../../registry/cache';
 
 interface FieldFormatMap {
   [key: string]: FieldFormatMapItem;
@@ -86,6 +87,17 @@ export async function installIndexPatterns(
     savedObjectsClient,
     InstallationStatus.installed
   );
+
+  // TODO: move to install package
+  // cache all installed packages if they don't exist
+  const packagesPromise = installedPackages.map((pkg) => {
+    const pkgkey = getCacheKey(pkg.pkgName + '-' + pkg.pkgVersion);
+    if (!cacheHas(pkgkey)) {
+      return Registry.getArchiveInfo(pkg.pkgName, pkg.pkgVersion);
+    }
+  });
+  await Promise.all(packagesPromise);
+
   if (pkgName && pkgVersion) {
     // add this package to the array if it doesn't already exist
     const foundPkg = installedPackages.find((pkg) => pkg.pkgName === pkgName);

x-pack/plugins/ingest_manager/server/services/epm/packages/assets.ts

@@ -6,7 +6,7 @@
 
 import { RegistryPackage } from '../../../types';
 import * as Registry from '../registry';
-import { cacheHas } from '../registry/cache';
+import { cacheHas, getCacheKey } from '../registry/cache';
 
 // paths from RegistryPackage are routes to the assets on EPR
 // e.g. `/package/nginx/1.2.0/dataset/access/fields/fields.yml`
@@ -57,8 +57,10 @@ export async function getAssetsData(
   datasetName?: string
 ): Promise<Registry.ArchiveEntry[]> {
   // TODO: Needs to be called to fill the cache but should not be required
-  const pkgkey = packageInfo.name + '-' + packageInfo.version;
-  if (!cacheHas(pkgkey)) await Registry.getArchiveInfo(packageInfo.name, packageInfo.version);
+  const pkgkey = getCacheKey(packageInfo.name + '-' + packageInfo.version);
+  if (!cacheHas(pkgkey)) {
+    await Registry.getArchiveInfo(packageInfo.name, packageInfo.version);
+  }
 
   // Gather all asset data
   const assets = getAssets(packageInfo, filter, datasetName);

x-pack/plugins/ingest_manager/server/services/epm/packages/install.ts

@@ -90,7 +90,7 @@ export async function installPackage(options: {
   const { savedObjectsClient, pkgkey, callCluster } = options;
   // TODO: change epm API to /packageName/version so we don't need to do this
   const [pkgName, pkgVersion] = pkgkey.split('-');
-
+  const paths = await Registry.getArchiveInfo(pkgName, pkgVersion);
   // see if some version of this package is already installed
   // TODO: calls to getInstallationObject, Registry.fetchInfo, and Registry.fetchFindLatestPackge
   // and be replaced by getPackageInfo after adjusting for it to not group/use archive assets
@@ -119,23 +119,25 @@ export async function installPackage(options: {
       savedObjectsClient,
       pkgName,
       pkgVersion,
+      paths,
     }),
-    installPipelines(registryPackageInfo, callCluster),
+    installPipelines(registryPackageInfo, paths, callCluster),
     // index patterns and ilm policies are not currently associated with a particular package
     // so we do not save them in the package saved object state.
     installIndexPatterns(savedObjectsClient, pkgName, pkgVersion),
     // currenly only the base package has an ILM policy
     // at some point ILM policies can be installed/modified
     // per dataset and we should then save them
-    installILMPolicy(pkgName, pkgVersion, callCluster),
+    installILMPolicy(paths, callCluster),
   ]);
 
   // install or update the templates
   const installedTemplates = await installTemplates(
     registryPackageInfo,
     callCluster,
     pkgName,
-    pkgVersion
+    pkgVersion,
+    paths
   );
   const toSaveESIndexPatterns = generateESIndexPatterns(registryPackageInfo.datasets);
 
@@ -186,13 +188,14 @@ export async function installKibanaAssets(options: {
   savedObjectsClient: SavedObjectsClientContract;
   pkgName: string;
   pkgVersion: string;
+  paths: string[];
 }) {
-  const { savedObjectsClient, pkgName, pkgVersion } = options;
+  const { savedObjectsClient, paths } = options;
 
   // Only install Kibana assets during package installation.
   const kibanaAssetTypes = Object.values(KibanaAssetType);
   const installationPromises = kibanaAssetTypes.map(async (assetType) =>
-    installKibanaSavedObjects({ savedObjectsClient, pkgName, pkgVersion, assetType })
+    installKibanaSavedObjects({ savedObjectsClient, assetType, paths })
   );
 
   // installKibanaSavedObjects returns AssetReference[], so .map creates AssetReference[][]
@@ -237,19 +240,16 @@ export async function saveInstallationReferences(options: {
 
 async function installKibanaSavedObjects({
   savedObjectsClient,
-  pkgName,
-  pkgVersion,
   assetType,
+  paths,
 }: {
   savedObjectsClient: SavedObjectsClientContract;
-  pkgName: string;
-  pkgVersion: string;
   assetType: KibanaAssetType;
+  paths: string[];
 }) {
-  const isSameType = ({ path }: Registry.ArchiveEntry) =>
-    assetType === Registry.pathParts(path).type;
-  const paths = await Registry.getArchiveInfo(pkgName, pkgVersion, isSameType);
-  const toBeSavedObjects = await Promise.all(paths.map(getObject));
+  const isSameType = (path: string) => assetType === Registry.pathParts(path).type;
+  const pathsOfType = paths.filter((path) => isSameType(path));
+  const toBeSavedObjects = await Promise.all(pathsOfType.map(getObject));
 
   if (toBeSavedObjects.length === 0) {
     return [];

x-pack/plugins/ingest_manager/server/services/epm/registry/cache.ts

@@ -8,3 +8,4 @@ const cache: Map<string, Buffer> = new Map();
 export const cacheGet = (key: string) => cache.get(key);
 export const cacheSet = (key: string, value: Buffer) => cache.set(key, value);
 export const cacheHas = (key: string) => cache.has(key);
+export const getCacheKey = (key: string) => key + '.tar.gz';