Skip to content

Commit cc06eab

Browse files
stephmilovicstephmilovic
committed
Merge branch 'main' into nl_to_esql_siem_2
2 parents dd40a8b + 1199a5c commit cc06eab

155 files changed

Lines changed: 5049 additions & 2008 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: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,7 @@ src/plugins/field_formats @elastic/kibana-data-discovery
461461
packages/kbn-field-types @elastic/kibana-data-discovery
462462
packages/kbn-field-utils @elastic/kibana-data-discovery
463463
x-pack/plugins/fields_metadata @elastic/obs-ux-logs-team
464-
x-pack/plugins/file_upload @elastic/kibana-gis @elastic/ml-ui
464+
x-pack/plugins/file_upload @elastic/kibana-presentation @elastic/ml-ui
465465
examples/files_example @elastic/appex-sharedux
466466
src/plugins/files_management @elastic/appex-sharedux
467467
src/plugins/files @elastic/appex-sharedux
@@ -583,11 +583,11 @@ packages/kbn-management/settings/types @elastic/kibana-management
583583
packages/kbn-management/settings/utilities @elastic/kibana-management
584584
packages/kbn-management/storybook/config @elastic/kibana-management
585585
test/plugin_functional/plugins/management_test_plugin @elastic/kibana-management
586-
packages/kbn-mapbox-gl @elastic/kibana-gis
587-
x-pack/examples/third_party_maps_source_example @elastic/kibana-gis
588-
src/plugins/maps_ems @elastic/kibana-gis
589-
x-pack/plugins/maps @elastic/kibana-gis
590-
x-pack/packages/maps/vector_tile_utils @elastic/kibana-gis
586+
packages/kbn-mapbox-gl @elastic/kibana-presentation
587+
x-pack/examples/third_party_maps_source_example @elastic/kibana-presentation
588+
src/plugins/maps_ems @elastic/kibana-presentation
589+
x-pack/plugins/maps @elastic/kibana-presentation
590+
x-pack/packages/maps/vector_tile_utils @elastic/kibana-presentation
591591
x-pack/plugins/observability_solution/metrics_data_access @elastic/obs-knowledge-team @elastic/obs-ux-infra_services-team
592592
x-pack/packages/ml/agg_utils @elastic/ml-ui
593593
x-pack/packages/ml/anomaly_utils @elastic/ml-ui

‎docs/setup/access.asciidoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,4 @@ For example:
6565
* When {kib} is unable to connect to a healthy {es} cluster, errors like `master_not_discovered_exception` or `unable to revive connection` or `license is not available` errors appear.
6666
* When one or more {kib}-backing indices are unhealthy, the `index_not_green_timeout` error appears.
6767

68-
For more information, refer to our https://www.elastic.co/blog/troubleshooting-kibana-health[walkthrough on troubleshooting Kibana Health].
68+
You can find a Kibana health troubleshooting walkthrough in https://www.elastic.co/blog/troubleshooting-kibana-health[this blog] or in link:https://www.youtube.com/watch?v=AlgGYcpGvOA[this video].

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,12 @@
312312
"entity-discovery-api-key": [
313313
"apiKey"
314314
],
315+
"entity-engine-status": [
316+
"filter",
317+
"indexPattern",
318+
"status",
319+
"type"
320+
],
315321
"epm-packages": [
316322
"additional_spaces_installed_kibana",
317323
"es_index_patterns",

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1057,6 +1057,23 @@
10571057
}
10581058
}
10591059
},
1060+
"entity-engine-status": {
1061+
"dynamic": false,
1062+
"properties": {
1063+
"filter": {
1064+
"type": "keyword"
1065+
},
1066+
"indexPattern": {
1067+
"type": "keyword"
1068+
},
1069+
"status": {
1070+
"type": "keyword"
1071+
},
1072+
"type": {
1073+
"type": "keyword"
1074+
}
1075+
}
1076+
},
10601077
"epm-packages": {
10611078
"properties": {
10621079
"additional_spaces_installed_kibana": {

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,7 @@ export const getDocLinks = ({ kibanaBranch, buildFlavor }: GetDocLinkOptions): D
219219
searchApplicationsSearch: `${ELASTICSEARCH_DOCS}search-application-client.html`,
220220
searchLabs: `${SEARCH_LABS_URL}`,
221221
searchLabsRepo: `${SEARCH_LABS_REPO}`,
222+
semanticSearch: `${ELASTICSEARCH_DOCS}semantic-search.html`,
222223
searchTemplates: `${ELASTICSEARCH_DOCS}search-template.html`,
223224
semanticTextField: `${ELASTICSEARCH_DOCS}semantic-text.html`,
224225
start: `${ENTERPRISE_SEARCH_DOCS}start.html`,

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@ export interface DocLinks {
183183
readonly searchApplicationsSearch: string;
184184
readonly searchLabs: string;
185185
readonly searchLabsRepo: string;
186+
readonly semanticSearch: string;
186187
readonly searchTemplates: string;
187188
readonly semanticTextField: string;
188189
readonly start: string;

‎packages/kbn-ftr-common-functional-services/index.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import { KibanaServerProvider } from './services/kibana_server';
1414
export { KibanaServerProvider } from './services/kibana_server';
1515
export type KibanaServer = ProvidedType<typeof KibanaServerProvider>;
1616

17-
export { RetryService } from './services/retry';
17+
export { RetryService, type TryWithRetriesOptions } from './services/retry';
1818

1919
import { EsArchiverProvider } from './services/es_archiver';
2020
export type EsArchiver = ProvidedType<typeof EsArchiverProvider>;

‎packages/kbn-ftr-common-functional-services/services/retry/index.ts‎

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

10-
export { RetryService } from './retry';
10+
export { RetryService, type TryWithRetriesOptions } from './retry';

‎packages/kbn-ftr-common-functional-services/services/retry/retry.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { FtrService } from '../ftr_provider_context';
1111
import { retryForSuccess } from './retry_for_success';
1212
import { retryForTruthy } from './retry_for_truthy';
1313

14-
interface TryWithRetriesOptions {
14+
export interface TryWithRetriesOptions {
1515
retryCount: number;
1616
retryDelay?: number;
1717
timeout?: number;

‎packages/kbn-ftr-common-functional-services/services/retry/retry_for_success.ts‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ export async function retryForSuccess<T>(log: ToolingLog, options: Options<T>) {
9292
if (lastError && onFailureBlock) {
9393
const before = await runAttempt(onFailureBlock);
9494
if ('error' in before) {
95-
log.debug(`--- onRetryBlock error: ${before.error.message}`);
95+
log.debug(`--- onRetryBlock error: ${before.error.message} - Attempt #: ${attemptCounter}`);
9696
}
9797
}
9898

@@ -104,9 +104,13 @@ export async function retryForSuccess<T>(log: ToolingLog, options: Options<T>) {
104104

105105
if ('error' in attempt) {
106106
if (lastError && lastError.message === attempt.error.message) {
107-
log.debug(`--- ${methodName} failed again with the same message...`);
107+
log.debug(
108+
`--- ${methodName} failed again with the same message... - Attempt #: ${attemptCounter}`
109+
);
108110
} else {
109-
log.debug(`--- ${methodName} error: ${attempt.error.message}`);
111+
log.debug(
112+
`--- ${methodName} error: ${attempt.error.message} - Attempt #: ${attemptCounter}`
113+
);
110114
}
111115

112116
lastError = attempt.error;

0 commit comments

Comments
 (0)