Skip to content

Commit cc044eb

Browse files
authored
Merge branch 'main' into nls/dupspan
2 parents 4f95adf + e7dc690 commit cc044eb

71 files changed

Lines changed: 933 additions & 1722 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: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1229,8 +1229,6 @@ x-pack/solutions/security/test/plugin_functional/plugins/resolver_test @elastic/
12291229
x-pack/solutions/security/test/security_solution_api_integration @elastic/security-detection-engine
12301230
x-pack/solutions/security/test/security_solution_api_integration/config/services/detections_response @elastic/security-detection-engine
12311231
x-pack/solutions/security/test/security_solution_endpoint @elastic/security-defend-workflows
1232-
x-pack/solutions/workplaceai/packages/kbn-workplaceai-api-keys-components @elastic/search-kibana @elastic/workchat-eng
1233-
x-pack/solutions/workplaceai/packages/kbn-workplaceai-api-keys-server @elastic/search-kibana @elastic/workchat-eng
12341232
x-pack/solutions/workplaceai/plugins/serverless_workplace_ai @elastic/search-kibana @elastic/workchat-eng
12351233
x-pack/solutions/workplaceai/plugins/workplace_ai_app @elastic/search-kibana @elastic/workchat-eng
12361234
x-pack/solutions/workplaceai/test @elastic/workchat-eng

package.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1169,8 +1169,6 @@
11691169
"@kbn/workflows-management-plugin": "link:src/platform/plugins/shared/workflows_management",
11701170
"@kbn/workflows-ui": "link:src/platform/packages/shared/kbn-workflows-ui",
11711171
"@kbn/workplace-ai-app": "link:x-pack/solutions/workplaceai/plugins/workplace_ai_app",
1172-
"@kbn/workplaceai-api-keys-components": "link:x-pack/solutions/workplaceai/packages/kbn-workplaceai-api-keys-components",
1173-
"@kbn/workplaceai-api-keys-server": "link:x-pack/solutions/workplaceai/packages/kbn-workplaceai-api-keys-server",
11741172
"@kbn/xstate-utils": "link:src/platform/packages/shared/kbn-xstate-utils",
11751173
"@kbn/zod": "link:src/platform/packages/shared/kbn-zod",
11761174
"@kbn/zod-helpers": "link:src/platform/packages/shared/kbn-zod-helpers",

packages/kbn-optimizer/limits.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ pageLoadAssetSize:
77
apm: 38573
88
apmSourcesAccess: 2278
99
automaticImport: 12162
10-
automaticImportVTwo: 4694
10+
automaticImportVTwo: 4662
1111
banners: 4087
1212
canvas: 15142
1313
cases: 153204
@@ -89,7 +89,7 @@ pageLoadAssetSize:
8989
inputControlVis: 7660
9090
inspectComponent: 4900
9191
inspector: 17954
92-
interactiveSetup: 36654
92+
interactiveSetup: 36524
9393
intercepts: 19011
9494
kibanaOverview: 6339
9595
kibanaReact: 22503
@@ -123,7 +123,7 @@ pageLoadAssetSize:
123123
observabilityLogsExplorer: 4918
124124
observabilityOnboarding: 12872
125125
observabilityShared: 75115
126-
onechat: 25223
126+
onechat: 25218
127127
osquery: 47422
128128
painlessLab: 6299
129129
presentationPanel: 11418
@@ -205,5 +205,5 @@ pageLoadAssetSize:
205205
visualizations: 38375
206206
watcher: 10485
207207
workflowsExtensions: 2554
208-
workflowsManagement: 8545
209-
workplaceAIApp: 6454
208+
workflowsManagement: 8497
209+
workplaceAIApp: 6135

src/platform/packages/shared/deeplinks/agent_builder/constants.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,3 @@
88
*/
99

1010
export const AGENT_BUILDER_APP_ID = 'agent_builder';
11-
export const AGENT_BUILDER_AGENTS_CREATE = 'agents_create';

src/platform/packages/shared/deeplinks/agent_builder/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
* License v3.0 only", or the "Server Side Public License, v 1".
88
*/
99

10-
export { AGENT_BUILDER_APP_ID, AGENT_BUILDER_AGENTS_CREATE } from './constants';
10+
export { AGENT_BUILDER_APP_ID } from './constants';
1111
export type { DeepLinkId } from './deep_links';

