Skip to content

Commit ae92ea5

Browse files
authored
Merge branch 'main' into ska/relocate-more-platform-ui-tests
2 parents 7e1f960 + ec951bd commit ae92ea5

File tree

92 files changed

+2616
-912
lines changed

Some content is hidden

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

92 files changed

+2616
-912
lines changed

.buildkite/ftr_base_serverless_configs.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,4 @@ enabled:
1515
- x-pack/platform/test/api_integration_deployment_agnostic/configs/serverless/search.serverless.config.ts
1616
- x-pack/platform/test/api_integration_deployment_agnostic/configs/serverless/security.serverless.config.ts
1717
- x-pack/platform/test/api_integration_deployment_agnostic/configs/serverless/oblt.logs_essentials.serverless.config.ts
18+
- x-pack/platform/test/api_integration_deployment_agnostic/configs/serverless/oblt.streams.serverless.config.ts

.buildkite/ftr_oblt_serverless_configs.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,4 @@ enabled:
4444
- x-pack/solutions/observability/test/api_integration_deployment_agnostic/configs/serverless/oblt.ai_assistant.serverless.config.ts
4545
- x-pack/solutions/observability/test/api_integration_deployment_agnostic/configs/serverless/oblt.apm.serverless.config.ts
4646
- x-pack/solutions/observability/test/api_integration_deployment_agnostic/configs/serverless/oblt.synthetics.serverless.config.ts
47-
- x-pack/solutions/observability/test/api_integration_deployment_agnostic/configs/serverless/oblt.streams.serverless.config.ts
4847
- x-pack/solutions/observability/test/api_integration_deployment_agnostic/feature_flag_configs/serverless/oblt.serverless.config.ts

.buildkite/scripts/bootstrap.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ if [[ "$(pwd)" != *"/local-ssd/"* && "$(pwd)" != "/dev/shm"* ]]; then
2626
fi
2727
fi
2828

29-
if ! yarn kbn bootstrap "${BOOTSTRAP_PARAMS[@]}"; then
29+
# TODO: revisit the double bootstrap per attempt after removing Bazel and changing package manager.
30+
if ! (yarn kbn bootstrap "${BOOTSTRAP_PARAMS[@]}" || yarn kbn bootstrap "${BOOTSTRAP_PARAMS[@]}"); then
3031
echo "bootstrap failed, trying again in 15 seconds"
3132
sleep 15
3233

@@ -35,7 +36,7 @@ if ! yarn kbn bootstrap "${BOOTSTRAP_PARAMS[@]}"; then
3536
rm -rf node_modules
3637

3738
echo "--- yarn install and bootstrap, attempt 2"
38-
yarn kbn bootstrap --force-install
39+
yarn kbn bootstrap --force-install || yarn kbn bootstrap
3940
fi
4041

4142
if [[ "$DISABLE_BOOTSTRAP_VALIDATION" != "true" ]]; then

.github/CODEOWNERS

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1457,7 +1457,7 @@ x-pack/solutions/observability/plugins/observability/server/lib/esql_extensions
14571457
/x-pack/solutions/observability/plugins/infra/server/services/rules @elastic/obs-ux-infra_services-team @elastic/obs-ux-logs-team
14581458
/x-pack/test/common/utils/synthtrace @elastic/obs-ux-infra_services-team @elastic/obs-ux-logs-team # Assigned per https://github.com/elastic/kibana/blob/main/src/platform/packages/shared/kbn-apm-synthtrace/kibana.jsonc#L5
14591459
/x-pack/solutions/observability/test/common/utils/synthtrace @elastic/obs-ux-infra_services-team @elastic/obs-ux-logs-team
1460-
/x-pack/solutions/observability/test/common/utils/server_route_repository @elastic/obs-knowledge-team
1460+
/x-pack/platform/test/common/utils/server_route_repository @elastic/obs-knowledge-team
14611461
/src/platform/test/functional/services/synthtrace/logs_synthtrace_es_client.ts @elastic/obs-ux-infra_services-team @elastic/obs-ux-logs-team
14621462

14631463
## Streams parts owned by Logs UX
@@ -1617,9 +1617,9 @@ x-pack/solutions/observability/plugins/observability/server/lib/esql_extensions
16171617
/x-pack/plugins/observability_solution/observability/server/ui_settings.ts @elastic/obs-docs
16181618

16191619
# Streams
1620-
/x-pack/solutions/observability/test/api_integration_deployment_agnostic/apis/streams @elastic/streams-program-team
1621-
/x-pack/solutions/observability/test/api_integration_deployment_agnostic/configs/serverless/oblt.streams.index.ts @elastic/streams-program-team
1622-
/x-pack/solutions/observability/test/api_integration_deployment_agnostic/configs/serverless/oblt.streams.serverless.config.ts @elastic/streams-program-team
1620+
/x-pack/platform/test/api_integration_deployment_agnostic/apis/streams @elastic/streams-program-team
1621+
/x-pack/platform/test/api_integration_deployment_agnostic/configs/serverless/oblt.streams.index.ts @elastic/streams-program-team
1622+
/x-pack/platform/test/api_integration_deployment_agnostic/configs/serverless/oblt.streams.serverless.config.ts @elastic/streams-program-team
16231623
/x-pack/test/api_integration/fixtures/kbn_archiver/streams @elastic/streams-program-team
16241624

