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

[Metrics UI] Remove APM Hard Dependency #64952

Merged
merged 3 commits into from
May 5, 2020
Merged

[Metrics UI] Remove APM Hard Dependency #64952

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
e4cd3dd
[Metrics UI] Remove APM Hard Dependency
simianhacker Apr 30, 2020
69825e8
removing unused variable
simianhacker Apr 30, 2020
3c7e63c
Merge branch 'master' into issue-64345-remove-apm-dependency
elasticmachine May 4, 2020
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
1 change: 0 additions & 1 deletion x-pack/plugins/infra/kibana.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"kibanaVersion": "kibana",
"requiredPlugins": [
"features",
"apm",
"usageCollection",
"spaces",
"home",
Expand Down
6 changes: 1 addition & 5 deletions x-pack/plugins/infra/server/routes/metadata/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import {
import { InfraBackendLibs } from '../../lib/infra_types';
import { getMetricMetadata } from './lib/get_metric_metadata';
import { pickFeatureName } from './lib/pick_feature_name';
import { hasAPMData } from './lib/has_apm_data';
import { getCloudMetricsMetadata } from './lib/get_cloud_metric_metadata';
import { getNodeInfo } from './lib/get_node_info';
import { throwErrors } from '../../../common/runtime_types';
Expand Down Expand Up @@ -74,16 +73,13 @@ export const initMetadataRoute = (libs: InfraBackendLibs) => {
const cloudMetricsFeatures = pickFeatureName(cloudMetricsMetadata.buckets).map(
nameToFeature('metrics')
);
const hasAPM = await hasAPMData(framework, requestContext, configuration, nodeId, nodeType);
const apmMetricFeatures = hasAPM ? [{ name: 'apm.transaction', source: 'apm' }] : [];

const id = metricsMetadata.id;
const name = metricsMetadata.name || id;
return response.ok({
body: InfraMetadataRT.encode({
id,
name,
features: [...metricFeatures, ...cloudMetricsFeatures, ...apmMetricFeatures],
features: [...metricFeatures, ...cloudMetricsFeatures],
info,
}),
});
Expand Down
54 changes: 0 additions & 54 deletions x-pack/plugins/infra/server/routes/metadata/lib/has_apm_data.ts
View file
Open in desktop

This file was deleted.

41 changes: 0 additions & 41 deletions x-pack/test/api_integration/apis/infra/metadata.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,6 @@ const timeRange800withAws = {
to: DATES[`8.0.0`].logs_and_metrics_with_aws.max,
};

const timeRange800 = {
from: DATES['8.0.0'].logs_and_metrics.min,
to: DATES[`8.0.0`].logs_and_metrics.max,
};

export default function({ getService }: FtrProviderContext) {
const esArchiver = getService('esArchiver');
const supertest = getService('supertest');
Expand Down Expand Up @@ -269,42 +264,6 @@ export default function({ getService }: FtrProviderContext) {
}
});
});
describe('APM metrics', () => {
const archiveName = 'infra/8.0.0/metrics_and_apm';
before(() => esArchiver.load(archiveName));
after(() => esArchiver.unload(archiveName));

it('host without APM data', async () => {
const metadata = await fetchMetadata({
sourceId: 'default',
nodeId: 'gke-observability-8--observability-8--bc1afd95-f0zc',
nodeType: 'host',
timeRange: timeRange800,
});
if (metadata) {
expect(
metadata.features.some(f => f.name === 'apm.transaction' && f.source === 'apm')
).to.be(false);
} else {
throw new Error('Metadata should never be empty');
}
});
it('pod with APM data', async () => {
const metadata = await fetchMetadata({
sourceId: 'default',
nodeId: 'c1031331-9ae0-11e9-9a96-42010a84004d',
nodeType: 'pod',
timeRange: timeRange800,
});
if (metadata) {
expect(
metadata.features.some(f => f.name === 'apm.transaction' && f.source === 'apm')
).to.be(true);
} else {
throw new Error('Metadata should never be empty');
}
});
});
});
});
}