Skip to content

Commit cb25844

Browse files
miltonhultgrenmiltonhultgren
authored
Merge branch 'main' into 47477-shorten-ml-job-ids
2 parents 73e6c31 + 214f209 commit cb25844

41 files changed

Lines changed: 451 additions & 129 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.

‎packages/kbn-check-mappings-update-cli/current_mappings.json‎

Lines changed: 57 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,6 @@
4242
}
4343
}
4444
},
45-
"metrics-data-source": {
46-
"dynamic": false,
47-
"properties": {}
48-
},
4945
"url": {
5046
"dynamic": false,
5147
"properties": {
@@ -1473,6 +1469,10 @@
14731469
}
14741470
}
14751471
},
1472+
"metrics-data-source": {
1473+
"dynamic": false,
1474+
"properties": {}
1475+
},
14761476
"canvas-element": {
14771477
"dynamic": false,
14781478
"properties": {
@@ -2168,6 +2168,9 @@
21682168
"interval": {
21692169
"type": "keyword"
21702170
},
2171+
"timeout": {
2172+
"type": "short"
2173+
},
21712174
"ecs_mapping": {
21722175
"dynamic": false,
21732176
"properties": {}
@@ -2216,6 +2219,9 @@
22162219
"interval": {
22172220
"type": "text"
22182221
},
2222+
"timeout": {
2223+
"type": "short"
2224+
},
22192225
"platform": {
22202226
"type": "keyword"
22212227
},
@@ -2258,6 +2264,9 @@
22582264
"interval": {
22592265
"type": "text"
22602266
},
2267+
"timeout": {
2268+
"type": "short"
2269+
},
22612270
"platform": {
22622271
"type": "keyword"
22632272
},
@@ -2679,50 +2688,6 @@
26792688
}
26802689
}
26812690
},
2682-
"apm-telemetry": {
2683-
"dynamic": false,
2684-
"properties": {}
2685-
},
2686-
"apm-server-schema": {
2687-
"properties": {
2688-
"schemaJson": {
2689-
"type": "text",
2690-
"index": false
2691-
}
2692-
}
2693-
},
2694-
"apm-service-group": {
2695-
"properties": {
2696-
"groupName": {
2697-
"type": "keyword"
2698-
},
2699-
"kuery": {
2700-
"type": "text"
2701-
},
2702-
"description": {
2703-
"type": "text"
2704-
},
2705-
"color": {
2706-
"type": "text"
2707-
}
2708-
}
2709-
},
2710-
"apm-custom-dashboards": {
2711-
"properties": {
2712-
"dashboardSavedObjectId": {
2713-
"type": "keyword"
2714-
},
2715-
"kuery": {
2716-
"type": "text"
2717-
},
2718-
"serviceEnvironmentFilterEnabled": {
2719-
"type": "boolean"
2720-
},
2721-
"serviceNameFilterEnabled": {
2722-
"type": "boolean"
2723-
}
2724-
}
2725-
},
27262691
"enterprise_search_telemetry": {
27272692
"dynamic": false,
27282693
"properties": {}
@@ -3196,5 +3161,49 @@
31963161
"index": false
31973162
}
31983163
}
3164+
},
3165+
"apm-telemetry": {
3166+
"dynamic": false,
3167+
"properties": {}
3168+
},
3169+
"apm-server-schema": {
3170+
"properties": {
3171+
"schemaJson": {
3172+
"type": "text",
3173+
"index": false
3174+
}
3175+
}
3176+
},
3177+
"apm-service-group": {
3178+
"properties": {
3179+
"groupName": {
3180+
"type": "keyword"
3181+
},
3182+
"kuery": {
3183+
"type": "text"
3184+
},
3185+
"description": {
3186+
"type": "text"
3187+
},
3188+
"color": {
3189+
"type": "text"
3190+
}
3191+
}
3192+
},
3193+
"apm-custom-dashboards": {
3194+
"properties": {
3195+
"dashboardSavedObjectId": {
3196+
"type": "keyword"
3197+
},
3198+
"kuery": {
3199+
"type": "text"
3200+
},
3201+
"serviceEnvironmentFilterEnabled": {
3202+
"type": "boolean"
3203+
},
3204+
"serviceNameFilterEnabled": {
3205+
"type": "boolean"
3206+
}
3207+
}
31993208
}
32003209
}

