github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 09:48:58 -04:00
Code Issues Projects Releases Packages Wiki Activity

[Fleet] Fix pipeline with id [*] does not exists (#116707) (#116801)

Browse source 
Co-authored-by: Nicolas Chaulet <nicolas.chaulet@elastic.co>
This commit is contained in:
Kibana Machine 2021-10-31 23:07:03 -04:00 • committed by GitHub
parent 6f372b1c77
commit c49fcc4f00
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
x-pack/plugins/fleet/server/services/epm/archive/storage.ts
View file

@ -264,7 +264,7 @@ export const getEsPackage = async (
dataStreams.push({
dataset: dataset || `${pkgName}.${dataStreamPath}`,
package: pkgName,
ingest_pipeline: ingestPipeline || 'default',
ingest_pipeline: ingestPipeline,
path: dataStreamPath,
streams,
...dataStreamManifestProps,

3
x-pack/plugins/fleet/server/services/epm/archive/validation.ts
View file

@ -217,7 +217,6 @@ export function parseAndVerifyDataStreams(
}
const streams = parseAndVerifyStreams(manifestStreams, dataStreamPath);
// default ingest pipeline name see https://github.com/elastic/package-registry/blob/master/util/dataset.go#L26
dataStreams.push(
Object.entries(restOfProps).reduce(
(validatedDataStream, [key, value]) => {
@ -233,7 +232,7 @@ export function parseAndVerifyDataStreams(
type,
package: pkgName,
dataset: dataset || `${pkgName}.${dataStreamPath}`,
ingest_pipeline: ingestPipeline || 'default',
ingest_pipeline: ingestPipeline,
path: dataStreamPath,
streams,
}

7
x-pack/test/fleet_api_integration/apis/epm/__snapshots__/install_by_upload.snap generated
View file

@ -167,7 +167,6 @@ Object {
"data_streams": Array [
Object {
"dataset": "apache.access",
"ingest_pipeline": "default",
"package": "apache",
"path": "access",
"release": "experimental",
@ -199,7 +198,6 @@ Object {
},
Object {
"dataset": "apache.status",
"ingest_pipeline": "default",
"package": "apache",
"path": "status",
"release": "experimental",
@ -236,7 +234,6 @@ Object {
},
Object {
"dataset": "apache.error",
"ingest_pipeline": "default",
"package": "apache",
"path": "error",
"release": "experimental",
@ -331,11 +328,11 @@ Object {
"install_version": "0.1.4",
"installed_es": Array [
Object {
"id": "logs-apache.access-0.1.4",
"id": "logs-apache.access-0.1.4-default",
"type": "ingest_pipeline",
},
Object {
"id": "logs-apache.error-0.1.4",
"id": "logs-apache.error-0.1.4-default",
"type": "ingest_pipeline",
},
Object {

4
x-pack/test/fleet_api_integration/apis/epm/install_by_upload.ts
View file

@ -74,7 +74,7 @@ export default function (providerContext: FtrProviderContext) {
.type('application/gzip')
.send(buf)
.expect(200);
expect(res.body.response.length).to.be(29);
expect(res.body.response.length).to.be(27);
});
it('should install a zip archive correctly and package info should return correctly after validation', async function () {
@ -85,7 +85,7 @@ export default function (providerContext: FtrProviderContext) {
.type('application/zip')
.send(buf)
.expect(200);
expect(res.body.response.length).to.be(29);
expect(res.body.response.length).to.be(27);
const packageInfoRes = await supertest
.get(`/api/fleet/epm/packages/${testPkgKey}`)