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

Jump to bottom

[Backport 2.x] Service map updates #2254

Merged
merged 1 commit into from
Nov 12, 2024
Merged

[Backport 2.x] Service map updates #2254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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,178 changes: 837 additions & 341 deletions public/components/application_analytics/__tests__/__snapshots__/create.test.tsx.snap
View file
Open in desktop

Large diffs are not rendered by default.

570 changes: 402 additions & 168 deletions public/components/application_analytics/__tests__/__snapshots__/service_config.test.tsx.snap
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 8 additions & 4 deletions public/components/trace_analytics/components/common/helper_functions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,8 +184,12 @@
const percent = (value - ticks[0]) / (ticks[ticks.length - 1] - ticks[0]);
const color = getServiceMapScaleColor(percent, idSelected);
styleOptions = {
borderWidth: 0,
color: relatedServices!.indexOf(service) >= 0 ? `rgba(${color}, 1)` : `rgba(${color}, 0.2)`,
borderWidth: 3,
color: {
border: '#4A4A4A',
background:
relatedServices!.indexOf(service) >= 0 ? `rgba(${color}, 1)` : `rgba(${color}, 0.2)`,
},
font: {
color:
relatedServices!.indexOf(service) >= 0
Expand All @@ -195,10 +199,10 @@
};
} else {
styleOptions = {
borderWidth: 1.0,
borderWidth: 3,
chosen: false,
color: {
border: '#DADADC',
border: '#4A4A4A',
background: '#FFFFFF',
},
};
Expand Down Expand Up @@ -325,7 +329,7 @@
percentileMaps: Array<{ traceGroupName: string; durationFilter: { gte?: number; lte?: number } }>,
conditionString: string // >= 95th, < 95th
): FilterType => {
const DSL: any = {

Check warning on line 332 in public/components/trace_analytics/components/common/helper_functions.tsx

View workflow job for this annotation

GitHub Actions / Lint 

Unexpected any. Specify a different type
query: {
bool: {
must: [],
Expand Down Expand Up @@ -370,12 +374,12 @@
mode: TraceAnalyticsMode,
filters: FilterType[],
query: string,
startTime: any,

Check warning on line 377 in public/components/trace_analytics/components/common/helper_functions.tsx

View workflow job for this annotation

GitHub Actions / Lint 

Unexpected any. Specify a different type
endTime: any,

Check warning on line 378 in public/components/trace_analytics/components/common/helper_functions.tsx

View workflow job for this annotation

GitHub Actions / Lint 

Unexpected any. Specify a different type
page?: string,
appConfigs: FilterType[] = []
) => {
const DSL: any = {

Check warning on line 382 in public/components/trace_analytics/components/common/helper_functions.tsx

View workflow job for this annotation

GitHub Actions / Lint 

Unexpected any. Specify a different type
query: {
bool: {
must: [],
Expand Down
101 changes: 84 additions & 17 deletions ...trace_analytics/components/common/plots/__tests__/__snapshots__/service_map.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ exports[`Service map component renders service map 1`] = `
buttonSize="s"
color="text"
idSelected="latency"
legend="Select metric for service map display"
onChange={[Function]}
options={
Array [
Expand All @@ -34,25 +35,70 @@ exports[`Service map component renders service map 1`] = `
<EuiHorizontalRule
margin="m"
/>
<EuiFlexGroup
justifyContent="spaceBetween"
>
<EuiFlexGroup>
<EuiFlexItem
grow={7}
>
<EuiCompressedFieldSearch
compressed={true}
fullWidth={false}
incremental={false}
isClearable={true}
isInvalid={false}
isLoading={false}
onChange={[Function]}
onSearch={[Function]}
placeholder="Service name"
prepend="Focus on"
value=""
/>
<EuiPopover
anchorPosition="downLeft"
button={
<EuiFieldSearch
append={
<EuiButtonIcon
iconType="refresh"
onClick={[Function]}
size="s"
/>
}
aria-controls="service-select-dropdown"
compressed={true}
fullWidth={false}
incremental={false}
isClearable={true}
isInvalid={false}
isLoading={false}
onChange={[Function]}
onClick={[Function]}
placeholder="Service name"
prepend="Focus on"
value=""
/>
}
closePopover={[Function]}
display="inlineBlock"
hasArrow={true}
id="service-select-dropdown"
isOpen={false}
ownFocus={false}
panelPaddingSize="none"
repositionOnScroll={true}
>
<EuiSelectable
isPreFiltered={false}
listProps={
Object {
"bordered": true,
"style": Object {
"width": "300px",
},
}
}
onChange={[Function]}
options={Array []}
searchProps={
Object {
"autoFocus": true,
"isClearable": true,
"onInput": [Function],
"value": "",
}
}
searchable={true}
singleSelection={true}
>
<Component />
</EuiSelectable>
</EuiPopover>
</EuiFlexItem>
</EuiFlexGroup>
<EuiSpacer />
Expand All @@ -67,7 +113,28 @@ exports[`Service map component renders service map 1`] = `
"position": "relative",
}
}
/>
>
<div
style={
Object {
"alignItems": "center",
"backgroundColor": "rgba(255, 255, 255, 0.8)",
"bottom": 0,
"display": "flex",
"justifyContent": "center",
"left": 0,
"position": "absolute",
"right": 0,
"top": 0,
"zIndex": 1000,
}
}
>
<EuiLoadingSpinner
size="xl"
/>
</div>
</div>
</EuiFlexItem>
<EuiFlexItem
grow={false}
Expand Down
Loading
Loading