[APM] Migrate tx latency chart and group stats to rollups/service metrics #153162
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,3 +18,10 @@ export const latencyAggregationTypeRt = t.union([ | |
| t.literal(LatencyAggregationType.p95), | ||
| t.literal(LatencyAggregationType.p99), | ||
| ]); | ||
|
|
||
| export const getLatencyAggregationType = ( | ||
| latencyAggregationType: string | null | undefined | ||
| ): LatencyAggregationType => { | ||
| return (latencyAggregationType ?? | ||
| LatencyAggregationType.avg) as LatencyAggregationType; | ||
| }; | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,36 +5,35 @@ | |
| * 2.0. | ||
| */ | ||
|
|
||
| import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui'; | ||
| import { FormattedMessage } from '@kbn/i18n-react'; | ||
| import { formatAlertEvaluationValue } from '@kbn/observability-plugin/public'; | ||
| import { | ||
| ALERT_DURATION, | ||
| ALERT_END, | ||
| ALERT_EVALUATION_THRESHOLD, | ||
| ALERT_EVALUATION_VALUE, | ||
| ALERT_RULE_TYPE_ID, | ||
| ALERT_RULE_UUID, | ||
| } from '@kbn/rule-data-utils'; | ||
| import moment from 'moment'; | ||
| import React, { useEffect, useMemo, useState } from 'react'; | ||
| import { useKibana } from '@kbn/kibana-react-plugin/public'; | ||
| import { SERVICE_ENVIRONMENT } from '../../../../../common/es_fields/apm'; | ||
| import { ChartPointerEventContextProvider } from '../../../../context/chart_pointer_event/chart_pointer_event_context'; | ||
| import { TimeRangeMetadataContextProvider } from '../../../../context/time_range_metadata/time_range_metadata_context'; | ||
| import { useTimeRange } from '../../../../hooks/use_time_range'; | ||
| import { getComparisonChartTheme } from '../../../shared/time_comparison/get_comparison_chart_theme'; | ||
| import FailedTransactionChart from './failed_transaction_chart'; | ||
| import { getAggsTypeFromRule } from './helpers'; | ||
| import { LatencyAlertsHistoryChart } from './latency_alerts_history_chart'; | ||
| import LatencyChart from './latency_chart/latency_chart'; | ||
| import ThroughputChart from './throughput_chart'; | ||
| import { | ||
| AlertDetailsAppSectionProps, | ||
| SERVICE_NAME, | ||
| TRANSACTION_TYPE, | ||
| } from './types'; | ||
|
|
||
| export function AlertDetailsAppSection({ | ||
| rule, | ||
|
|
@@ -133,61 +132,80 @@ export function AlertDetailsAppSection({ | |
| const transactionType = alert.fields[TRANSACTION_TYPE]; | ||
| const comparisonChartTheme = getComparisonChartTheme(); | ||
|
|
||
| const { | ||
| services: { uiSettings }, | ||
| } = useKibana(); | ||
|
|
||
| const historicalRange = useMemo(() => { | ||
| return { | ||
| start: moment().subtract(30, 'days').toISOString(), | ||
| end: moment().toISOString(), | ||
| }; | ||
| }, []); | ||
|
|
||
| return ( | ||
| <EuiFlexGroup direction="column" gutterSize="s"> | ||
| <TimeRangeMetadataContextProvider | ||
| start={start} | ||
| end={end} | ||
| kuery="" | ||
| useSpanName={false} | ||
| uiSettings={uiSettings!} | ||
| > | ||
| <ChartPointerEventContextProvider> | ||
| <EuiFlexItem> | ||
| <LatencyChart | ||
| alert={alert} | ||
| transactionType={transactionType} | ||
| serviceName={serviceName} | ||
| environment={environment} | ||
| start={start} | ||
| end={end} | ||
| comparisonChartTheme={comparisonChartTheme} | ||
| timeZone={timeZone} | ||
| latencyAggregationType={latencyAggregationType} | ||
| comparisonEnabled={comparisonEnabled} | ||
| offset={offset} | ||
| setLatencyMaxY={setLatencyMaxY} | ||
| /> | ||
| <EuiFlexGroup direction="row" gutterSize="s"> | ||
| <ThroughputChart | ||
| transactionType={transactionType} | ||
| serviceName={serviceName} | ||
| environment={environment} | ||
| start={start} | ||
| end={end} | ||
| comparisonChartTheme={comparisonChartTheme} | ||
| comparisonEnabled={comparisonEnabled} | ||
| latencyMaxY={latencyMaxY} | ||
| offset={offset} | ||
| timeZone={timeZone} | ||
| /> | ||
| <FailedTransactionChart | ||
| transactionType={transactionType} | ||
| serviceName={serviceName} | ||
| environment={environment} | ||
| start={start} | ||
| end={end} | ||
| comparisonChartTheme={comparisonChartTheme} | ||
| timeZone={timeZone} | ||
| /> | ||
| </EuiFlexGroup> | ||
| </EuiFlexItem> | ||
| <EuiFlexItem grow={false}> | ||
| <LatencyAlertsHistoryChart | ||
| ruleId={alert.fields[ALERT_RULE_UUID]} | ||
| serviceName={serviceName} | ||
| start={historicalRange.start} | ||
| end={historicalRange.end} | ||
|
There was a problem hiding this comment. Is this fix related to this this PR and the move to service transaction metrics? There was a problem hiding this comment. it's a cosmetic change, it doesn't change the behaviour of the component. |
||
| transactionType={transactionType} | ||
| latencyAggregationType={latencyAggregationType} | ||
| environment={environment} | ||
| timeZone={timeZone} | ||
| /> | ||
| </EuiFlexItem> | ||
| </ChartPointerEventContextProvider> | ||
| </TimeRangeMetadataContextProvider> | ||
| </EuiFlexGroup> | ||
| ); | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,29 +5,34 @@ | |
| * 2.0. | ||
| */ | ||
|
|
||
| import { | ||
| AnnotationDomainType, | ||
| LineAnnotation, | ||
| Position, | ||
| } from '@elastic/charts'; | ||
| import { | ||
| EuiBadge, | ||
| EuiFlexGroup, | ||
| EuiFlexItem, | ||
| EuiIcon, | ||
| EuiPanel, | ||
| EuiSpacer, | ||
| EuiText, | ||
| EuiTitle, | ||
| } from '@elastic/eui'; | ||
| import { i18n } from '@kbn/i18n'; | ||
| import { convertTo } from '@kbn/observability-plugin/public'; | ||
| import moment from 'moment'; | ||
| import React, { useMemo } from 'react'; | ||
| import { ApmDocumentType } from '../../../../../common/document_type'; | ||
| import { LatencyAggregationType } from '../../../../../common/latency_aggregation_types'; | ||
| import { getDurationFormatter } from '../../../../../common/utils/formatters'; | ||
| import { useFetcher } from '../../../../hooks/use_fetcher'; | ||
| import { useFetchTriggeredAlertsHistory } from '../../../../hooks/use_fetch_triggered_alert_history'; | ||
| import { usePreferredDataSourceAndBucketSize } from '../../../../hooks/use_preferred_data_source_and_bucket_size'; | ||
| import { getLatencyChartSelector } from '../../../../selectors/latency_chart_selectors'; | ||
| import { filterNil } from '../../../shared/charts/latency_chart'; | ||
| import { TimeseriesChart } from '../../../shared/charts/timeseries_chart'; | ||
| import { | ||
| getMaxY, | ||
| getResponseTimeTickFormatter, | ||
|
|
@@ -54,14 +59,23 @@ export function LatencyAlertsHistoryChart({ | |
| timeZone, | ||
| ruleId, | ||
| }: LatencyAlertsHistoryChartProps) { | ||
| const preferred = usePreferredDataSourceAndBucketSize({ | ||
| start, | ||
| end, | ||
| kuery: '', | ||
| numBuckets: 100, | ||
| type: ApmDocumentType.ServiceTransactionMetric, | ||
| }); | ||
|
|
||
| const { data, status } = useFetcher( | ||
| (callApmApi) => { | ||
| if ( | ||
| serviceName && | ||
| start && | ||
| end && | ||
| transactionType && | ||
| latencyAggregationType && | ||
| preferred | ||
| ) { | ||
| return callApmApi( | ||
| `GET /internal/apm/services/{serviceName}/transactions/charts/latency`, | ||
|
|
@@ -71,11 +85,14 @@ export function LatencyAlertsHistoryChart({ | |
| query: { | ||
| environment, | ||
| kuery: '', | ||
| start, | ||
| end, | ||
| transactionType, | ||
| transactionName: undefined, | ||
| latencyAggregationType, | ||
| bucketSizeInSeconds: preferred.bucketSizeInSeconds, | ||
| documentType: preferred.source.documentType, | ||
| rollupInterval: preferred.source.rollupInterval, | ||
| }, | ||
| }, | ||
| } | ||
|
|
@@ -89,6 +106,7 @@ export function LatencyAlertsHistoryChart({ | |
| serviceName, | ||
| start, | ||
| transactionType, | ||
| preferred, | ||
| ] | ||
| ); | ||
| const memoizedData = useMemo( | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -30,6 +30,8 @@ import { AlertActiveRect } from './alert_active_rect'; | |
| import { AlertAnnotation } from './alert_annotation'; | ||
| import { AlertThresholdAnnotation } from './alert_threshold_annotation'; | ||
| import { AlertThresholdRect } from './alert_threshold_rect'; | ||
| import { ApmDocumentType } from '../../../../../../common/document_type'; | ||
| import { usePreferredDataSourceAndBucketSize } from '../../../../../hooks/use_preferred_data_source_and_bucket_size'; | ||
|
|
||
| function LatencyChart({ | ||
| alert, | ||
|
|
@@ -58,14 +60,23 @@ function LatencyChart({ | |
| timeZone: string; | ||
| setLatencyMaxY: React.Dispatch<React.SetStateAction<number>>; | ||
| }) { | ||
| const preferred = usePreferredDataSourceAndBucketSize({ | ||
| start, | ||
| end, | ||
| kuery: '', | ||
| numBuckets: 100, | ||
| type: ApmDocumentType.ServiceTransactionMetric, | ||
| }); | ||
|
|
||
| const { data, status } = useFetcher( | ||
| (callApmApi) => { | ||
| if ( | ||
| serviceName && | ||
| start && | ||
| end && | ||
| transactionType && | ||
| latencyAggregationType && | ||
| preferred | ||
| ) { | ||
| return callApmApi( | ||
| `GET /internal/apm/services/{serviceName}/transactions/charts/latency`, | ||
|
|
@@ -80,6 +91,9 @@ function LatencyChart({ | |
| transactionType, | ||
| transactionName: undefined, | ||
| latencyAggregationType, | ||
| documentType: preferred.source.documentType, | ||
| rollupInterval: preferred.source.rollupInterval, | ||
| bucketSizeInSeconds: preferred.bucketSizeInSeconds, | ||
| }, | ||
| }, | ||
| } | ||
|
|
@@ -93,6 +107,7 @@ function LatencyChart({ | |
| serviceName, | ||
| start, | ||
| transactionType, | ||
| preferred, | ||
| ] | ||
| ); | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -76,7 +76,7 @@ export function DependencyDetailOperationsList() { | |
| }); | ||
|
|
||
| const { searchServiceDestinationMetrics } = | ||
| useSearchServiceDestinationMetrics({ start, end, kuery }); | ||
|
|
||
| const primaryStatsFetch = useFetcher( | ||
| (callApmApi) => { | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this intended?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, no need for it to be required.