Skip to content

Commit d950d8e

Browse files
kibanamachinekibanamachine
authored
Merge branch 'main' into eui-71.0.0
2 parents 6c73e40 + cbcc675 commit d950d8e

576 files changed

Lines changed: 3810 additions & 11715 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -497,20 +497,15 @@
497497
/x-pack/plugins/security_solution/public/common/components/navigation @elastic/security-threat-hunting-explore
498498
/x-pack/plugins/security_solution/public/common/components/news_feed @elastic/security-threat-hunting-explore
499499
/x-pack/plugins/security_solution/public/common/components/overview_description_list @elastic/security-threat-hunting-explore
500-
/x-pack/plugins/security_solution/public/common/components/paginated_table @elastic/security-threat-hunting-explore
501500
/x-pack/plugins/security_solution/public/common/components/sidebar_header @elastic/security-threat-hunting-explore
502-
/x-pack/plugins/security_solution/public/common/components/stat_items @elastic/security-threat-hunting-explore
503501
/x-pack/plugins/security_solution/public/common/components/tables @elastic/security-threat-hunting-explore
504502
/x-pack/plugins/security_solution/public/common/components/top_n @elastic/security-threat-hunting-explore
505503
/x-pack/plugins/security_solution/public/common/components/with_hover_actions @elastic/security-threat-hunting-explore
506-
/x-pack/plugins/security_solution/public/common/containers/hosts_risk @elastic/security-threat-hunting-explore
507504
/x-pack/plugins/security_solution/public/common/containers/matrix_histogram @elastic/security-threat-hunting-explore
508505
/x-pack/plugins/security_solution/public/common/lib/cell_actions @elastic/security-threat-hunting-explore
509506
/x-pack/plugins/security_solution/public/cases @elastic/security-threat-hunting-explore
510-
/x-pack/plugins/security_solution/public/hosts @elastic/security-threat-hunting-explore
511-
/x-pack/plugins/security_solution/public/network @elastic/security-threat-hunting-explore
507+
/x-pack/plugins/security_solution/public/explore @elastic/security-threat-hunting-explore
512508
/x-pack/plugins/security_solution/public/overview @elastic/security-threat-hunting-explore
513-
/x-pack/plugins/security_solution/public/users @elastic/security-threat-hunting-explore
514509

515510
/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts @elastic/security-threat-hunting-explore
516511
/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/matrix_histogram @elastic/security-threat-hunting-explore

