-
Notifications
You must be signed in to change notification settings - Fork 8.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[Fleet] Include hidden data streams in package upgrade #158654
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
92 changes: 92 additions & 0 deletions
92
x-pack/test/fleet_api_integration/apis/epm/install_hidden_datastreams.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,92 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License | ||
* 2.0; you may not use this file except in compliance with the Elastic License | ||
* 2.0. | ||
*/ | ||
|
||
import expect from '@kbn/expect'; | ||
import { FtrProviderContext } from '../../../api_integration/ftr_provider_context'; | ||
import { skipIfNoDockerRegistry } from '../../helpers'; | ||
import { setupFleetAndAgents } from '../agents/services'; | ||
|
||
export default function (providerContext: FtrProviderContext) { | ||
const { getService } = providerContext; | ||
const supertest = getService('supertest'); | ||
const es = getService('es'); | ||
|
||
const deletePackage = async (name: string, version: string) => { | ||
await supertest.delete(`/api/fleet/epm/packages/${name}/${version}`).set('kbn-xsrf', 'xxxx'); | ||
}; | ||
|
||
describe('installing with hidden datastream', async () => { | ||
skipIfNoDockerRegistry(providerContext); | ||
setupFleetAndAgents(providerContext); | ||
|
||
after(async () => { | ||
await deletePackage('apm', '8.8.0'); | ||
}); | ||
|
||
it('should rollover hidden datastreams when failed to update mappings', async function () { | ||
await supertest | ||
.post(`/api/fleet/epm/packages/apm/8.7.0`) | ||
.set('kbn-xsrf', 'xxxx') | ||
.send({ force: true }) | ||
.expect(200); | ||
|
||
await es.index({ | ||
index: 'metrics-apm.service_summary.10m-default', | ||
document: { | ||
'@timestamp': '2023-05-30T07:50:00.000Z', | ||
agent: { | ||
name: 'go', | ||
}, | ||
data_stream: { | ||
dataset: 'apm.service_summary.10m', | ||
namespace: 'default', | ||
type: 'metrics', | ||
}, | ||
ecs: { | ||
version: '8.6.0-dev', | ||
}, | ||
event: { | ||
agent_id_status: 'missing', | ||
ingested: '2023-05-30T07:57:12Z', | ||
}, | ||
metricset: { | ||
interval: '10m', | ||
name: 'service_summary', | ||
}, | ||
observer: { | ||
hostname: '047e282994fb', | ||
type: 'apm-server', | ||
version: '8.7.0', | ||
}, | ||
processor: { | ||
event: 'metric', | ||
name: 'metric', | ||
}, | ||
service: { | ||
language: { | ||
name: 'go', | ||
}, | ||
name: '___main_elastic_cloud_87_ilm_fix', | ||
}, | ||
}, | ||
}); | ||
|
||
await supertest | ||
.post(`/api/fleet/epm/packages/apm/8.8.0`) | ||
.set('kbn-xsrf', 'xxxx') | ||
.send({ force: true }) | ||
.expect(200); | ||
|
||
const ds = await es.indices.get({ | ||
index: 'metrics-apm.service_summary*', | ||
expand_wildcards: ['open', 'hidden'], | ||
}); | ||
// datastream rolled over | ||
expect(Object.keys(ds).length).greaterThan(1); | ||
}); | ||
}); | ||
} |
Binary file added
BIN
+689 KB
x-pack/test/fleet_api_integration/apis/fixtures/test_packages/apm/apm-8.7.0.zip
Binary file not shown.
Binary file added
BIN
+690 KB
x-pack/test/fleet_api_integration/apis/fixtures/test_packages/apm/apm-8.8.0.zip
Binary file not shown.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually I'm thinking should it be a comma separated string instead? Not too sure about js esclient interface.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I tried that but it has to be an array in ts: