Skip to content

Commit d0eafd1

Browse files
Merge branch 'main' into add-groq-icon
2 parents 09d4323 + ed166b5 commit d0eafd1

42 files changed

Lines changed: 409 additions & 79 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.

‎oas_docs/output/kibana.yaml‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77107,6 +77107,9 @@ paths:
7710777107
required: true
7710877108
schema:
7710977109
type: string
77110+
responses:
77111+
'200':
77112+
description: OK
7711077113
summary: Delete a monitor
7711177114
tags:
7711277115
- synthetics
@@ -77278,6 +77281,9 @@ paths:
7727877281
- $ref: '#/components/schemas/Synthetics_tcpMonitorFields'
7727977282
type: object
7728077283
required: true
77284+
responses:
77285+
'200':
77286+
description: OK
7728177287
summary: Update a monitor
7728277288
tags:
7728377289
- synthetics
@@ -77448,11 +77454,11 @@ paths:
7744877454
- content: Kibana
7744977455
name: product_name
7745077456
/api/synthetics/params/_bulk_delete:
77451-
delete:
77457+
post:
7745277458
description: |
7745377459
**Spaces method and path for this operation:**
7745477460

77455-
<div><span class="operation-verb delete">delete</span>&nbsp;<span class="operation-path">/s/{space_id}/api/synthetics/params/_bulk_delete</span></div>
77461+
<div><span class="operation-verb post">post</span>&nbsp;<span class="operation-path">/s/{space_id}/api/synthetics/params/_bulk_delete</span></div>
7745677462

