Skip to content

Commit

Permalink
[8.x] Migrate /custom_dashboards to be deployment agnostic (#199295) (
Browse files Browse the repository at this point in the history
#199661)

# Backport

This will backport the following commits from `main` to `8.x`:
- [Migrate `/custom_dashboards` to be deployment agnostic
(#199295)](#199295)

<!--- Backport version: 8.9.8 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Milosz
Marcinkowski","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-11-08T17:40:55Z","message":"Migrate
`/custom_dashboards` to be deployment agnostic (#199295)\n\ncloses
#198964 \r\ncloses #198966\r\npart of
https://github.com/elastic/kibana/issues/193245\r\n\r\n### How to
test\r\n\r\n- Serverless\r\n\r\n```\r\nnode
scripts/functional_tests_server --config
x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.serverless.config.ts\r\nnode
scripts/functional_test_runner --config
x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.serverless.config.ts
--grep=\"APM\"\r\n```\r\n\r\n- Stateful\r\n```\r\nnode
scripts/functional_tests_server --config
x-pack/test/api_integration/deployment_agnostic/configs/stateful/oblt.stateful.config.ts\r\nnode
scripts/functional_test_runner --config
x-pack/test/api_integration/deployment_agnostic/configs/stateful/oblt.stateful.config.ts
--grep=\"APM\"\r\n```\r\n\r\n- MKI\r\n\r\ntested
against\r\n[MKI](https://github.com/crespocarlos/kibana/blob/main/x-pack/test_serverless/README.md#run-tests-on-mki)","sha":"a9475259368c992ac3761eb3b20fd52e6ed1c1d8","branchLabelMapping":{"^v9.0.0$":"main","^v8.17.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","v9.0.0","apm","backport:prev-minor","ci:project-deploy-observability","Team:obs-ux-infra_services"],"number":199295,"url":"https://github.com/elastic/kibana/pull/199295","mergeCommit":{"message":"Migrate
`/custom_dashboards` to be deployment agnostic (#199295)\n\ncloses
#198964 \r\ncloses #198966\r\npart of
https://github.com/elastic/kibana/issues/193245\r\n\r\n### How to
test\r\n\r\n- Serverless\r\n\r\n```\r\nnode
scripts/functional_tests_server --config
x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.serverless.config.ts\r\nnode
scripts/functional_test_runner --config
x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.serverless.config.ts
--grep=\"APM\"\r\n```\r\n\r\n- Stateful\r\n```\r\nnode
scripts/functional_tests_server --config
x-pack/test/api_integration/deployment_agnostic/configs/stateful/oblt.stateful.config.ts\r\nnode
scripts/functional_test_runner --config
x-pack/test/api_integration/deployment_agnostic/configs/stateful/oblt.stateful.config.ts
--grep=\"APM\"\r\n```\r\n\r\n- MKI\r\n\r\ntested
against\r\n[MKI](https://github.com/crespocarlos/kibana/blob/main/x-pack/test_serverless/README.md#run-tests-on-mki)","sha":"a9475259368c992ac3761eb3b20fd52e6ed1c1d8"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","labelRegex":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/199295","number":199295,"mergeCommit":{"message":"Migrate
`/custom_dashboards` to be deployment agnostic (#199295)\n\ncloses
#198964 \r\ncloses #198966\r\npart of
https://github.com/elastic/kibana/issues/193245\r\n\r\n### How to
test\r\n\r\n- Serverless\r\n\r\n```\r\nnode
scripts/functional_tests_server --config
x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.serverless.config.ts\r\nnode
scripts/functional_test_runner --config
x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.serverless.config.ts
--grep=\"APM\"\r\n```\r\n\r\n- Stateful\r\n```\r\nnode
scripts/functional_tests_server --config
x-pack/test/api_integration/deployment_agnostic/configs/stateful/oblt.stateful.config.ts\r\nnode
scripts/functional_test_runner --config
x-pack/test/api_integration/deployment_agnostic/configs/stateful/oblt.stateful.config.ts
--grep=\"APM\"\r\n```\r\n\r\n- MKI\r\n\r\ntested
against\r\n[MKI](https://github.com/crespocarlos/kibana/blob/main/x-pack/test_serverless/README.md#run-tests-on-mki)","sha":"a9475259368c992ac3761eb3b20fd52e6ed1c1d8"}}]}]
BACKPORT-->
  • Loading branch information
miloszmarcinkowski authored Nov 11, 2024
1 parent 3b033b4 commit f75f8ba
Show file tree
Hide file tree
Showing 19 changed files with 897 additions and 895 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
* 2.0.
*/

import { ApmApiClient } from '../../common/config';
import { ApmApiProvider } from '../../../../services/apm_api';

export type ApmApiClient = ReturnType<typeof ApmApiProvider>;

export async function getServiceDashboardApi(
apmApiClient: ApmApiClient,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,193 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/
import expect from '@kbn/expect';
import { apm, timerange } from '@kbn/apm-synthtrace-client';

import type { ApmSynthtraceEsClient } from '@kbn/apm-synthtrace';
import type { DeploymentAgnosticFtrProviderContext } from '../../../../ftr_provider_context';
import {
getServiceDashboardApi,
getLinkServiceDashboardApi,
deleteAllServiceDashboard,
} from './api_helper';

export default function ApiTest({ getService }: DeploymentAgnosticFtrProviderContext) {
const apmApiClient = getService('apmApi');
const synthtrace = getService('synthtrace');

const start = '2023-08-22T00:00:00.000Z';
const end = '2023-08-22T00:15:00.000Z';

describe('Service dashboards', () => {
describe('when data is not loaded', () => {
it('handles empty state', async () => {
const response = await getServiceDashboardApi(apmApiClient, 'synth-go', start, end);
expect(response.status).to.be(200);
expect(response.body.serviceDashboards).to.eql([]);
});
});

describe('when data is loaded', () => {
const range = timerange(new Date(start).getTime(), new Date(end).getTime());
let apmSynthtraceEsClient: ApmSynthtraceEsClient;

const goInstance = apm
.service({
name: 'synth-go',
environment: 'production',
agentName: 'go',
})
.instance('go-instance');

const javaInstance = apm
.service({
name: 'synth-java',
environment: 'production',
agentName: 'java',
})
.instance('java-instance');

before(async () => {
apmSynthtraceEsClient = await synthtrace.createApmSynthtraceEsClient();

return apmSynthtraceEsClient.index([
range
.interval('1s')
.rate(4)
.generator((timestamp) =>
goInstance
.transaction({ transactionName: 'GET /api' })
.timestamp(timestamp)
.duration(1000)
.success()
),
range
.interval('1s')
.rate(4)
.generator((timestamp) =>
javaInstance
.transaction({ transactionName: 'GET /api' })
.timestamp(timestamp)
.duration(1000)
.success()
),
]);
});

after(() => {
return apmSynthtraceEsClient.clean();
});

afterEach(async () => {
await deleteAllServiceDashboard(apmApiClient, 'synth-go', start, end);
});

describe('and when data is not loaded', () => {
it('creates a new service dashboard', async () => {
const serviceDashboard = {
dashboardSavedObjectId: 'dashboard-saved-object-id',
serviceFiltersEnabled: true,
kuery: 'service.name: synth-go',
};
const createResponse = await getLinkServiceDashboardApi({
apmApiClient,
...serviceDashboard,
});
expect(createResponse.status).to.be(200);
expect(createResponse.body).to.have.property('id');
expect(createResponse.body).to.have.property('updatedAt');

expect(createResponse.body).to.have.property(
'dashboardSavedObjectId',
serviceDashboard.dashboardSavedObjectId
);
expect(createResponse.body).to.have.property('kuery', serviceDashboard.kuery);
expect(createResponse.body).to.have.property(
'serviceEnvironmentFilterEnabled',
serviceDashboard.serviceFiltersEnabled
);
expect(createResponse.body).to.have.property(
'serviceNameFilterEnabled',
serviceDashboard.serviceFiltersEnabled
);

const dasboardForGoService = await getServiceDashboardApi(
apmApiClient,
'synth-go',
start,
end
);
const dashboardForJavaService = await getServiceDashboardApi(
apmApiClient,
'synth-java',
start,
end
);
expect(dashboardForJavaService.body.serviceDashboards.length).to.be(0);
expect(dasboardForGoService.body.serviceDashboards.length).to.be(1);
});

it('updates the existing linked service dashboard', async () => {
const serviceDashboard = {
dashboardSavedObjectId: 'dashboard-saved-object-id',
serviceFiltersEnabled: true,
kuery: 'service.name: synth-go or agent.name: java',
};

await getLinkServiceDashboardApi({
apmApiClient,
...serviceDashboard,
});

const dasboardForGoService = await getServiceDashboardApi(
apmApiClient,
'synth-go',
start,
end
);

const updateResponse = await getLinkServiceDashboardApi({
apmApiClient,
customDashboardId: dasboardForGoService.body.serviceDashboards[0].id,
...serviceDashboard,
serviceFiltersEnabled: true,
});

expect(updateResponse.status).to.be(200);

const updateddasboardForGoService = await getServiceDashboardApi(
apmApiClient,
'synth-go',
start,
end
);
expect(updateddasboardForGoService.body.serviceDashboards.length).to.be(1);
expect(updateddasboardForGoService.body.serviceDashboards[0]).to.have.property(
'serviceEnvironmentFilterEnabled',
true
);
expect(updateddasboardForGoService.body.serviceDashboards[0]).to.have.property(
'serviceNameFilterEnabled',
true
);
expect(updateddasboardForGoService.body.serviceDashboards[0]).to.have.property(
'kuery',
'service.name: synth-go or agent.name: java'
);

const dashboardForJavaService = await getServiceDashboardApi(
apmApiClient,
'synth-java',
start,
end
);
expect(dashboardForJavaService.body.serviceDashboards.length).to.be(1);
});
});
});
});
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/

import { DeploymentAgnosticFtrProviderContext } from '../../../../ftr_provider_context';

export default function ({ loadTestFile }: DeploymentAgnosticFtrProviderContext) {
describe('custom_dashboards', () => {
loadTestFile(require.resolve('./custom_dashboards.spec.ts'));
});
}
Loading

0 comments on commit f75f8ba

Please sign in to comment.