Skip to content

Commit

Permalink
Merge branch 'feature-default-pipeline-fleet-all-datastreams' of gith…
Browse files Browse the repository at this point in the history
…ub.com:nchaulet/kibana into feature-default-pipeline-fleet-all-datastreams
  • Loading branch information
nchaulet committed Jun 15, 2022
2 parents 4fa954d + 1d6e1c3 commit 882028f
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
// eslint-disable-next-line @kbn/eslint/no-restricted-paths
import { elasticsearchClientMock } from '@kbn/core/server/elasticsearch/client/mocks';
import { loggerMock } from '@kbn/logging-mocks';

import { getArchiveEntry } from '../../archive/cache';

import { prepareToInstallPipelines } from './install';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import {
import { appendMetadataToIngestPipeline } from '../meta';

import { retryTransientEsErrors } from '../retry';

import {
getPipelineNameForDatastream,
getPipelineNameForInstallation,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ export function prepareTemplate({
const templatePriority = getTemplatePriority(dataStream);

const pipelineName = getPipelineNameForDatastream({ dataStream, packageVersion });

const defaultSettings = buildDefaultSettings({
templateName,
packageName,
Expand Down

0 comments on commit 882028f

Please sign in to comment.