src/platform/packages/shared/deeplinks/observability/locators/slo.ts

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,21 @@ export const sloDetailsHistoryLocatorID = 'SLO_DETAILS_HISTORY_LOCATOR';
1414
export const sloEditLocatorID = 'SLO_EDIT_LOCATOR';
1515
export const sloListLocatorID = 'SLO_LIST_LOCATOR';
1616

17+
export const OVERVIEW_TAB_ID = 'overview';
18+
export const HISTORY_TAB_ID = 'history';
19+
export const DEFINITION_TAB_ID = 'definition';
20+
export const ALERTS_TAB_ID = 'alerts';
21+
22+
export type SloTabId =
23+
| typeof OVERVIEW_TAB_ID
24+
| typeof ALERTS_TAB_ID
25+
| typeof HISTORY_TAB_ID
26+
| typeof DEFINITION_TAB_ID;
27+
1728
export interface SloDetailsLocatorParams extends SerializableRecord {
18-
sloId?: string;
29+
sloId: string;
1930
instanceId?: string;
31+
tabId?: SloTabId;
2032
}
2133

2234
export interface SloDetailsHistoryLocatorParams extends SerializableRecord {

src/platform/packages/shared/kbn-cell-actions/src/components/hover_actions_popover.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* License v3.0 only", or the "Server Side Public License, v 1".
88
*/
99

10-
import { EuiPopover, EuiScreenReaderOnly, type EuiButtonIconProps } from '@elastic/eui';
10+
import { type EuiButtonIconProps, EuiPopover, EuiScreenReaderOnly } from '@elastic/eui';
1111
import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
1212
import { euiThemeVars } from '@kbn/ui-theme';
1313
import { css } from '@emotion/react';
@@ -136,6 +136,7 @@ export const HoverActionsPopover: React.FC<Props> = ({
136136
closePopover={closePopover}
137137
hasArrow={false}
138138
isOpen={showHoverContent}
139+
offset={0}
139140
panelPaddingSize="none"
140141
repositionOnScroll
141142
ownFocus={false}

src/platform/test/functional/apps/visualize/replaced_vislib_chart_types/_timelion.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,8 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
256256
expect(value).to.eql('.es()');
257257
});
258258

259-
describe('dynamic suggestions for argument values', () => {
259+
// FLAKY: https://github.com/elastic/kibana/issues/244933
260+
describe.skip('dynamic suggestions for argument values', () => {
260261
describe('.es()', () => {
261262
it('should show index pattern suggestions for index argument', async () => {
262263
await monacoEditor.setCodeEditorValue('');

tsconfig.base.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2448,10 +2448,6 @@
24482448
"@kbn/workflows-ui/*": ["src/platform/packages/shared/kbn-workflows-ui/*"],
24492449
"@kbn/workplace-ai-app": ["x-pack/solutions/workplaceai/plugins/workplace_ai_app"],
24502450
"@kbn/workplace-ai-app/*": ["x-pack/solutions/workplaceai/plugins/workplace_ai_app/*"],
2451-
"@kbn/workplaceai-api-keys-components": ["x-pack/solutions/workplaceai/packages/kbn-workplaceai-api-keys-components"],
2452-
"@kbn/workplaceai-api-keys-components/*": ["x-pack/solutions/workplaceai/packages/kbn-workplaceai-api-keys-components/*"],
2453-
"@kbn/workplaceai-api-keys-server": ["x-pack/solutions/workplaceai/packages/kbn-workplaceai-api-keys-server"],
2454-
"@kbn/workplaceai-api-keys-server/*": ["x-pack/solutions/workplaceai/packages/kbn-workplaceai-api-keys-server/*"],
24552451
"@kbn/workspaces": ["src/platform/packages/shared/kbn-workspaces"],
24562452
"@kbn/workspaces/*": ["src/platform/packages/shared/kbn-workspaces/*"],
24572453
"@kbn/xstate-utils": ["src/platform/packages/shared/kbn-xstate-utils"],

x-pack/platform/plugins/shared/onechat/moon.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ dependsOn:
9797
- '@kbn/shared-ux-utility'
9898
- '@kbn/usage-collection-plugin'
9999
- '@kbn/core-notifications-browser'
100-
- '@kbn/deeplinks-agent-builder'
101100
tags:
102101
- plugin
103102
- prod

0 commit comments

Comments
 (0)