‎nav-kibana-dev.docnav.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,9 @@
175175
{
176176
"label": "Contributors Newsletters",
177177
"items": [
178+
{
179+
"id": "kibNovember2022ContributorNewsletter"
180+
},
178181
{
179182
"id": "kibOctober2022ContributorNewsletter"
180183
},

‎packages/kbn-doc-links/src/get_doc_links.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -488,6 +488,7 @@ export const getDocLinks = ({ kibanaBranch }: GetDocLinkOptions): DocLinks => {
488488
setupPrerequisites: `${KIBANA_DOCS}alerting-setup.html#alerting-prerequisites`,
489489
slackAction: `${KIBANA_DOCS}slack-action-type.html#configuring-slack`,
490490
teamsAction: `${KIBANA_DOCS}teams-action-type.html#configuring-teams`,
491+
connectors: `${KIBANA_DOCS}action-types.html`,
491492
},
492493
maps: {
493494
guide: `${KIBANA_DOCS}maps.html`,

‎src/plugins/discover/public/application/doc/single_doc_route.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,8 @@ export const SingleDocRoute = () => {
8484
error={
8585
new Error(
8686
i18n.translate('discover.discoverError.missingIdParamError', {
87-
defaultMessage: 'URL query string is missing id.',
87+
defaultMessage:
88+
'No document ID provided. Return to Discover to select another document.',
8889
})
8990
)
9091
}

‎src/plugins/discover/public/components/common/error_alert.tsx‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,7 @@ export const DiscoverError = ({ error }: { error: Error }) => {
3434
body={<p>{error.message}</p>}
3535
actions={
3636
<EuiButton color="primary" fill onClick={goToMain}>
37-
<FormattedMessage
38-
id="discover.goToDiscoverMainViewButtonText"
39-
defaultMessage="Go to Discover main view"
40-
/>
37+
<FormattedMessage id="discover.goToDiscoverButtonText" defaultMessage="Go to Discover" />
4138
</EuiButton>
4239
}
4340
/>

‎x-pack/plugins/apm/common/critical_path/get_critical_path.test.ts‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,18 @@ import { getCriticalPath } from './get_critical_path';
1212

1313
describe('getCriticalPath', () => {
1414
function getCriticalPathFromEvents(events: ApmFields[]) {
15-
const waterfall = getWaterfall(
16-
{
15+
const entryTransaction = dedot(events[0]!, {}) as Transaction;
16+
const waterfall = getWaterfall({
17+
traceItems: {
1718
traceDocs: events.map(
1819
(event) => dedot(event, {}) as Transaction | Span
1920
),
2021
errorDocs: [],
2122
exceedsMax: false,
22-
linkedChildrenOfSpanCountBySpanId: {},
23+
spanLinksCountById: {},
2324
},
24-
events[0]['transaction.id']!
25-
);
25+
entryTransaction,
26+
});
2627

2728
return {
2829
waterfall,

‎x-pack/plugins/apm/common/es_fields/__snapshots__/es_fields.test.ts.snap‎

Lines changed: 51 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎x-pack/plugins/apm/common/es_fields/apm.ts‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* 2.0; you may not use this file except in compliance with the Elastic License
55
* 2.0.
66
*/
7-
7+
export const TIMESTAMP = 'timestamp.us';
88
export const AGENT = 'agent';
99
export const AGENT_NAME = 'agent.name';
1010
export const AGENT_VERSION = 'agent.version';
@@ -81,6 +81,13 @@ export const SPAN_LINKS = 'span.links';
8181
export const SPAN_LINKS_TRACE_ID = 'span.links.trace.id';
8282
export const SPAN_LINKS_SPAN_ID = 'span.links.span.id';
8383

84+
export const SPAN_COMPOSITE_COUNT = 'span.composite.count';
85+
export const SPAN_COMPOSITE_SUM = 'span.composite.sum.us';
86+
export const SPAN_COMPOSITE_COMPRESSION_STRATEGY =
87+
'span.composite.compression_strategy';
88+
89+
export const SPAN_SYNC = 'span.sync';
90+
8491
// Parent ID for a transaction or span
8592
export const PARENT_ID = 'parent.id';
8693

@@ -89,6 +96,7 @@ export const ERROR_GROUP_ID = 'error.grouping_key';
8996
export const ERROR_CULPRIT = 'error.culprit';
9097
export const ERROR_LOG_LEVEL = 'error.log.level';
9198
export const ERROR_LOG_MESSAGE = 'error.log.message';
99+
export const ERROR_EXCEPTION = 'error.exception';
92100
export const ERROR_EXC_MESSAGE = 'error.exception.message'; // only to be used in es queries, since error.exception is now an array
93101
export const ERROR_EXC_HANDLED = 'error.exception.handled'; // only to be used in es queries, since error.exception is now an array
94102
export const ERROR_EXC_TYPE = 'error.exception.type';
@@ -151,3 +159,5 @@ export const INDEX = '_index';
151159
// Mobile
152160
export const NETWORK_CONNECTION_TYPE = 'network.connection.type';
153161
export const DEVICE_MODEL_NAME = 'device.model.name';
162+
163+
export const CHILD_ID = 'child.id';

‎x-pack/plugins/apm/common/waterfall/typings.ts‎

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
/*
2+
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
3+
* or more contributor license agreements. Licensed under the Elastic License
4+
* 2.0; you may not use this file except in compliance with the Elastic License
5+
* 2.0.
6+
*/
7+
8+
import { Exception } from '../../typings/es_schemas/raw/error_raw';
9+
import { EventOutcome } from '../../typings/es_schemas/raw/fields/event_outcome';
10+
import { SpanLink } from '../../typings/es_schemas/raw/fields/span_links';
11+
import { TimestampUs } from '../../typings/es_schemas/raw/fields/timestamp_us';
12+
import { AgentName } from '../../typings/es_schemas/ui/fields/agent';
13+
14+
export interface WaterfallTransaction {
15+
timestamp: TimestampUs;
16+
trace: { id: string };
17+
service: {
18+
name: string;
19+
environment?: string;
20+
};
21+
agent: { name: AgentName };
22+
event?: { outcome?: EventOutcome };
23+
parent?: { id?: string };
24+
processor: { event: 'transaction' };
25+
transaction: {
26+
duration: { us: number };
27+
id: string;
28+
name: string;
29+
type: string;
30+
result?: string;
31+
};
32+
faas?: {
33+
coldstart?: boolean;
34+
};
35+
span?: {
36+
links?: SpanLink[];
37+
};
38+
}
39+
40+
export interface WaterfallSpan {
41+
timestamp: TimestampUs;
42+
trace: { id: string };
43+
service: {
44+
name: string;
45+
environment?: string;
46+
};
47+
agent: { name: AgentName };
48+
event?: { outcome?: EventOutcome };
49+
parent?: { id?: string };
50+
processor: { event: 'span' };
51+
span: {
52+
id: string;
53+
type: string;
54+
subtype?: string;
55+
action?: string;
56+
name: string;
57+
composite?: {
58+
count: number;
59+
sum: { us: number };
60+
compression_strategy: string;
61+
};
62+
sync?: boolean;
63+
duration: { us: number };
64+
links?: SpanLink[];
65+
};
66+
transaction?: {
67+
id: string;
68+
};
69+
child?: { id: string[] };
70+
}
71+
72+
export interface WaterfallError {
73+
timestamp: TimestampUs;
74+
trace?: { id: string };
75+
transaction?: { id: string };
76+
parent?: { id: string };
77+
error: {
78+
id: string;
79+
log?: {
80+
message: string;
81+
};
82+
exception?: Exception[];
83+
grouping_key: string;
84+
};
85+
service: {
86+
name: string;
87+
};
88+
}

‎x-pack/plugins/apm/public/components/app/transaction_details/distribution/index.test.tsx‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ describe('transaction_details/distribution', () => {
7878
describe('TransactionDistribution', () => {
7979
it('shows loading indicator when the service is running and returned no results yet', async () => {
8080
jest.spyOn(useFetcherModule, 'useFetcher').mockImplementation(() => ({
81-
data: {},
81+
data: undefined,
8282
refetch: () => {},
8383
status: useFetcherModule.FETCH_STATUS.LOADING,
8484
}));
@@ -104,11 +104,21 @@ describe('transaction_details/distribution', () => {
104104
});
105105

106106
it("doesn't show loading indicator when the service isn't running", async () => {
107-
jest.spyOn(useFetcherModule, 'useFetcher').mockImplementation(() => ({
108-
data: { percentileThresholdValue: 1234, overallHistogram: [] },
109-
refetch: () => {},
110-
status: useFetcherModule.FETCH_STATUS.SUCCESS,
111-
}));
107+
jest
108+
.spyOn(useFetcherModule, 'useFetcher')
109+
.mockImplementationOnce(() => ({
110+
data: {
111+
traceItems: {},
112+
entryTransaction: {},
113+
},
114+
refetch: () => {},
115+
status: useFetcherModule.FETCH_STATUS.SUCCESS,
116+
}))
117+
.mockImplementationOnce(() => ({
118+
data: { percentileThresholdValue: 1234, overallHistogram: [] },
119+
refetch: () => {},
120+
status: useFetcherModule.FETCH_STATUS.SUCCESS,
121+
}));
112122

113123
render(
114124
<Wrapper>

0 commit comments

Comments
 (0)