‎packages/kbn-osquery-io-ts-types/src/live_query/index.ts‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
*/
88

99
import * as t from 'io-ts';
10+
import { inRangeRt } from '@kbn/io-ts-utils';
1011

1112
export const id = t.string;
1213
export type Id = t.TypeOf<typeof id>;
@@ -49,6 +50,11 @@ export type Interval = t.TypeOf<typeof interval>;
4950
export const intervalOrUndefined = t.union([interval, t.undefined]);
5051
export type IntervalOrUndefined = t.TypeOf<typeof intervalOrUndefined>;
5152

53+
export const timeout = inRangeRt(60, 60 * 15);
54+
export type Timeout = t.TypeOf<typeof timeout>;
55+
export const timeoutOrUndefined = t.union([timeout, t.undefined]);
56+
export type TimeoutOrUndefined = t.TypeOf<typeof timeoutOrUndefined>;
57+
5258
export const snapshot = t.boolean;
5359
export type Snapshot = t.TypeOf<typeof snapshot>;
5460
export const snapshotOrUndefined = t.union([snapshot, t.undefined]);

‎packages/kbn-osquery-io-ts-types/tsconfig.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,8 @@
1212
],
1313
"exclude": [
1414
"target/**/*",
15+
],
16+
"kbn_references": [
17+
"@kbn/io-ts-utils",
1518
]
1619
}

