mirror of
https://github.com/elastic/kibana.git
synced 2025-04-24 01:38:56 -04:00
Backports the following commits to 6.7: - [ftr/defaultTimezone] make UTC the default timezone (#30460)
This commit is contained in:
parent
7043705f0d
commit
deae7357cf
25 changed files with 11 additions and 33 deletions
|
@ -30,7 +30,7 @@ export default function ({ getService, getPageObjects, loadTestFile }) {
|
|||
await browser.setWindowSize(1200, 800);
|
||||
await esArchiver.loadIfNeeded('logstash_functional');
|
||||
await esArchiver.load('visualize');
|
||||
await kibanaServer.uiSettings.replace({ 'dateFormat:tz': 'UTC', 'defaultIndex': 'logstash-*' });
|
||||
await kibanaServer.uiSettings.replace({ 'defaultIndex': 'logstash-*' });
|
||||
await PageObjects.common.navigateToApp('discover');
|
||||
});
|
||||
|
||||
|
|
|
@ -28,7 +28,6 @@ export default function ({ getService, getPageObjects }) {
|
|||
const filterBar = getService('filterBar');
|
||||
const PageObjects = getPageObjects(['common', 'discover', 'header', 'visualize']);
|
||||
const defaultSettings = {
|
||||
'dateFormat:tz': 'UTC',
|
||||
defaultIndex: 'logstash-*',
|
||||
};
|
||||
|
||||
|
|
|
@ -35,7 +35,6 @@ export default function ({ getService, getPageObjects }) {
|
|||
await esArchiver.load('discover');
|
||||
// delete .kibana index and update configDoc
|
||||
await kibanaServer.uiSettings.replace({
|
||||
'dateFormat:tz': 'UTC',
|
||||
'defaultIndex': 'logstash-*'
|
||||
});
|
||||
|
||||
|
|
|
@ -40,7 +40,6 @@ export default function ({ getService, getPageObjects }) {
|
|||
await esArchiver.load('discover');
|
||||
// delete .kibana index and update configDoc
|
||||
await kibanaServer.uiSettings.replace({
|
||||
'dateFormat:tz': 'UTC',
|
||||
'defaultIndex': 'logstash-*'
|
||||
});
|
||||
|
||||
|
|
|
@ -42,7 +42,6 @@ export default function ({ getService, getPageObjects }) {
|
|||
|
||||
// delete .kibana index and update configDoc
|
||||
await kibanaServer.uiSettings.replace({
|
||||
'dateFormat:tz': 'UTC',
|
||||
defaultIndex: 'logstash-*',
|
||||
});
|
||||
|
||||
|
|
|
@ -32,7 +32,6 @@ export default function ({ getService, getPageObjects }) {
|
|||
|
||||
// delete .kibana index and update configDoc
|
||||
await kibanaServer.uiSettings.replace({
|
||||
'dateFormat:tz': 'UTC',
|
||||
defaultIndex: 'logstash-*',
|
||||
});
|
||||
|
||||
|
|
|
@ -32,7 +32,6 @@ export default function ({ getService, getPageObjects }) {
|
|||
|
||||
// delete .kibana index and update configDoc
|
||||
await kibanaServer.uiSettings.replace({
|
||||
'dateFormat:tz': 'UTC',
|
||||
defaultIndex: 'logstash-*',
|
||||
});
|
||||
|
||||
|
|
|
@ -46,11 +46,11 @@ export default function ({ getService, getPageObjects }) {
|
|||
before(async function () {
|
||||
await browser.setWindowSize(1200, 800);
|
||||
// delete .kibana index and then wait for Kibana to re-create it
|
||||
await kibanaServer.uiSettings.replace({ 'dateFormat:tz': 'UTC' });
|
||||
await kibanaServer.uiSettings.replace({});
|
||||
await PageObjects.settings.navigateTo();
|
||||
await PageObjects.settings.clickKibanaIndices();
|
||||
await PageObjects.settings.createIndexPattern();
|
||||
await kibanaServer.uiSettings.update({ 'dateFormat:tz': 'UTC' });
|
||||
await kibanaServer.uiSettings.update({});
|
||||
});
|
||||
|
||||
after(async function afterAll() {
|
||||
|
|
|
@ -31,12 +31,11 @@ export default function ({ getService, getPageObjects }) {
|
|||
|
||||
beforeEach(async function () {
|
||||
await browser.setWindowSize(1200, 800);
|
||||
// delete .kibana index and then wait for Kibana to re-create it
|
||||
await kibanaServer.uiSettings.replace({ 'dateFormat:tz': 'UTC' });
|
||||
await kibanaServer.uiSettings.replace({});
|
||||
await PageObjects.settings.navigateTo();
|
||||
await PageObjects.settings.clickKibanaIndices();
|
||||
await PageObjects.settings.createIndexPattern();
|
||||
await kibanaServer.uiSettings.update({ 'dateFormat:tz': 'UTC' });
|
||||
await kibanaServer.uiSettings.update({});
|
||||
});
|
||||
|
||||
const scriptedExpressionFieldName = 'ram_expr1';
|
||||
|
|
|
@ -20,7 +20,6 @@
|
|||
import expect from 'expect.js';
|
||||
|
||||
export default function ({ getService, getPageObjects }) {
|
||||
const kibanaServer = getService('kibanaServer');
|
||||
const browser = getService('browser');
|
||||
const PageObjects = getPageObjects(['settings']);
|
||||
const SCRIPTED_FIELD_NAME = 'myScriptedField';
|
||||
|
@ -28,12 +27,9 @@ export default function ({ getService, getPageObjects }) {
|
|||
describe('scripted fields preview', () => {
|
||||
before(async function () {
|
||||
await browser.setWindowSize(1200, 800);
|
||||
// delete .kibana index and then wait for Kibana to re-create it
|
||||
await kibanaServer.uiSettings.replace({ 'dateFormat:tz': 'UTC' });
|
||||
await PageObjects.settings.navigateTo();
|
||||
await PageObjects.settings.clickKibanaIndices();
|
||||
await PageObjects.settings.createIndexPattern();
|
||||
await kibanaServer.uiSettings.update({ 'dateFormat:tz': 'UTC' });
|
||||
|
||||
await PageObjects.settings.navigateTo();
|
||||
await PageObjects.settings.clickKibanaIndices();
|
||||
|
|
|
@ -30,7 +30,7 @@ export default function ({ getService, loadTestFile }) {
|
|||
log.debug('Starting timelion before method');
|
||||
browser.setWindowSize(1280, 800);
|
||||
await esArchiver.loadIfNeeded('logstash_functional');
|
||||
await kibanaServer.uiSettings.replace({ 'dateFormat:tz': 'UTC', 'defaultIndex': 'logstash-*' });
|
||||
await kibanaServer.uiSettings.replace({ 'defaultIndex': 'logstash-*' });
|
||||
});
|
||||
|
||||
loadTestFile(require.resolve('./_expression_typeahead'));
|
||||
|
|
|
@ -30,7 +30,7 @@ export default function ({ getService, loadTestFile }) {
|
|||
browser.setWindowSize(1280, 800);
|
||||
await esArchiver.loadIfNeeded('logstash_functional');
|
||||
await esArchiver.load('visualize');
|
||||
await kibanaServer.uiSettings.replace({ 'dateFormat:tz': 'UTC', 'defaultIndex': 'logstash-*' });
|
||||
await kibanaServer.uiSettings.replace({ 'defaultIndex': 'logstash-*' });
|
||||
});
|
||||
|
||||
describe('', function () {
|
||||
|
|
|
@ -137,6 +137,7 @@ export default async function ({ readConfigFile }) {
|
|||
uiSettings: {
|
||||
defaults: {
|
||||
'accessibility:disableAnimations': true,
|
||||
'dateFormat:tz': 'UTC',
|
||||
'telemetry:optIn': false
|
||||
},
|
||||
},
|
||||
|
|
|
@ -107,7 +107,6 @@ export function CommonPageProvider({ getService, getPageObjects }) {
|
|||
log.debug(' >>>>>>>> WARNING Navigating to [' + appName + '] with defaultIndex=' + defaultIndex);
|
||||
log.debug(' >>>>>>>> Setting defaultIndex to "logstash-*""');
|
||||
return kibanaServer.uiSettings.update({
|
||||
'dateFormat:tz': 'UTC',
|
||||
'defaultIndex': 'logstash-*',
|
||||
});
|
||||
}
|
||||
|
|
|
@ -52,7 +52,6 @@ export function DashboardPageProvider({ getService, getPageObjects }) {
|
|||
]);
|
||||
|
||||
await kibanaServer.uiSettings.replace({
|
||||
'dateFormat:tz': 'UTC',
|
||||
'defaultIndex': defaultIndex,
|
||||
});
|
||||
await this.selectDefaultIndex(defaultIndex);
|
||||
|
|
|
@ -28,7 +28,6 @@ export function TimelionPageProvider({ getService, getPageObjects }) {
|
|||
class TimelionPage {
|
||||
async initTests() {
|
||||
await kibanaServer.uiSettings.replace({
|
||||
'dateFormat:tz': 'UTC',
|
||||
'defaultIndex': 'logstash-*'
|
||||
});
|
||||
|
||||
|
|
|
@ -34,7 +34,6 @@ export default function ({ getService, getPageObjects }) {
|
|||
await esArchiver.loadIfNeeded('logstash_functional');
|
||||
await esArchiver.load('dashboard_view_mode');
|
||||
await kibanaServer.uiSettings.replace({
|
||||
'dateFormat:tz': 'UTC',
|
||||
'defaultIndex': 'logstash-*'
|
||||
});
|
||||
await kibanaServer.uiSettings.disableToastAutohide();
|
||||
|
|
|
@ -12,7 +12,6 @@ export default function ({ getService, getPageObjects }) {
|
|||
const log = getService('log');
|
||||
const esArchiver = getService('esArchiver');
|
||||
const browser = getService('browser');
|
||||
const kibanaServer = getService('kibanaServer');
|
||||
const retry = getService('retry');
|
||||
|
||||
|
||||
|
@ -24,7 +23,6 @@ export default function ({ getService, getPageObjects }) {
|
|||
await esArchiver.load('empty_kibana');
|
||||
log.debug('create secrepo index pattern');
|
||||
await PageObjects.settings.createIndexPattern('secrepo', '@timestamp');
|
||||
await kibanaServer.uiSettings.replace({ 'dateFormat:tz': 'UTC' });
|
||||
log.debug('navigateTo graph');
|
||||
await PageObjects.common.navigateToApp('graph');
|
||||
});
|
||||
|
|
|
@ -17,7 +17,6 @@ export default function ({ loadTestFile, getService }) {
|
|||
await esArchiver.load('maps/data');
|
||||
await esArchiver.load('maps/kibana');
|
||||
await kibanaServer.uiSettings.replace({
|
||||
'dateFormat:tz': 'UTC',
|
||||
'defaultIndex': 'logstash-*'
|
||||
});
|
||||
await kibanaServer.uiSettings.disableToastAutohide();
|
||||
|
|
|
@ -21,9 +21,7 @@ export const getLifecycleMethods = (getService, getPageObjects) => {
|
|||
await browser.setWindowSize(1600, 1000);
|
||||
|
||||
await esArchiver.load(archive);
|
||||
await kibanaServer.uiSettings.replace({
|
||||
'dateFormat:tz': 'UTC',
|
||||
});
|
||||
await kibanaServer.uiSettings.replace({});
|
||||
|
||||
await PageObjects.monitoring.navigateTo();
|
||||
await noData.isOnNoDataPage();
|
||||
|
|
|
@ -23,7 +23,6 @@ export default function ({ getService, getPageObjects }) {
|
|||
// await PageObjects.security.login('elastic', 'changeme');
|
||||
await PageObjects.security.initTests();
|
||||
await kibanaServer.uiSettings.update({
|
||||
'dateFormat:tz': 'UTC',
|
||||
'defaultIndex': 'logstash-*'
|
||||
});
|
||||
await PageObjects.settings.navigateTo();
|
||||
|
|
|
@ -21,7 +21,7 @@ export default function ({ getService, getPageObjects }) {
|
|||
await esArchiver.loadIfNeeded('logstash_functional');
|
||||
log.debug('load kibana index with default index pattern');
|
||||
await esArchiver.load('discover');
|
||||
await kibanaServer.uiSettings.replace({ 'dateFormat:tz': 'UTC', 'defaultIndex': 'logstash-*' });
|
||||
await kibanaServer.uiSettings.replace({ 'defaultIndex': 'logstash-*' });
|
||||
await PageObjects.settings.navigateTo();
|
||||
await PageObjects.security.clickElasticsearchRoles();
|
||||
await PageObjects.security.addRole('rbac_all', {
|
||||
|
|
|
@ -25,7 +25,7 @@ export default function ({ getService, getPageObjects }) {
|
|||
await esArchiver.loadIfNeeded('logstash_functional');
|
||||
log.debug('load kibana index with default index pattern');
|
||||
await esArchiver.load('discover');
|
||||
await kibanaServer.uiSettings.replace({ 'dateFormat:tz': 'UTC', 'defaultIndex': 'logstash-*' });
|
||||
await kibanaServer.uiSettings.replace({ 'defaultIndex': 'logstash-*' });
|
||||
await PageObjects.settings.navigateTo();
|
||||
});
|
||||
|
||||
|
|
|
@ -24,7 +24,6 @@ export function ReportingPageProvider({ getService, getPageObjects }) {
|
|||
await esArchiver.loadIfNeeded('../../functional/es_archives/logstash_functional');
|
||||
await esArchiver.load('historic');
|
||||
await kibanaServer.uiSettings.replace({
|
||||
'dateFormat:tz': 'UTC',
|
||||
'defaultIndex': 'logstash-*'
|
||||
});
|
||||
|
||||
|
|
|
@ -18,7 +18,6 @@ export default function ({ loadTestFile, getService }) {
|
|||
await esArchiver.load(OSS_DATA_ARCHIVE_PATH);
|
||||
|
||||
await kibanaServer.uiSettings.update({
|
||||
'dateFormat:tz': 'UTC',
|
||||
'defaultIndex': '0bf35f60-3dc9-11e8-8660-4d65aa086b3c'
|
||||
});
|
||||
});
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue