Skip to content
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

Jump to bottom

11495 5.x #11527

Merged
merged 3 commits into from
May 4, 2017
Merged

11495 5.x #11527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b672dc8
Set UTC timezone and default index pattern AFTER wiping .kibana
Apr 28, 2017
3fb6402
Merge branch '5.x' into 11495-5.x
Apr 28, 2017
ed932fa
Merge branch '5.x' into 11495-5.x
May 1, 2017
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
6 changes: 6 additions & 0 deletions test/functional/apps/context/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ export default function ({ getService, getPageObjects, loadTestFile }) {
const remote = getService('remote');
const esArchiver = getService('esArchiver');
const PageObjects = getPageObjects(['common']);
const kibanaServer = getService('kibanaServer');

describe('context app', function () {
this.timeout(config.get('timeouts.test'));
Expand All @@ -11,6 +12,11 @@ export default function ({ getService, getPageObjects, loadTestFile }) {
await remote.setWindowSize(1200,800);
await esArchiver.loadIfNeeded('logstash_functional');
await esArchiver.load('visualize');
await kibanaServer.uiSettings.replace({
'dateFormat:tz':'UTC',
'defaultIndex':'logstash-*'
});

await PageObjects.common.navigateToApp('discover');
});

Expand Down
10 changes: 5 additions & 5 deletions test/functional/apps/discover/_collapse_expand.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ export default function ({ getService, getPageObjects }) {
const toTime = '2015-09-23 18:31:44.000';

// delete .kibana index and update configDoc
return kibanaServer.uiSettings.replace({
'dateFormat:tz':'UTC',
'defaultIndex':'logstash-*'
})
return esArchiver.load('discover')
.then(function loadkibanaIndexPattern() {
log.debug('load kibana index with default index pattern');
return esArchiver.load('discover');
return kibanaServer.uiSettings.replace({
'dateFormat:tz':'UTC',
'defaultIndex':'logstash-*'
});
})
// and load a set of makelogs data
.then(function loadIfEmptyMakelogs() {
Expand Down
6 changes: 3 additions & 3 deletions test/functional/apps/discover/_discover.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ export default function ({ getService, getPageObjects }) {

before(async function () {
// delete .kibana index and update configDoc
await esArchiver.load('discover');

log.debug('load kibana index with default index pattern');
await kibanaServer.uiSettings.replace({
'dateFormat:tz':'UTC',
'defaultIndex':'logstash-*'
});

log.debug('load kibana index with default index pattern');
await esArchiver.load('discover');

// and load a set of makelogs data
await esArchiver.loadIfNeeded('logstash_functional');
log.debug('discover');
Expand Down
10 changes: 5 additions & 5 deletions test/functional/apps/discover/_field_data.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ export default function ({ getService, getPageObjects }) {
const toTime = '2015-09-23 18:31:44.000';

// delete .kibana index and update configDoc
return kibanaServer.uiSettings.replace({
'dateFormat:tz': 'UTC',
'defaultIndex': 'logstash-*'
})
return esArchiver.load('discover')
.then(function loadkibanaIndexPattern() {
log.debug('load kibana index with default index pattern');
return esArchiver.load('discover');
return kibanaServer.uiSettings.replace({
'dateFormat:tz': 'UTC',
'defaultIndex': 'logstash-*'
});
})
// and load a set of makelogs data
.then(function loadIfEmptyMakelogs() {
Expand Down
10 changes: 5 additions & 5 deletions test/functional/apps/discover/_shared_links.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ export default function ({ getService, getPageObjects }) {
const toTime = '2015-09-23 18:31:44.000';

// delete .kibana index and update configDoc
return kibanaServer.uiSettings.replace({
'dateFormat:tz': 'UTC',
'defaultIndex': 'logstash-*'
})
return esArchiver.load('discover')
.then(function loadkibanaIndexPattern() {
log.debug('load kibana index with default index pattern');
return esArchiver.load('discover');
return kibanaServer.uiSettings.replace({
'dateFormat:tz': 'UTC',
'defaultIndex': 'logstash-*'
});
})
// and load a set of makelogs data
.then(function loadIfEmptyMakelogs() {
Expand Down
10 changes: 5 additions & 5 deletions test/functional/apps/discover/_source_filters.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ export default function ({ getService, getPageObjects }) {
const toTime = '2015-09-23 18:31:44.000';

// delete .kibana index and update configDoc
return kibanaServer.uiSettings.replace({
'dateFormat:tz': 'UTC',
'defaultIndex':'logstash-*'
})
return esArchiver.load('visualize_source-filters')
.then(function loadkibanaIndexPattern() {
log.debug('load kibana index with default index pattern');
return esArchiver.load('visualize_source-filters');
return kibanaServer.uiSettings.replace({
'dateFormat:tz': 'UTC',
'defaultIndex':'logstash-*'
});
})
// and load a set of makelogs data
.then(function loadIfEmptyMakelogs() {
Expand Down
8 changes: 4 additions & 4 deletions test/functional/apps/visualize/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ export default function ({ getService, loadTestFile }) {

log.debug('Starting visualize before method');
const logstash = esArchiver.loadIfNeeded('logstash_functional');
// delete .kibana index and update configDoc
return kibanaServer.uiSettings.replace({ 'dateFormat:tz':'UTC', 'defaultIndex':'logstash-*' })
log.debug('load .kibana index with visualize test data');
return esArchiver.load('visualize')
.then(function loadkibanaIndexPattern() {
log.debug('load kibana index with default index pattern');
return esArchiver.load('visualize');
log.debug('make sure UTC timezone and default index pattern are set in .kibana');
return kibanaServer.uiSettings.replace({ 'dateFormat:tz':'UTC', 'defaultIndex':'logstash-*' });
})
// wait for the logstash data load to finish if it hasn't already
.then(function () {
Expand Down
6 changes: 3 additions & 3 deletions test/functional/page_objects/dashboard_page.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ export function DashboardPageProvider({ getService, getPageObjects }) {
class DashboardPage {
async initTests() {
const logstash = esArchiver.loadIfNeeded('logstash_functional');

log.debug('load kibana index with visualizations');
await esArchiver.load('dashboard');
await kibanaServer.uiSettings.replace({
'dateFormat:tz':'UTC',
'defaultIndex':'logstash-*'
});

log.debug('load kibana index with visualizations');
await esArchiver.load('dashboard');

await PageObjects.common.navigateToApp('dashboard');
return logstash;
}
Expand Down