Skip to content

[Archive Migration] index pattern without timefield #125870

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.

Sign up for GitHub

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

Merged
LeeDr merged 11 commits into from
Feb 21, 2022
Merged

[Archive Migration] index pattern without timefield #125870

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
35511c1
kbn_archive date_nanos
Feb 16, 2022
9986bb6
kbn_archive date_nanos in context and discover
Feb 16, 2022
afb53ab
kbn_archiver more date_nanos tests
Feb 16, 2022
a82bc27
split out kbnArchiver for index_pattern_without_timefield
Feb 16, 2022
c6cb706
remove date_nanos files from a different PR
Feb 16, 2022
0d4da1f
update another test for usage of the same archives
Feb 16, 2022
0203ae8
set default index pattern for test
Feb 17, 2022
b77cc66
merge
Feb 17, 2022
30bcf60
remove duplicate const kibanaServer
Feb 17, 2022
35c16fc
Merge branch 'main' into kbnArchiverindex_pattern_without_timefield
kibanamachine Feb 18, 2022
c13acea
Merge branch 'main' into kbnArchiverindex_pattern_without_timefield
kibanamachine Feb 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions test/functional/apps/discover/_indexpattern_without_timefield.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
await esArchiver.loadIfNeeded(
'test/functional/fixtures/es_archiver/index_pattern_without_timefield'
);
await kibanaServer.savedObjects.clean({ types: ['search', 'index-pattern'] });
await kibanaServer.importExport.load(
'test/functional/fixtures/kbn_archiver/index_pattern_without_timefield'
);
await kibanaServer.uiSettings.replace({
defaultIndex: 'without-timefield',
'timepicker:timeDefaults': '{ "from": "2019-01-18T19:37:13.000Z", "to": "now"}',
Expand All @@ -37,6 +41,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
await esArchiver.unload(
'test/functional/fixtures/es_archiver/index_pattern_without_timefield'
);
await kibanaServer.savedObjects.clean({ types: ['search', 'index-pattern'] });
});

it('should not display a timepicker', async () => {
Expand Down
15 changes: 0 additions & 15 deletions test/functional/fixtures/es_archiver/index_pattern_without_timefield/data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,3 @@
{
"type": "doc",
"value": {
"id": "index-pattern:without-timefield",
"index": ".kibana",
"source": {
"index-pattern": {
"fields": "[]",
"title": "without-timefield"
},
"type": "index-pattern"
}
}
}

{
"type": "doc",
"value": {
Expand Down
30 changes: 30 additions & 0 deletions test/functional/fixtures/kbn_archiver/index_pattern_without_timefield.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"attributes": {
"fields": "[]",
"timeFieldName": "@timestamp",
"title": "with-timefield"
},
"coreMigrationVersion": "7.17.1",
"id": "with-timefield",
"migrationVersion": {
"index-pattern": "7.11.0"
},
"references": [],
"type": "index-pattern",
"version": "WzEzLDJd"
}

{
"attributes": {
"fields": "[]",
"title": "without-timefield"
},
"coreMigrationVersion": "7.17.1",
"id": "without-timefield",
"migrationVersion": {
"index-pattern": "7.11.0"
},
"references": [],
"type": "index-pattern",
"version": "WzEyLDJd"
}
9 changes: 8 additions & 1 deletion x-pack/test/functional/apps/discover/value_suggestions_non_timebased.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,20 @@ import { FtrProviderContext } from '../../ftr_provider_context';

export default function ({ getService, getPageObjects }: FtrProviderContext) {
const esArchiver = getService('esArchiver');
const kibanaServer = getService('kibanaServer');
const queryBar = getService('queryBar');
const PageObjects = getPageObjects(['common', 'settings', 'context', 'header']);
const kibanaServer = getService('kibanaServer');

describe('value suggestions non time based', function describeIndexTests() {
before(async function () {
await esArchiver.loadIfNeeded(
'test/functional/fixtures/es_archiver/index_pattern_without_timefield'
);
await kibanaServer.savedObjects.clean({ types: ['search', 'index-pattern'] });
await kibanaServer.importExport.load(
'test/functional/fixtures/kbn_archiver/index_pattern_without_timefield'
);
await kibanaServer.uiSettings.replace({ defaultIndex: 'without-timefield' });
Copy link
Copy Markdown
Author

@LeeDr LeeDr Feb 17, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As you can see in test/functional/fixtures/kbn_archiver/index_pattern_without_timefield.json there are actually two index patterns in that archive with-timefield and without-timefield. The previous test runs failed because the with-timefield index pattern ended up being the default one in Discover. I added code here to set the default to the one the test needs (it's faster than having the test select it in the UI).

await kibanaServer.uiSettings.update({
'doc_table:legacy': true,
});
Expand All @@ -27,6 +32,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
await esArchiver.unload(
'test/functional/fixtures/es_archiver/index_pattern_without_timefield'
);
await kibanaServer.savedObjects.clean({ types: ['search', 'index-pattern'] });
await kibanaServer.uiSettings.unset('defaultIndex');
await kibanaServer.uiSettings.unset('doc_table:legacy');
});

Expand Down