Skip to content

Commit

Permalink
changing to show total and not avg
Browse files Browse the repository at this point in the history
  • Loading branch information
cauemarcondes committed Dec 15, 2020
1 parent c2eb190 commit 7903865
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 27 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,13 @@ export function ContainerDetails({ container }: Props) {
});
}

if (container.avgNumberInstances) {
if (container.totalNumberInstances) {
listItems.push({
title: i18n.translate(
'xpack.apm.serviceNameHeader.container.avgNumberInstances',
{ defaultMessage: 'Avg. number of instances' }
'xpack.apm.serviceNameHeader.container.totalNumberInstances',
{ defaultMessage: 'Total number of instances' }
),
description: Math.round(container.avgNumberInstances),
description: Math.round(container.totalNumberInstances),
});
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import {
import { ProcessorEvent } from '../../../common/processor_event';
import { rangeFilter } from '../../../common/utils/range_filter';
import { TransactionRaw } from '../../../typings/es_schemas/raw/transaction_raw';
import { getBucketSize } from '../helpers/get_bucket_size';
import { Setup, SetupTimeRange } from '../helpers/setup_request';

type ServiceMetadataDetailsRaw = Pick<
Expand All @@ -48,7 +47,7 @@ interface ServiceMetadataDetails {
container?: {
os?: string;
isContainerized?: boolean;
avgNumberInstances?: number;
totalNumberInstances?: number;
orchestration?: Orchestration;
};
cloud?: {
Expand All @@ -67,7 +66,6 @@ export async function getServiceMetadataDetails({
setup: Setup & SetupTimeRange;
}): Promise<ServiceMetadataDetails> {
const { start, end, apmEventClient } = setup;
const { intervalString } = getBucketSize({ start, end });

const filter = [
{ term: { [SERVICE_NAME]: serviceName } },
Expand Down Expand Up @@ -112,20 +110,7 @@ export async function getServiceMetadataDetails({
size: 10,
},
},
histogram: {
date_histogram: {
field: '@timestamp',
fixed_interval: intervalString,
min_doc_count: 0,
extended_bounds: { min: start, max: end },
},
aggs: {
total_instances: { cardinality: { field: SERVICE_NODE_NAME } },
},
},
avgNumberInstances: {
avg_bucket: { buckets_path: 'histogram>total_instances' },
},
totalNumberInstances: { cardinality: { field: SERVICE_NODE_NAME } },
},
},
};
Expand All @@ -152,18 +137,18 @@ export async function getServiceMetadataDetails({
agent,
};

const avgNumberInstances =
response.aggregations?.avgNumberInstances.value || undefined;
const totalNumberInstances =
response.aggregations?.totalNumberInstances.value;

const containerDetails =
host || container || avgNumberInstances || kubernetes
host || container || totalNumberInstances || kubernetes
? {
os: host?.os?.platform,
orchestration: (!!kubernetes
? 'Kubernetes'
: 'Docker') as Orchestration,
isContainerized: !!container?.id,
avgNumberInstances,
totalNumberInstances,
}
: undefined;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@ export default function ApiTest({ getService }: FtrProviderContext) {
expectSnapshot(response.body).toMatchInline(`
Object {
"container": Object {
"avgNumberInstances": 1,
"isContainerized": true,
"orchestration": "Kubernetes",
"os": "Linux",
"totalNumberInstances": 1,
},
"service": Object {
"agent": Object {
Expand Down Expand Up @@ -87,10 +87,10 @@ export default function ApiTest({ getService }: FtrProviderContext) {
"provider": "gcp",
},
"container": Object {
"avgNumberInstances": 1,
"isContainerized": true,
"orchestration": "Kubernetes",
"os": "linux",
"totalNumberInstances": 1,
},
"service": Object {
"agent": Object {
Expand Down

0 comments on commit 7903865

Please sign in to comment.