github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 17:28:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

[Infra UI] Always pass index patterns as strings. (#29927) (#29952)

Browse source 
* Always pass index patterns as strings.

* Abide by prettier rules.
This commit is contained in:
Sonja Krause-Harder 2019-02-04 15:59:51 +01:00 • committed by GitHub
parent 61fb83a1fb
commit d98a1ebd39
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
x-pack/plugins/infra/server/lib/adapters/fields/adapter_types.ts
View file

@ -7,7 +7,7 @@
import { InfraFrameworkRequest } from '../framework';
export interface FieldsAdapter {
getIndexFields(req: InfraFrameworkRequest, indices: string[]): Promise<IndexFieldDescriptor[]>;
getIndexFields(req: InfraFrameworkRequest, indices: string): Promise<IndexFieldDescriptor[]>;
}
export interface IndexFieldDescriptor {

2
x-pack/plugins/infra/server/lib/adapters/fields/framework_fields_adapter.ts
View file

@ -16,7 +16,7 @@ export class FrameworkFieldsAdapter implements FieldsAdapter {
public async getIndexFields(
request: InfraFrameworkRequest,
indices: string[]
indices: string
): Promise<IndexFieldDescriptor[]> {
const indexPatternsService = this.framework.getIndexPatternsService(request);
const response = await indexPatternsService.getFieldsForWildcard({

7
x-pack/plugins/infra/server/lib/adapters/metrics/kibana_metrics_adapter.ts
View file

@ -29,10 +29,9 @@ export class KibanaMetricsAdapter implements InfraMetricsAdapter {
[InfraNodeType.container]: options.sourceConfiguration.fields.container,
[InfraNodeType.pod]: options.sourceConfiguration.fields.pod,
};
const indexPattern = [
options.sourceConfiguration.metricAlias,
options.sourceConfiguration.logAlias,
];
const indexPattern = `${options.sourceConfiguration.metricAlias},${
options.sourceConfiguration.logAlias
}`;
const timeField = options.sourceConfiguration.fields.timestamp;
const interval = options.timerange.interval;
const nodeField = fields[options.nodeType];

2
x-pack/plugins/infra/server/lib/adapters/nodes/lib/calculate_cardinality.ts
View file

@ -38,7 +38,7 @@ export async function calculateCardinalityOfNodeField(
const resp = await search<CardinalityAggregation>({
body,
index: [sourceConfiguration.logAlias, sourceConfiguration.metricAlias],
index: `${sourceConfiguration.logAlias},${sourceConfiguration.metricAlias}`,
});
if (resp.aggregations) {

4
x-pack/plugins/infra/server/lib/adapters/nodes/lib/create_partition_bodies.ts
View file

@ -27,8 +27,8 @@ export function createPartitionBodies(
const numberOfPartitions: number = Math.ceil(totalNodes / NODE_REQUEST_PARTITION_SIZE);
const indices =
nodeOptions.metric.type === InfraMetricType.logRate
? [sourceConfiguration.logAlias]
: [sourceConfiguration.metricAlias];
? sourceConfiguration.logAlias
: sourceConfiguration.metricAlias;
times(
numberOfPartitions,
(partitionId: number): void => {

10
x-pack/plugins/infra/server/lib/domains/fields_domain.ts
View file

@ -24,10 +24,12 @@ export class InfraFieldsDomain {
const includeMetricIndices = [InfraIndexType.ANY, InfraIndexType.METRICS].includes(indexType);
const includeLogIndices = [InfraIndexType.ANY, InfraIndexType.LOGS].includes(indexType);
const fields = await this.adapter.getIndexFields(request, [
...(includeMetricIndices ? [configuration.metricAlias] : []),
...(includeLogIndices ? [configuration.logAlias] : []),
]);
const fields = await this.adapter.getIndexFields(
request,
`${includeMetricIndices ? configuration.metricAlias : ''},${
includeLogIndices ? configuration.logAlias : ''
}`
);
return fields;
}