Skip to content

Commit 838af62

Browse files
kibanamachinekibanamachine
authored
Merge branch 'main' into obs-ai-assistant-recall-esql-apis
2 parents 96161d8 + ee15561 commit 838af62

1,687 files changed

Lines changed: 51115 additions & 11288 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.

‎.buildkite/ftr_configs.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -405,6 +405,7 @@ enabled:
405405
- x-pack/test/spaces_api_integration/security_and_spaces/config_trial.ts
406406
- x-pack/test/spaces_api_integration/security_and_spaces/copy_to_space_config_trial.ts
407407
- x-pack/test/spaces_api_integration/spaces_only/config.ts
408+
- x-pack/test/task_manager_claimer_mget/config.ts
408409
- x-pack/test/ui_capabilities/security_and_spaces/config.ts
409410
- x-pack/test/ui_capabilities/spaces_only/config.ts
410411
- x-pack/test/upgrade_assistant_integration/config.js

‎.buildkite/pipelines/esql_grammar_sync.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ steps:
88
provider: gcp
99
machineType: n2-standard-2
1010
preemptible: true
11-
- command: .buildkite/scripts/steps/esql_generate_function_definitions.sh
12-
label: Generate Function Definitions
13-
timeout_in_minutes: 10
11+
- command: .buildkite/scripts/steps/esql_generate_function_metadata.sh
12+
label: Generate Function Metadata
13+
timeout_in_minutes: 15
1414
agents:
1515
image: family/kibana-ubuntu-2004
1616
imageProject: elastic-images-prod

.buildkite/scripts/steps/esql_generate_function_definitions.sh renamed to .buildkite/scripts/steps/esql_generate_function_metadata.sh

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
#!/usr/bin/env bash
22
set -euo pipefail
33

