-
Notifications
You must be signed in to change notification settings - Fork 8.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into 164995-add-log-explorer-app-locator
- Loading branch information
Showing
86 changed files
with
1,734 additions
and
730 deletions.
There are no files selected for viewing
Validating CODEOWNERS rules …
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
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
7 changes: 4 additions & 3 deletions
7
...lugins/profiling/common/functions.test.ts → ...-profiling-utils/common/functions.test.ts
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
29 changes: 29 additions & 0 deletions
29
x-pack/plugins/apm/common/utils/to_kuery_filter_format.test.ts
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 |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License | ||
| * 2.0; you may not use this file except in compliance with the Elastic License | ||
| * 2.0. | ||
| */ | ||
| import { toKueryFilterFormat } from './to_kuery_filter_format'; | ||
|
|
||
| describe('toKueryFilterFormat', () => { | ||
| it('returns a single value', () => { | ||
| expect(toKueryFilterFormat('key', ['foo'])).toEqual(`key : "foo"`); | ||
| }); | ||
|
|
||
| it('returns multiple values default separator', () => { | ||
| expect(toKueryFilterFormat('key', ['foo', 'bar', 'baz'])).toEqual( | ||
| `key : "foo" OR key : "bar" OR key : "baz"` | ||
| ); | ||
| }); | ||
|
|
||
| it('returns multiple values custom separator', () => { | ||
| expect(toKueryFilterFormat('key', ['foo', 'bar', 'baz'], 'AND')).toEqual( | ||
| `key : "foo" AND key : "bar" AND key : "baz"` | ||
| ); | ||
| }); | ||
|
|
||
| it('return empty string when no hostname', () => { | ||
| expect(toKueryFilterFormat('key', [])).toEqual(''); | ||
| }); | ||
| }); |
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
48 changes: 48 additions & 0 deletions
48
x-pack/plugins/apm/public/components/app/profiling_overview/host_names_filter_warning.tsx
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 |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License | ||
| * 2.0; you may not use this file except in compliance with the Elastic License | ||
| * 2.0. | ||
| */ | ||
|
|
||
| import { | ||
| EuiFlexGroup, | ||
| EuiFlexItem, | ||
| EuiIcon, | ||
| EuiText, | ||
| EuiToolTip, | ||
| } from '@elastic/eui'; | ||
| import { i18n } from '@kbn/i18n'; | ||
| import React from 'react'; | ||
|
|
||
| interface Props { | ||
| hostNames?: string[]; | ||
| } | ||
| export function HostnamesFilterWarning({ hostNames = [] }: Props) { | ||
| function renderTooltipOptions() { | ||
| return ( | ||
| <ul> | ||
| {hostNames.map((hostName) => ( | ||
| <li key={hostName}>{`- ${hostName}`}</li> | ||
| ))} | ||
| </ul> | ||
| ); | ||
| } | ||
|
|
||
| return ( | ||
| <EuiFlexGroup gutterSize="none"> | ||
| <EuiFlexItem grow={false}> | ||
| <EuiText size="xs" color="subdued"> | ||
| {i18n.translate('xpack.apm.profiling.flamegraph.filteredLabel', { | ||
| defaultMessage: 'Displaying items from specific host names', | ||
| })} | ||
| </EuiText> | ||
| </EuiFlexItem> | ||
| <EuiFlexItem grow={false}> | ||
| <EuiToolTip content={renderTooltipOptions()}> | ||
| <EuiIcon type="questionInCircle" /> | ||
| </EuiToolTip> | ||
| </EuiFlexItem> | ||
| </EuiFlexGroup> | ||
| ); | ||
| } |
Oops, something went wrong.