maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[Metrics UI] Fix EC2 Query to only include aws.ec2 nodes (#78236)

Browse source 
* [Metrics UI] Fix EC2 Query to only include aws.ec2 nodes

* Making the filter more generic so we can apply it easily to any inventory model
This commit is contained in:
Chris Cowan 2020-09-23 16:32:24 -07:00 committed by GitHub
parent 8ea5c575eb
commit ca27ec8385
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
x-pack/plugins/infra/common/inventory_models/aws_ec2/index.ts
View file

@ -31,4 +31,5 @@ export const awsEC2: InventoryModel = {
},
requiredMetrics: ['awsEC2CpuUtilization', 'awsEC2NetworkTraffic', 'awsEC2DiskIOBytes'],
tooltipMetrics: ['cpu', 'rx', 'tx'],
nodeFilter: [{ term: { 'event.dataset': 'aws.ec2' } }],
};

1
x-pack/plugins/infra/common/inventory_models/types.ts
View file

@ -371,4 +371,5 @@ export interface InventoryModel {
metrics: InventoryMetrics;
requiredMetrics: InventoryMetric[];
tooltipMetrics: SnapshotMetricType[];
nodeFilter?: object[];
}

7
x-pack/plugins/infra/server/routes/snapshot/lib/transform_request_to_metrics_api_request.ts
View file

@ -4,7 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/
import { findInventoryFields } from '../../../../common/inventory_models';
import { findInventoryFields, findInventoryModel } from '../../../../common/inventory_models';
import { MetricsAPIRequest, SnapshotRequest } from '../../../../common/http_api';
import { ESSearchClient } from '../../../lib/metrics/types';
import { InfraSource } from '../../../lib/sources';
@ -52,6 +52,11 @@ export const transformRequestToMetricsAPIRequest = async (
filters.push({ term: { 'cloud.region': snapshotRequest.region } });
}
const inventoryModel = findInventoryModel(snapshotRequest.nodeType);
if (inventoryModel && inventoryModel.nodeFilter) {
inventoryModel.nodeFilter?.forEach((f) => filters.push(f));
}
const inventoryFields = findInventoryFields(
snapshotRequest.nodeType,
source.configuration.fields