‎packages/kbn-text-based-editor/src/esql_documentation_sections.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1180,7 +1180,7 @@ Rounds down a date to the closest interval.
11801180
11811181
\`\`\`
11821182
FROM employees
1183-
| EVAL year_hired = DATE_TRUNC(hire_date, 1 year)
1183+
| EVAL year_hired = DATE_TRUNC(1 year, hire_date)
11841184
| STATS count(emp_no) BY year_hired
11851185
| SORT year_hired
11861186
\`\`\`

‎packages/kbn-unified-field-list/src/components/field_popover/field_popover.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33

44
.unifiedFieldList__fieldPopover__fieldPopoverPanel {
55
min-width: $euiSizeXXL * 6.5 !important; /* 1 */
6-
max-width: $euiSizeXXL * 7.5 !important;
6+
max-width: $euiSizeXXL * 10 !important;
77
}

‎packages/kbn-unified-field-list/src/components/field_stats/field_top_values_bucket.tsx‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import {
1313
EuiFlexItem,
1414
EuiProgress,
1515
EuiText,
16+
EuiTextBlockTruncate,
1617
EuiToolTip,
1718
} from '@elastic/eui';
1819
import { i18n } from '@kbn/i18n';
@@ -84,14 +85,18 @@ const FieldTopValuesBucket: React.FC<FieldTopValuesBucketProps> = ({
8485
<EuiFlexGroup alignItems="stretch" gutterSize="s" responsive={false}>
8586
<EuiFlexItem
8687
grow={true}
87-
className="eui-textTruncate"
8888
data-test-subj={`${dataTestSubject}-topValues-formattedFieldValue`}
89+
css={css`
90+
overflow-wrap: break-word;
91+
`}
8992
>
9093
{(formattedFieldValue?.length ?? 0) > 0 ? (
9194
<EuiToolTip content={formattedFieldValue} delay="long">
92-
<EuiText size="xs" className="eui-textTruncate" color={'subdued'} {...textProps}>
93-
{formattedFieldValue}
94-
</EuiText>
95+
<EuiTextBlockTruncate lines={3}>
96+
<EuiText size="xs" color={'subdued'} {...textProps}>
97+
{formattedFieldValue}
98+
</EuiText>
99+
</EuiTextBlockTruncate>
95100
</EuiToolTip>
96101
) : (
97102
<EuiText size="xs">

‎src/cli/serve/integration_tests/serverless_config_flag.test.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@ import { filter, firstValueFrom, from, concatMap } from 'rxjs';
1515
import { REPO_ROOT } from '@kbn/repo-info';
1616
import { getConfigDirectory } from '@kbn/utils';
1717

18-
describe('cli serverless project type', () => {
18+
// Failing: See https://github.com/elastic/kibana/issues/163257
19+
// Failing: See https://github.com/elastic/kibana/issues/163258
20+
// Failing: See https://github.com/elastic/kibana/issues/163259
21+
describe.skip('cli serverless project type', () => {
1922
let child: ChildProcessWithoutNullStreams | undefined;
2023

2124
afterEach(() => {

‎src/core/server/integration_tests/ci_checks/saved_objects/check_registered_types.test.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,9 @@ describe('checking migration metadata changes on all registered SO types', () =>
125125
"monitoring-telemetry": "5d91bf75787d9d4dd2fae954d0b3f76d33d2e559",
126126
"observability-onboarding-state": "b16064c516aac64ae699c737d7d10b6e199bfded",
127127
"osquery-manager-usage-metric": "983bcbc3b7dda0aad29b20907db233abba709bcc",
128-
"osquery-pack": "6ab4358ca4304a12dcfc1777c8135b75cffb4397",
129-
"osquery-pack-asset": "b14101d3172c4b60eb5404696881ce5275c84152",
130-
"osquery-saved-query": "44f1161e165defe3f9b6ad643c68c542a765fcdb",
128+
"osquery-pack": "702e86b1a936153b39f65b0781bdc136e186e123",
129+
"osquery-pack-asset": "cd140bc2e4b092e93692b587bf6e38051ef94c75",
130+
"osquery-saved-query": "6095e288750aa3164dfe186c74bc5195c2bf2bd4",
131131
"policy-settings-protection-updates-note": "33924bb246f9e5bcb876109cc83e3c7a28308352",
132132
"query": "21cbbaa09abb679078145ce90087b1e88b7eae95",
133133
"risk-engine-configuration": "b105d4a3c6adce40708d729d12e5ef3c8fbd9508",

‎x-pack/plugins/osquery/common/api/live_query/create_live_query_route.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import {
1313
packIdOrUndefined,
1414
queryOrUndefined,
1515
arrayQueries,
16+
timeoutOrUndefined,
1617
} from '@kbn/osquery-io-ts-types';
1718

1819
export const createLiveQueryRequestBodySchema = t.partial({
@@ -23,6 +24,7 @@ export const createLiveQueryRequestBodySchema = t.partial({
2324
query: queryOrUndefined,
2425
queries: arrayQueries,
2526
saved_query_id: savedQueryIdOrUndefined,
27+
timeout: timeoutOrUndefined,
2628
ecs_mapping: ecsMappingOrUndefined,
2729
pack_id: packIdOrUndefined,
2830
alert_ids: t.array(t.string),

‎x-pack/plugins/osquery/common/api/saved_query/create_saved_query_route.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import {
1818
snapshotOrUndefined,
1919
removedOrUndefined,
2020
ecsMappingOrUndefined,
21+
timeoutOrUndefined,
2122
} from '@kbn/osquery-io-ts-types';
2223

2324
export const createSavedQueryRequestSchema = t.type({
@@ -27,6 +28,7 @@ export const createSavedQueryRequestSchema = t.type({
2728
query,
2829
version: versionOrUndefined,
2930
interval,
31+
timeout: timeoutOrUndefined,
3032
snapshot: snapshotOrUndefined,
3133
removed: removedOrUndefined,
3234
ecs_mapping: ecsMappingOrUndefined,

0 commit comments

Comments
 (0)