[test] Migrating to kbn_archiver from es_archiver - for the Maps app (#103028)

* converting Maps es_archiver to kbn_archiver

* delete the esArchiver .kibana reference directory

* fix the path of the json file

* use the delete API to delete the missing references populated in the data.json

* fix the path

* kbn_archiver_maps.json

* added the missing ref

* restoring it to use esArchiver

* replace esArchiver to use kbnArchiver

* moved the data.json directly under kbnArchiver

 Please enter the commit message for your changes. Lines starting

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
This commit is contained in:
Rashmi Kulkarni 2021-06-30 06:36:53 -07:00 committed by GitHub
parent 398d3fdd5c
commit 4cb979b688
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 951 additions and 1699 deletions

View file

@ -14,6 +14,10 @@ export default function ({ loadTestFile, getService }) {
await esArchiver.load('x-pack/test/functional/es_archives/maps/data');
});
after(async () => {
await esArchiver.unload('x-pack/test/functional/es_archives/logstash_functional');
});
describe('', () => {
loadTestFile(require.resolve('./get_indexes_matching_pattern'));
loadTestFile(require.resolve('./create_doc_source'));

View file

@ -9,7 +9,7 @@ import expect from '@kbn/expect';
export default function ({ getService }) {
const supertest = getService('supertest');
const esArchiver = getService('esArchiver');
const kibanaServer = getService('kibanaServer');
describe('migrations', () => {
describe('saved object migrations', () => {
@ -51,11 +51,15 @@ export default function ({ getService }) {
describe('embeddable migrations', () => {
before(async () => {
await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/maps/kibana');
await kibanaServer.importExport.load(
'x-pack/test/functional/fixtures/kbn_archiver/maps.json'
);
});
after(async () => {
await esArchiver.unload('x-pack/test/functional/es_archives/maps/kibana');
await kibanaServer.importExport.unload(
'x-pack/test/functional/fixtures/kbn_archiver/maps.json'
);
});
it('should apply embeddable migrations', async () => {

View file

@ -9,14 +9,38 @@ export default function ({ loadTestFile, getService }) {
const kibanaServer = getService('kibanaServer');
const esArchiver = getService('esArchiver');
const browser = getService('browser');
const log = getService('log');
const supertest = getService('supertest');
describe('maps app', function () {
this.tags(['skipFirefox']);
before(async () => {
await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional');
await kibanaServer.importExport.load(
'x-pack/test/functional/fixtures/kbn_archiver/maps.json'
);
//Find the missing references manually, use the below API to delete it after successful import.
log.info('Delete index pattern');
log.debug('id: ' + 'idThatDoesNotExitForESGeoGridSource');
log.debug('id: ' + 'idThatDoesNotExitForESSearchSource');
log.debug('id: ' + 'idThatDoesNotExitForESJoinSource');
await supertest
.delete('/api/index_patterns/index_pattern/' + 'idThatDoesNotExitForESGeoGridSource')
.set('kbn-xsrf', 'true')
.expect(200);
await supertest
.delete('/api/index_patterns/index_pattern/' + 'idThatDoesNotExitForESSearchSource')
.set('kbn-xsrf', 'true')
.expect(200);
await supertest
.delete('/api/index_patterns/index_pattern/' + 'idThatDoesNotExitForESJoinSource')
.set('kbn-xsrf', 'true')
.expect(200);
await esArchiver.load('x-pack/test/functional/es_archives/maps/data');
await esArchiver.load('x-pack/test/functional/es_archives/maps/kibana');
await kibanaServer.uiSettings.replace({
defaultIndex: 'c698b940-e149-11e8-a35a-370a8516603a',
});
@ -25,7 +49,9 @@ export default function ({ loadTestFile, getService }) {
after(async () => {
await esArchiver.unload('x-pack/test/functional/es_archives/maps/data');
await esArchiver.unload('x-pack/test/functional/es_archives/maps/kibana');
await kibanaServer.importExport.unload(
'x-pack/test/functional/fixtures/kbn_archiver/maps.json'
);
});
describe('', async function () {

File diff suppressed because it is too large Load diff

View file

@ -1,445 +0,0 @@
{
"type": "index",
"value": {
"aliases": {
".kibana": {}
},
"index": ".kibana_1",
"mappings": {
"dynamic": "strict",
"properties": {
"canvas-workpad": {
"dynamic": "false",
"properties": {
"@created": {
"type": "date"
},
"@timestamp": {
"type": "date"
},
"id": {
"index": false,
"type": "text"
},
"name": {
"fields": {
"keyword": {
"type": "keyword"
}
},
"type": "text"
}
}
},
"config": {
"dynamic": "true",
"properties": {
"buildNum": {
"type": "keyword"
},
"defaultIndex": {
"fields": {
"keyword": {
"ignore_above": 256,
"type": "keyword"
}
},
"type": "text"
}
}
},
"dashboard": {
"properties": {
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"optionsJSON": {
"type": "text"
},
"panelsJSON": {
"type": "text"
},
"refreshInterval": {
"properties": {
"display": {
"type": "keyword"
},
"pause": {
"type": "boolean"
},
"section": {
"type": "integer"
},
"value": {
"type": "integer"
}
}
},
"timeFrom": {
"type": "keyword"
},
"timeRestore": {
"type": "boolean"
},
"timeTo": {
"type": "keyword"
},
"title": {
"type": "text"
},
"uiStateJSON": {
"type": "text"
},
"version": {
"type": "integer"
}
}
},
"graph-workspace": {
"properties": {
"description": {
"type": "text"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"numLinks": {
"type": "integer"
},
"numVertices": {
"type": "integer"
},
"title": {
"type": "text"
},
"version": {
"type": "integer"
},
"wsState": {
"type": "text"
}
}
},
"index-pattern": {
"properties": {
"fieldFormatMap": {
"type": "text"
},
"runtimeFieldMap": {
"type": "text"
},
"fields": {
"type": "text"
},
"intervalName": {
"type": "keyword"
},
"notExpandable": {
"type": "boolean"
},
"sourceFilters": {
"type": "text"
},
"timeFieldName": {
"type": "keyword"
},
"title": {
"type": "text"
},
"type": {
"type": "keyword"
},
"typeMeta": {
"type": "keyword"
}
}
},
"kql-telemetry": {
"properties": {
"optInCount": {
"type": "long"
},
"optOutCount": {
"type": "long"
}
}
},
"map": {
"properties": {
"bounds": {
"dynamic": false,
"properties": {}
},
"description": {
"type": "text"
},
"layerListJSON": {
"type": "text"
},
"mapStateJSON": {
"type": "text"
},
"title": {
"type": "text"
},
"uiStateJSON": {
"type": "text"
},
"version": {
"type": "integer"
}
}
},
"migrationVersion": {
"dynamic": "true",
"properties": {
"index-pattern": {
"fields": {
"keyword": {
"ignore_above": 256,
"type": "keyword"
}
},
"type": "text"
}
}
},
"namespace": {
"type": "keyword"
},
"references": {
"type": "nested",
"properties": {
"name": {
"type": "keyword"
},
"type": {
"type": "keyword"
},
"id": {
"type": "keyword"
}
}
},
"search": {
"properties": {
"columns": {
"type": "keyword"
},
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"sort": {
"type": "keyword"
},
"title": {
"type": "text"
},
"version": {
"type": "integer"
}
}
},
"server": {
"properties": {
"uuid": {
"type": "keyword"
}
}
},
"space": {
"properties": {
"_reserved": {
"type": "boolean"
},
"color": {
"type": "keyword"
},
"description": {
"type": "text"
},
"initials": {
"type": "keyword"
},
"disabledFeatures": {
"type": "keyword"
},
"name": {
"fields": {
"keyword": {
"ignore_above": 2048,
"type": "keyword"
}
},
"type": "text"
}
}
},
"telemetry": {
"properties": {
"enabled": {
"type": "boolean"
}
}
},
"timelion-sheet": {
"properties": {
"description": {
"type": "text"
},
"hits": {
"type": "integer"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"timelion_chart_height": {
"type": "integer"
},
"timelion_columns": {
"type": "integer"
},
"timelion_interval": {
"type": "keyword"
},
"timelion_other_interval": {
"type": "keyword"
},
"timelion_rows": {
"type": "integer"
},
"timelion_sheet": {
"type": "text"
},
"title": {
"type": "text"
},
"version": {
"type": "integer"
}
}
},
"type": {
"type": "keyword"
},
"updated_at": {
"type": "date"
},
"url": {
"properties": {
"accessCount": {
"type": "long"
},
"accessDate": {
"type": "date"
},
"createDate": {
"type": "date"
},
"url": {
"fields": {
"keyword": {
"ignore_above": 2048,
"type": "keyword"
}
},
"type": "text"
}
}
},
"visualization": {
"properties": {
"description": {
"type": "text"
},
"kibanaSavedObjectMeta": {
"properties": {
"searchSourceJSON": {
"type": "text"
}
}
},
"savedSearchId": {
"type": "keyword"
},
"title": {
"type": "text"
},
"uiStateJSON": {
"type": "text"
},
"version": {
"type": "integer"
},
"visState": {
"type": "text"
}
}
},
"query": {
"properties": {
"title": {
"type": "text"
},
"description": {
"type": "text"
},
"query": {
"properties": {
"language": {
"type": "keyword"
},
"query": {
"type": "keyword",
"index": false
}
}
},
"filters": {
"type": "object",
"enabled": false
},
"timefilter": {
"type": "object",
"enabled": false
}
}
}
}
},
"settings": {
"index": {
"number_of_replicas": "0",
"number_of_shards": "1"
}
}
}
}

File diff suppressed because one or more lines are too long