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.

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

Re-enable _mb suffixed stack monitoring func tests #98354

Merged
10 changes: 6 additions & 4 deletions x-pack/test/functional/apps/monitoring/_get_lifecycle_methods.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,15 @@
export const getLifecycleMethods = (getService, getPageObjects) => {
const esArchiver = getService('esArchiver');
const security = getService('security');
const PageObjects = getPageObjects(['monitoring', 'timePicker', 'security']);
const PageObjects = getPageObjects(['monitoring', 'timePicker', 'security', 'common']);
let _archive;

return {
async setup(archive, { from, to, useSuperUser = false }) {
_archive = archive;
if (!useSuperUser) {
await security.testUser.setRoles(['monitoring_user', 'kibana_admin']);
}

const kibanaServer = getService('kibanaServer');
const browser = getService('browser');
Expand All @@ -24,7 +27,7 @@ export const getLifecycleMethods = (getService, getPageObjects) => {
await esArchiver.load(archive);
await kibanaServer.uiSettings.replace({});

await PageObjects.monitoring.navigateTo(useSuperUser);
await PageObjects.common.navigateToApp('monitoring');

// pause autorefresh in the time filter because we don't wait any ticks,
// and we don't want ES to log a warning when data gets wiped out
Expand All @@ -34,8 +37,7 @@ export const getLifecycleMethods = (getService, getPageObjects) => {
},

async tearDown() {
await PageObjects.security.forceLogout();
await security.user.delete('basic_monitoring_user');
await security.testUser.restoreDefaults();
return esArchiver.unload(_archive);
},
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export default function ({ getService, getPageObjects }) {
before(async () => {
const browser = getService('browser');
await browser.setWindowSize(1600, 1000);
await PageObjects.monitoring.navigateTo(true);
await PageObjects.common.navigateToApp('monitoring');
await noData.isOnNoDataPage();
});

Expand Down
23 changes: 10 additions & 13 deletions x-pack/test/functional/apps/monitoring/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,41 +8,38 @@
export default function ({ loadTestFile }) {
describe('Monitoring app', function () {
this.tags('ciGroup1');

loadTestFile(require.resolve('./feature_controls'));

loadTestFile(require.resolve('./cluster/list'));
loadTestFile(require.resolve('./cluster/overview'));
// loadTestFile(require.resolve('./cluster/license'));

// NOTE: All _mb tests skipped because of various failures: https://github.com/elastic/kibana/issues/98239

loadTestFile(require.resolve('./elasticsearch/overview'));
// loadTestFile(require.resolve('./elasticsearch/overview_mb'));
loadTestFile(require.resolve('./elasticsearch/overview_mb'));
loadTestFile(require.resolve('./elasticsearch/nodes'));
// loadTestFile(require.resolve('./elasticsearch/nodes_mb'));
loadTestFile(require.resolve('./elasticsearch/nodes_mb'));
loadTestFile(require.resolve('./elasticsearch/node_detail'));
// loadTestFile(require.resolve('./elasticsearch/node_detail_mb'));
loadTestFile(require.resolve('./elasticsearch/node_detail_mb'));
loadTestFile(require.resolve('./elasticsearch/indices'));
// loadTestFile(require.resolve('./elasticsearch/indices_mb'));
loadTestFile(require.resolve('./elasticsearch/indices_mb'));
loadTestFile(require.resolve('./elasticsearch/index_detail'));
// loadTestFile(require.resolve('./elasticsearch/index_detail_mb'));
loadTestFile(require.resolve('./elasticsearch/index_detail_mb'));
loadTestFile(require.resolve('./elasticsearch/shards'));
// loadTestFile(require.resolve('./elasticsearch/shard_activity'));

loadTestFile(require.resolve('./kibana/overview'));
// loadTestFile(require.resolve('./kibana/overview_mb'));
loadTestFile(require.resolve('./kibana/overview_mb'));
loadTestFile(require.resolve('./kibana/instances'));
// loadTestFile(require.resolve('./kibana/instances_mb'));
loadTestFile(require.resolve('./kibana/instances_mb'));
loadTestFile(require.resolve('./kibana/instance'));
// loadTestFile(require.resolve('./kibana/instance_mb'));
loadTestFile(require.resolve('./kibana/instance_mb'));

// loadTestFile(require.resolve('./logstash/overview'));
// loadTestFile(require.resolve('./logstash/nodes'));
// loadTestFile(require.resolve('./logstash/node'));

loadTestFile(require.resolve('./logstash/pipelines'));
// loadTestFile(require.resolve('./logstash/pipelines_mb'));
loadTestFile(require.resolve('./logstash/pipelines_mb'));

loadTestFile(require.resolve('./beats/cluster'));
loadTestFile(require.resolve('./beats/overview'));
Expand All @@ -53,6 +50,6 @@ export default function ({ loadTestFile }) {
loadTestFile(require.resolve('./enable_monitoring'));

loadTestFile(require.resolve('./setup/metricbeat_migration'));
// loadTestFile(require.resolve('./setup/metricbeat_migration_mb'));
loadTestFile(require.resolve('./setup/metricbeat_migration_mb'));
});
}
17 changes: 0 additions & 17 deletions x-pack/test/functional/page_objects/monitoring_page.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,7 @@ import { FtrProviderContext } from '../ftr_provider_context';
export function MonitoringPageProvider({ getPageObjects, getService }: FtrProviderContext) {
const PageObjects = getPageObjects(['common', 'header', 'security', 'login']);
const testSubjects = getService('testSubjects');
const security = getService('security');

return new (class MonitoringPage {
async navigateTo(useSuperUser = false) {
// always create this because our tear down tries to delete it
await security.user.create('basic_monitoring_user', {
password: 'monitoring_user_password',
roles: ['monitoring_user', 'kibana_admin'],
full_name: 'basic monitoring',
});

if (!useSuperUser) {
await PageObjects.security.forceLogout();
await PageObjects.login.login('basic_monitoring_user', 'monitoring_user_password');
}
await PageObjects.common.navigateToApp('monitoring');
}

async getAccessDeniedMessage() {
return testSubjects.getVisibleText('accessDeniedTitle');
}
Expand Down