7745777463
Refer to [Spaces](https://www.elastic.co/docs/deploy-manage/manage-spaces) for more information.
7745877464

@@ -77529,6 +77535,9 @@ paths:
7752977535
required: true
7753077536
schema:
7753177537
type: string
77538+
responses:
77539+
'200':
77540+
description: OK
7753277541
summary: Delete a parameter
7753377542
tags:
7753477543
- synthetics
@@ -77830,6 +77839,9 @@ paths:
7783077839
maxLength: 1024
7783177840
minLength: 1
7783277841
type: string
77842+
responses:
77843+
'200':
77844+
description: OK
7783377845
summary: Delete a private location
7783477846
tags:
7783577847
- synthetics
@@ -103915,6 +103927,8 @@ components:
103915103927
type: string
103916103928
synthetics_args:
103917103929
description: Synthetics agent CLI arguments.
103930+
items:
103931+
type: string
103918103932
type: array
103919103933
type:
103920103934
description: The monitor type.
@@ -104073,7 +104087,7 @@ components:
104073104087
Synthetics_httpMonitorFields:
104074104088
allOf:
104075104089
- $ref: '#/components/schemas/Synthetics_commonMonitorFields'
104076-
- additionalproperties: true
104090+
- additionalProperties: true
104077104091
type: object
104078104092
properties:
104079104093
check:
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"./oas_docs/output/kibana.yaml": 1249,
2+
"./oas_docs/output/kibana.yaml": 1244,
33
"./oas_docs/output/kibana.serverless.yaml": 1137
44
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
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 { css } from '@emotion/react';
9+
10+
export const codeblockStyles = css`
11+
word-break: break-word;
12+
`;

‎x-pack/platform/plugins/shared/onechat/public/application/components/conversations/conversation_rounds/round_thinking/steps/error_result_step.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import type { ErrorResult } from '@kbn/onechat-common/tools/tool_result';
1010
import React from 'react';
1111
import { i18n } from '@kbn/i18n';
1212
import { css } from '@emotion/react';
13+
import { codeblockStyles } from './codeblock.styles';
1314

1415
const labels = {
1516
title: i18n.translate('xpack.onechat.round.thinking.steps.errorResultStep.title', {
@@ -35,7 +36,7 @@ export const ErrorResultStep: React.FC<ErrorResultStepProps> = ({ result: { data
3536
</EuiText>
3637
</EuiSplitPanel.Inner>
3738
<EuiSplitPanel.Inner paddingSize="none">
38-
<EuiCodeBlock isCopyable paddingSize="m" lineNumbers>
39+
<EuiCodeBlock isCopyable paddingSize="m" lineNumbers css={codeblockStyles}>
3940
{data.message}
4041
</EuiCodeBlock>
4142
</EuiSplitPanel.Inner>

‎x-pack/platform/plugins/shared/onechat/public/application/components/conversations/conversation_rounds/round_thinking/steps/other_result_step.tsx‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import { EuiCodeBlock, useEuiTheme } from '@elastic/eui';
99
import type { ToolResult } from '@kbn/onechat-common/tools/tool_result';
1010
import React from 'react';
1111
import { css } from '@emotion/react';
12+
import { codeblockStyles } from './codeblock.styles';
1213

1314
interface OtherResultStepProps {
1415
result: ToolResult;
@@ -21,7 +22,14 @@ export const OtherResultStep: React.FC<OtherResultStepProps> = ({ result }) => {
2122
`;
2223
return (
2324
<div css={paddingLeftStyles}>
24-
<EuiCodeBlock language="json" fontSize="s" paddingSize="s" isCopyable={false} color="subdued">
25+
<EuiCodeBlock
26+
language="json"
27+
fontSize="s"
28+
paddingSize="s"
29+
isCopyable={false}
30+
color="subdued"
31+
css={codeblockStyles}
32+
>
2533
{JSON.stringify(result.data, null, 2)}
2634
</EuiCodeBlock>
2735
</div>

‎x-pack/platform/plugins/shared/onechat/public/application/components/conversations/conversation_rounds/round_thinking/steps/query_result_step.tsx‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import { i18n } from '@kbn/i18n';
1010
import React from 'react';
1111
import type { QueryResult } from '@kbn/onechat-common/tools/tool_result';
1212
import { css } from '@emotion/react';
13+
import { codeblockStyles } from './codeblock.styles';
1314

1415
const labels = {
1516
title: i18n.translate('xpack.onechat.round.thinking.steps.queryResultStep.title', {
@@ -34,7 +35,13 @@ export const QueryResultStep: React.FC<QueryResultStepProps> = ({ result: { data
3435
</EuiText>
3536
</EuiSplitPanel.Inner>
3637
<EuiSplitPanel.Inner paddingSize="none">
37-
<EuiCodeBlock language="esql" isCopyable paddingSize="m" lineNumbers>
38+
<EuiCodeBlock
39+
language="esql"
40+
isCopyable
41+
paddingSize="m"
42+
lineNumbers
43+
css={codeblockStyles}
44+
>
3845
{data.esql}
3946
</EuiCodeBlock>
4047
</EuiSplitPanel.Inner>

‎x-pack/platform/plugins/shared/onechat/public/application/components/conversations/conversation_rounds/round_thinking/steps/thinking_item_layout.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import {
2222
import type { ToolCallStep } from '@kbn/onechat-common';
2323
import { i18n } from '@kbn/i18n';
2424
import { css } from '@emotion/react';
25+
import { codeblockStyles } from './codeblock.styles';
2526

2627
const labels = {
2728
parameters: i18n.translate('xpack.onechat.round.thinking.steps.thinkingItemLayout.parameters', {
@@ -70,7 +71,7 @@ const Accordion = ({ children, accordionContent }: AccordionProps) => {
7071
</EuiText>
7172
</EuiSplitPanel.Inner>
7273
<EuiSplitPanel.Inner paddingSize="none">
73-
<EuiCodeBlock isCopyable paddingSize="m" lineNumbers>
74+
<EuiCodeBlock isCopyable paddingSize="m" lineNumbers css={codeblockStyles}>
7475
{JSON.stringify(accordionContent, null, 2)}
7576
</EuiCodeBlock>
7677
</EuiSplitPanel.Inner>

‎x-pack/platform/test/onechat/smoke_tests/tests/converse.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ export const converseApiSuite = (
5252
expect(response.response.message.length).to.be.greaterThan(0);
5353

5454
const toolCalls = response.steps.filter(isToolCallStep);
55-
expect(toolCalls.length).to.eql(1);
55+
expect(toolCalls.length >= 1).to.be(true);
5656

5757
const toolCall = toolCalls[0];
5858
expect(toolCall.tool_id).to.eql(platformCoreTools.listIndices);

‎x-pack/solutions/observability/plugins/synthetics/docs/openapi/synthetic_apis.yaml‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,9 @@ paths:
281281
required: true
282282
schema:
283283
type: string
284+
responses:
285+
"200":
286+
description: OK
284287
get:
285288
summary: Get a monitor
286289
operationId: get-synthetic-monitor
@@ -442,6 +445,9 @@ paths:
442445
"inline_script": "step('Go to https://google.com.co', () => page.goto('https://www.google.com'))",
443446
"locations": ["united_kingdom"]
444447
}
448+
responses:
449+
"200":
450+
description: OK
445451
/api/synthetics/monitors/_bulk_delete:
446452
post:
447453
summary: Delete monitors
@@ -671,6 +677,9 @@ paths:
671677
required: true
672678
schema:
673679
type: string
680+
responses:
681+
"200":
682+
description: OK
674683
get:
675684
summary: Get a parameter
676685
operationId: get-parameter
@@ -783,7 +792,7 @@ paths:
783792
"tags": ["authentication", "security", "updated"]
784793
}
785794
/api/synthetics/params/_bulk_delete:
786-
delete:
795+
post:
787796
summary: Delete parameters
788797
operationId: delete-parameters
789798
description: >
@@ -990,6 +999,9 @@ paths:
990999
type: string
9911000
minLength: 1
9921001
maxLength: 1024
1002+
responses:
1003+
"200":
1004+
description: OK
9931005
get:
9941006
summary: Get a private location
9951007
operationId: get-private-location
@@ -1297,6 +1309,8 @@ components:
12971309
synthetics_args:
12981310
type: array
12991311
description: Synthetics agent CLI arguments.
1312+
items:
1313+
type: string
13001314
type:
13011315
type: string
13021316
description: The monitor type.
@@ -1310,7 +1324,7 @@ components:
13101324
required:
13111325
- type
13121326
- url
1313-
additionalproperties: true
1327+
additionalProperties: true
13141328
properties:
13151329
check:
13161330
type: object

‎x-pack/solutions/security/packages/data-table/common/types/data_table/index.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ export enum TableId {
2626
hostsPageSessions = 'hosts-page-sessions-v2', // the v2 is to cache bust localstorage settings as default columns were reworked.
2727
alertsOnRuleDetailsPage = 'alerts-rules-details-page',
2828
alertsOnAlertsPage = 'alerts-page',
29+
alertsOnAttacksPage = 'attacks-page',
2930
alertsOnAlertSummaryPage = 'alert-summary-page',
3031
test = 'table-test', // Reserved for testing purposes
3132
alternateTest = 'alternateTest',
@@ -45,6 +46,7 @@ export enum TableEntityType {
4546

4647
export const tableEntity: Record<TableId, TableEntityType> = {
4748
[TableId.alertsOnAlertsPage]: TableEntityType.alert,
49+
[TableId.alertsOnAttacksPage]: TableEntityType.alert,
4850
[TableId.alertsOnAlertSummaryPage]: TableEntityType.alert,
4951
[TableId.alertsOnCasePage]: TableEntityType.alert,
5052
[TableId.alertsOnRuleDetailsPage]: TableEntityType.alert,
@@ -67,6 +69,7 @@ const TableIdLiteralRt = runtimeTypes.union([
6769
runtimeTypes.literal(TableId.hostsPageSessions),
6870
runtimeTypes.literal(TableId.alertsOnRuleDetailsPage),
6971
runtimeTypes.literal(TableId.alertsOnAlertsPage),
72+
runtimeTypes.literal(TableId.alertsOnAttacksPage),
7073
runtimeTypes.literal(TableId.alertsOnAlertSummaryPage),
7174
runtimeTypes.literal(TableId.test),
7275
runtimeTypes.literal(TableId.rulePreview),

0 commit comments

Comments
 (0)