16251625
### END Observability Plugins

docs/release-notes/index.md

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,46 @@ To check for security updates, go to [Security announcements for the Elastic sta
2121
% ### Fixes [kibana-X.X.X-fixes]
2222
% *
2323

24+
## 9.0.4 [kibana-9.0.4-release-notes]
25+
26+
### Features and enhancements [kibana-9.0.4-features-enhancements]
27+
28+
**Data ingestion and Fleet**:
29+
* Adds a tooltip to the **Last activity** column in Agent list UI [#224850]({{kib-pull}}224850).
30+
31+
**Machine Learning**:
32+
* Improves error messages in the AI Connector creation UI and ensures they're surfaced in {{kib}} [#221859]({{kib-pull}}221859).
33+
34+
35+
### Fixes [kibana-9.0.4-fixes]
36+
37+
**Dashboards and Visualizations**:
38+
* Fixes an issue with dashboard sharing links where copied links were not shortened and some users were unable to copy links in new spaces [#227625]({{kib-pull}}227625).
39+
* Stops dashboards from recommending adhoc data views [#225705]({{kib-pull}}225705).
40+
* Prevents dashboards from initiating duplicate requests when making a selection on a control [#224761]({{kib-pull}}224761).
41+
42+
**Data ingestion and Fleet**:
43+
* Fixes bug that causes the CSV export to fail in Agent list [#225050]({{kib-pull}}225050).
44+
* Replaces call to registry when deleting {{kib}} assets for custom packages [#224886]({{kib-pull}}224886).
45+
* Fixes an issue where the background task was not deleting some unenrolled {{agents}} [#224808]({{kib-pull}}224808).
46+
* Fixes bulk actions incorrectly selecting {{agents}} with the namespaces filter [#224036]({{kib-pull}}224036).
47+
48+
**Discover**:
49+
* Makes expiration badges singular and plural [#227035]({{kib-pull}}227035).
50+
51+
**Elastic Observability solution**:
52+
For the Elastic Observability 9.0.4 release information, refer to [Elastic Observability Solution Release Notes](docs-content://release-notes/elastic-observability/index.md).
53+
54+
**Elastic Security solution**:
55+
For the Elastic Security 9.0.4 release information, refer to [Elastic Security Solution Release Notes](docs-content://release-notes/elastic-security/index.md).
56+
57+
**Kibana platform**:
58+
* Hides the header and side navigation when printing or exporting a dashboard with **Print layout** selected [#227095]({{kib-pull}}227095).
59+
60+
**Search**:
61+
* Fixes handling of context limit errors in Playground when using the Elastic Managed LLM [#225360]({{kib-pull}}225360).
62+
* Adjusts `z-index` of the header menu to avoid conflicting with Console [#224708]({{kib-pull}}224708).
63+
2464
## 9.0.3 [kibana-9.0.3-release-notes]
2565

2666
:::{important}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1864,7 +1864,7 @@
18641864
"file-loader": "^4.2.0",
18651865
"find-cypress-specs": "^1.41.4",
18661866
"fix-esm": "^1.0.1",
1867-
"form-data": "^4.0.3",
1867+
"form-data": "^4.0.4",
18681868
"geckodriver": "^5.0.0",
18691869
"gulp-brotli": "^3.0.0",
18701870
"gulp-postcss": "^10.0.0",

src/platform/packages/shared/kbn-unified-data-table/src/components/data_table.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -873,7 +873,8 @@ const InternalUnifiedDataTable = ({
873873
storage,
874874
consumer,
875875
key: 'dataGridHeaderRowHeight',
876-
configRowHeight: configHeaderRowHeight ?? 1,
876+
defaultRowHeight: 1,
877+
configRowHeight: configHeaderRowHeight,
877878
rowHeightState: headerRowHeightState,
878879
onUpdateRowHeight: onUpdateHeaderRowHeight,
879880
});
@@ -883,7 +884,8 @@ const InternalUnifiedDataTable = ({
883884
storage,
884885
consumer,
885886
key: 'dataGridRowHeight',
886-
configRowHeight: configRowHeight ?? ROWS_HEIGHT_OPTIONS.default,
887+
defaultRowHeight: ROWS_HEIGHT_OPTIONS.default,
888+
configRowHeight,
887889
rowHeightState,
888890
onUpdateRowHeight,
889891
});

src/platform/packages/shared/kbn-unified-data-table/src/components/data_table_additional_display_settings.test.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ describe('UnifiedDataTableAdditionalDisplaySettings', function () {
281281
onChangeRowHeightLines,
282282
});
283283
fireEvent.change(screen.getByRole('spinbutton'), { target: { value: 5 } });
284-
expect(onChangeRowHeightLines).toHaveBeenCalledWith(5);
284+
expect(onChangeRowHeightLines).toHaveBeenCalledWith(5, true);
285285
await userEvent.click(screen.getByRole('button', { name: 'Auto' }));
286286
expect(onChangeRowHeight).toHaveBeenCalledWith('auto');
287287
});
@@ -310,7 +310,7 @@ describe('UnifiedDataTableAdditionalDisplaySettings', function () {
310310
onChangeHeaderRowHeightLines,
311311
});
312312
fireEvent.change(screen.getByRole('spinbutton'), { target: { value: 3 } });
313-
expect(onChangeHeaderRowHeightLines).toHaveBeenCalledWith(3);
313+
expect(onChangeHeaderRowHeightLines).toHaveBeenCalledWith(3, true);
314314
await userEvent.click(screen.getByRole('button', { name: 'Auto' }));
315315
expect(onChangeHeaderRowHeight).toHaveBeenCalledWith('auto');
316316
});

src/platform/packages/shared/kbn-unified-data-table/src/components/data_table_additional_display_settings.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ export const RANGE_STEP_SAMPLE_SIZE = 10;
2121
export interface UnifiedDataTableAdditionalDisplaySettingsProps {
2222
rowHeight: RowHeightSettingsProps['rowHeight'];
2323
onChangeRowHeight?: (rowHeight: RowHeightSettingsProps['rowHeight']) => void;
24-
onChangeRowHeightLines?: (rowHeightLines: number) => void;
24+
onChangeRowHeightLines?: (rowHeightLines: number, isValid: boolean) => void;
2525
headerRowHeight: RowHeightSettingsProps['rowHeight'];
2626
onChangeHeaderRowHeight?: (headerRowHeight: RowHeightSettingsProps['rowHeight']) => void;
27-
onChangeHeaderRowHeightLines?: (headerRowHeightLines: number) => void;
27+
onChangeHeaderRowHeightLines?: (headerRowHeightLines: number, isValid: boolean) => void;
2828
maxAllowedSampleSize?: number;
2929
sampleSize: number;
3030
onChangeSampleSize?: (sampleSize: number) => void;
31-
lineCountInput: number;
32-
headerLineCountInput: number;
31+
lineCountInput: number | undefined;
32+
headerLineCountInput: number | undefined;
3333
densityControl?: React.ReactNode;
3434
}
3535

src/platform/packages/shared/kbn-unified-data-table/src/components/row_height_settings.tsx

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ export enum RowHeightMode {
2222
custom = 'custom',
2323
}
2424
export interface RowHeightSettingsProps {
25-
lineCountInput: number;
25+
lineCountInput: number | undefined;
2626
rowHeight?: RowHeightMode;
2727
maxRowHeight?: number;
2828
label: string;
2929
onChangeRowHeight: (newHeightMode: RowHeightMode | undefined) => void;
30-
onChangeLineCountInput: (newRowHeightLines: number) => void;
30+
onChangeLineCountInput: (newRowHeightLines: number, isValid: boolean) => void;
3131
'data-test-subj'?: string;
3232
}
3333

@@ -36,10 +36,10 @@ const idPrefix = htmlIdGenerator()();
3636
export function RowHeightSettings({
3737
lineCountInput,
3838
label,
39-
rowHeight,
39+
rowHeight = RowHeightMode.custom,
4040
onChangeRowHeight,
4141
onChangeLineCountInput,
42-
maxRowHeight,
42+
maxRowHeight = 20,
4343
['data-test-subj']: dataTestSubj,
4444
}: RowHeightSettingsProps) {
4545
const rowHeightModeOptions = [
@@ -74,7 +74,7 @@ export function RowHeightSettings({
7474
legend={label}
7575
buttonSize="compressed"
7676
options={rowHeightModeOptions}
77-
idSelected={`${idPrefix}${rowHeight ?? RowHeightMode.custom}`}
77+
idSelected={`${idPrefix}${rowHeight}`}
7878
onChange={(optionId) => {
7979
const newMode = optionId.replace(idPrefix, '') as RowHeightSettingsProps['rowHeight'];
8080
onChangeRowHeight(newMode);
@@ -86,10 +86,11 @@ export function RowHeightSettings({
8686
value={lineCountInput}
8787
onChange={(e) => {
8888
const lineCount = Number(e.currentTarget.value);
89-
onChangeLineCountInput(lineCount);
89+
onChangeLineCountInput(lineCount, e.target.checkValidity());
9090
}}
9191
min={1}
92-
max={maxRowHeight ?? 20}
92+
max={maxRowHeight}
93+
required
9394
step={1}
9495
disabled={rowHeight !== RowHeightMode.custom}
9596
data-test-subj={`${dataTestSubj}_lineCountNumber`}

0 commit comments

Comments
 (0)