4+
VALIDATION_PACKAGE_DIR="packages/kbn-esql-validation-autocomplete"
5+
EDITOR_PACKAGE_DIR="packages/kbn-text-based-editor"
6+
GIT_SCOPE="$VALIDATION_PACKAGE_DIR/**/* $EDITOR_PACKAGE_DIR/**/*"
7+
48
report_main_step () {
59
echo "--- $1"
610
}
@@ -19,7 +23,7 @@ main () {
1923

2024
.buildkite/scripts/bootstrap.sh
2125

22-
cd "$KIBANA_DIR/packages/kbn-esql-validation-autocomplete"
26+
cd "$KIBANA_DIR/$VALIDATION_PACKAGE_DIR"
2327

2428
report_main_step "Generate function definitions"
2529

@@ -29,9 +33,21 @@ main () {
2933

3034
yarn make:tests
3135

36+
report_main_step "Generate inline function docs"
37+
38+
cd "$KIBANA_DIR/$EDITOR_PACKAGE_DIR"
39+
40+
yarn make:docs $PARENT_DIR/elasticsearch
41+
42+
report_main_step "Run i18n check"
43+
44+
cd "$KIBANA_DIR"
45+
46+
node scripts/i18n_check.js --fix
47+
3248
# Check for differences
3349
set +e
34-
git diff --exit-code --quiet .
50+
git diff --exit-code --quiet $GIT_SCOPE
3551
if [ $? -eq 0 ]; then
3652
echo "No differences found. Our work is done here."
3753
exit
@@ -44,8 +60,8 @@ main () {
4460
git config --global user.name "$KIBANA_MACHINE_USERNAME"
4561
git config --global user.email '42973632+kibanamachine@users.noreply.github.com'
4662

47-
PR_TITLE='[ES|QL] Update function definitions'
48-
PR_BODY='This PR updates the function definitions based on the latest metadata from Elasticsearch.'
63+
PR_TITLE='[ES|QL] Update function metadata'
64+
PR_BODY='This PR updates the function definitions and inline docs based on the latest metadata from Elasticsearch.'
4965

5066
# Check if a PR already exists
5167
pr_search_result=$(gh pr list --search "$PR_TITLE" --state open --author "$KIBANA_MACHINE_USERNAME" --limit 1 --json title -q ".[].title")
@@ -58,12 +74,12 @@ main () {
5874
echo "No existing PR found. Committing changes."
5975

6076
# Make a commit
61-
BRANCH_NAME="esql_generate_function_definitions_$(date +%s)"
77+
BRANCH_NAME="esql_generate_function_metadata_$(date +%s)"
6278

6379
git checkout -b "$BRANCH_NAME"
6480

65-
git add ./**/*
66-
git commit -m "Update function definitions"
81+
git add $GIT_SCOPE
82+
git commit -m "Update function metadata"
6783

6884
report_main_step "Changes committed. Creating pull request."
6985

‎.eslintrc.js‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1004,6 +1004,29 @@ module.exports = {
10041004
},
10051005
},
10061006

1007+
/**
1008+
* Integration assistant overrides
1009+
*/
1010+
{
1011+
// front end and common typescript and javascript files only
1012+
files: [
1013+
'x-pack/plugins/integration_assistant/public/**/*.{js,mjs,ts,tsx}',
1014+
'x-pack/plugins/integration_assistant/common/**/*.{js,mjs,ts,tsx}',
1015+
],
1016+
rules: {
1017+
'import/no-nodejs-modules': 'error',
1018+
'no-duplicate-imports': 'off',
1019+
'@typescript-eslint/no-duplicate-imports': 'error',
1020+
'no-restricted-imports': [
1021+
'error',
1022+
{
1023+
// prevents UI code from importing server side code and then webpack including it when doing builds
1024+
patterns: ['**/server/*'],
1025+
},
1026+
],
1027+
},
1028+
},
1029+
10071030
/**
10081031
* ML overrides
10091032
*/
@@ -1068,6 +1091,7 @@ module.exports = {
10681091
files: [
10691092
'x-pack/plugins/ecs_data_quality_dashboard/**/*.{ts,tsx}',
10701093
'x-pack/plugins/elastic_assistant/**/*.{ts,tsx}',
1094+
'x-pack/plugins/integration_assistant/**/*.{ts,tsx}',
10711095
'x-pack/packages/kbn-elastic-assistant/**/*.{ts,tsx}',
10721096
'x-pack/packages/kbn-elastic-assistant-common/**/*.{ts,tsx}',
10731097
'x-pack/packages/kbn-langchain/**/*.{ts,tsx}',
@@ -1082,6 +1106,7 @@ module.exports = {
10821106
excludedFiles: [
10831107
'x-pack/plugins/ecs_data_quality_dashboard/**/*.{test,mock,test_helper}.{ts,tsx}',
10841108
'x-pack/plugins/elastic_assistant/**/*.{test,mock,test_helper}.{ts,tsx}',
1109+
'x-pack/plugins/integration_assistant/**/*.{test,mock,test_helper}.{ts,tsx}',
10851110
'x-pack/packages/kbn-elastic-assistant/**/*.{test,mock,test_helper}.{ts,tsx}',
10861111
'x-pack/packages/kbn-elastic-assistant-common/**/*.{test,mock,test_helper}.{ts,tsx}',
10871112
'x-pack/packages/kbn-langchain/**/*.{test,mock,test_helper}.{ts,tsx}',
@@ -1102,6 +1127,7 @@ module.exports = {
11021127
files: [
11031128
'x-pack/plugins/ecs_data_quality_dashboard/**/*.{ts,tsx}',
11041129
'x-pack/plugins/elastic_assistant/**/*.{ts,tsx}',
1130+
'x-pack/plugins/integration_assistant/**/*.{ts,tsx}',
11051131
'x-pack/packages/kbn-elastic-assistant/**/*.{ts,tsx}',
11061132
'x-pack/packages/kbn-elastic-assistant-common/**/*.{ts,tsx}',
11071133
'x-pack/packages/kbn-langchain/**/*.{ts,tsx}',
@@ -1141,6 +1167,7 @@ module.exports = {
11411167
files: [
11421168
'x-pack/plugins/ecs_data_quality_dashboard/**/*.{js,mjs,ts,tsx}',
11431169
'x-pack/plugins/elastic_assistant/**/*.{js,mjs,ts,tsx}',
1170+
'x-pack/plugins/integration_assistant/**/*.{js,mjs,ts,tsx}',
11441171
'x-pack/packages/kbn-elastic-assistant/**/*.{js,mjs,ts,tsx}',
11451172
'x-pack/packages/kbn-elastic-assistant-common/**/*.{js,mjs,ts,tsx}',
11461173
'x-pack/packages/kbn-langchain/**/*.{js,mjs,ts,tsx}',

‎.github/CODEOWNERS‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -503,6 +503,7 @@ x-pack/plugins/observability_solution/infra @elastic/obs-ux-logs-team @elastic/o
503503
x-pack/plugins/ingest_pipelines @elastic/kibana-management
504504
src/plugins/input_control_vis @elastic/kibana-presentation
505505
src/plugins/inspector @elastic/kibana-presentation
506+
x-pack/plugins/integration_assistant @elastic/security-solution
506507
src/plugins/interactive_setup @elastic/kibana-security
507508
test/interactive_setup_api_integration/plugins/test_endpoints @elastic/kibana-security
508509
packages/kbn-interpreter @elastic/kibana-visualizations
@@ -681,6 +682,7 @@ packages/kbn-reporting/server @elastic/appex-sharedux
681682
packages/kbn-resizable-layout @elastic/kibana-data-discovery
682683
examples/resizable_layout_examples @elastic/kibana-data-discovery
683684
x-pack/test/plugin_functional/plugins/resolver_test @elastic/security-solution
685+
packages/response-ops/feature_flag_service @elastic/response-ops
684686
examples/response_stream @elastic/ml-ui
685687
packages/kbn-rison @elastic/kibana-operations
686688
x-pack/plugins/rollup @elastic/kibana-management
@@ -694,6 +696,7 @@ x-pack/plugins/runtime_fields @elastic/kibana-management
694696
packages/kbn-safer-lodash-set @elastic/kibana-security
695697
x-pack/test/security_api_integration/plugins/saml_provider @elastic/kibana-security
696698
x-pack/test/plugin_api_integration/plugins/sample_task_plugin @elastic/response-ops
699+
x-pack/test/task_manager_claimer_mget/plugins/sample_task_plugin_mget @elastic/response-ops
697700
test/plugin_functional/plugins/saved_object_export_transforms @elastic/kibana-core
698701
test/plugin_functional/plugins/saved_object_import_warnings @elastic/kibana-core
699702
x-pack/test/saved_object_api_integration/common/plugins/saved_object_test_plugin @elastic/kibana-security
@@ -716,6 +719,7 @@ x-pack/plugins/search_connectors @elastic/search-kibana
716719
packages/kbn-search-errors @elastic/kibana-data-discovery
717720
examples/search_examples @elastic/kibana-data-discovery
718721
packages/kbn-search-index-documents @elastic/search-kibana
722+
x-pack/plugins/search_inference_endpoints @elastic/search-kibana
719723
x-pack/plugins/search_notebooks @elastic/search-kibana
720724
x-pack/plugins/search_playground @elastic/search-kibana
721725
packages/kbn-search-response-warnings @elastic/kibana-data-discovery
@@ -1224,7 +1228,7 @@ x-pack/test/observability_ai_assistant_functional @elastic/obs-ai-assistant
12241228
/WORKSPACE.bazel @elastic/kibana-operations
12251229
/.buildkite/ @elastic/kibana-operations
12261230
/.buildkite/scripts/steps/esql_grammar_sync.sh @elastic/kibana-esql
1227-
/.buildkite/scripts/steps/esql_generate_function_definitions.sh @elastic/kibana-esql
1231+
/.buildkite/scripts/steps/esql_generate_function_metadata.sh @elastic/kibana-esql
12281232
/.buildkite/pipelines/esql_grammar_sync.yml @elastic/kibana-esql
12291233
/kbn_pm/ @elastic/kibana-operations
12301234
/x-pack/dev-tools @elastic/kibana-operations
@@ -1324,6 +1328,7 @@ x-pack/plugins/cloud_integrations/cloud_full_story/server/config.ts @elastic/kib
13241328
/x-pack/test/alerting_api_integration/observability @elastic/obs-ux-management-team
13251329
/x-pack/test/plugin_api_integration/test_suites/task_manager/ @elastic/response-ops
13261330
/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/ @elastic/response-ops
1331+
/x-pack/test/task_manager_claimer_mget/ @elastic/response-ops
13271332
/docs/user/alerting/ @elastic/response-ops
13281333
/docs/management/connectors/ @elastic/response-ops
13291334
/x-pack/test/cases_api_integration/ @elastic/response-ops

‎api_docs/actions.mdx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/actions
88
title: "actions"
99
image: https://source.unsplash.com/400x175/?github
1010
description: API docs for the actions plugin
11-
date: 2024-06-12
11+
date: 2024-06-14
1212
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'actions']
1313
---
1414
import actionsObj from './actions.devdocs.json';

‎api_docs/advanced_settings.mdx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/advancedSettings
88
title: "advancedSettings"
99
image: https://source.unsplash.com/400x175/?github
1010
description: API docs for the advancedSettings plugin
11-
date: 2024-06-12
11+
date: 2024-06-14
1212
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'advancedSettings']
1313
---
1414
import advancedSettingsObj from './advanced_settings.devdocs.json';

‎api_docs/ai_assistant_management_selection.mdx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/aiAssistantManagementSelection
88
title: "aiAssistantManagementSelection"
99
image: https://source.unsplash.com/400x175/?github
1010
description: API docs for the aiAssistantManagementSelection plugin
11-
date: 2024-06-12
11+
date: 2024-06-14
1212
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'aiAssistantManagementSelection']
1313
---
1414
import aiAssistantManagementSelectionObj from './ai_assistant_management_selection.devdocs.json';

‎api_docs/aiops.devdocs.json‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1068,22 +1068,6 @@
10681068
"deprecated": false,
10691069
"trackAdoption": false
10701070
},
1071-
{
1072-
"parentPluginId": "aiops",
1073-
"id": "def-public.LogRateAnalysisAppStateProps.stickyHistogram",
1074-
"type": "CompoundType",
1075-
"tags": [],
1076-
"label": "stickyHistogram",
1077-
"description": [
1078-
"Option to make main histogram sticky"
1079-
],
1080-
"signature": [
1081-
"boolean | undefined"
1082-
],
1083-
"path": "x-pack/plugins/aiops/public/components/log_rate_analysis/log_rate_analysis_app_state.tsx",
1084-
"deprecated": false,
1085-
"trackAdoption": false
1086-
},
10871071
{
10881072
"parentPluginId": "aiops",
10891073
"id": "def-public.LogRateAnalysisAppStateProps.showFrozenDataTierChoice",
@@ -1138,22 +1122,6 @@
11381122
"deprecated": false,
11391123
"trackAdoption": false
11401124
},
1141-
{
1142-
"parentPluginId": "aiops",
1143-
"id": "def-public.LogRateAnalysisContentWrapperProps.stickyHistogram",
1144-
"type": "CompoundType",
1145-
"tags": [],
1146-
"label": "stickyHistogram",
1147-
"description": [
1148-
"Option to make main histogram sticky"
1149-
],
1150-
"signature": [
1151-
"boolean | undefined"
1152-
],
1153-
"path": "x-pack/plugins/aiops/public/components/log_rate_analysis/log_rate_analysis_content/log_rate_analysis_content_wrapper.tsx",
1154-
"deprecated": false,
1155-
"trackAdoption": false
1156-
},
11571125
{
11581126
"parentPluginId": "aiops",
11591127
"id": "def-public.LogRateAnalysisContentWrapperProps.appDependencies",

‎api_docs/aiops.mdx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/aiops
88
title: "aiops"
99
image: https://source.unsplash.com/400x175/?github
1010
description: API docs for the aiops plugin
11-
date: 2024-06-12
11+
date: 2024-06-14
1212
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'aiops']
1313
---
1414
import aiopsObj from './aiops.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/ml-ui](https://github.com/orgs/elastic/teams/ml-ui) for questi
2121

2222
| Public API count | Any count | Items lacking comments | Missing exports |
2323
|-------------------|-----------|------------------------|-----------------|
24-
| 74 | 0 | 9 | 2 |
24+
| 72 | 0 | 9 | 2 |
2525

2626
## Client
2727

0 commit comments

Comments
 (0)