Skip to content

Commit d91fef5

Browse files
authored
Merge branch 'main' into connectors/supported_features_filter_and_http_visibile
2 parents ba5c82c + bb3dfda commit d91fef5

1,542 files changed

Lines changed: 51092 additions & 22595 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.

.agents/skills/evals-write-spec/SKILL.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ evaluate.describe('Suite name', { tag: tags.serverless.observability.complete },
2424

2525
evaluate('test name', async ({ executorClient, connector }) => {
2626
await executorClient.runExperiment(
27-
{ dataset, task },
27+
{ datasets: [dataset], task },
2828
evaluators
2929
);
3030
});
@@ -202,7 +202,7 @@ export function createEvaluateDataset({
202202
return async ({ dataset }) => {
203203
await executorClient.runExperiment(
204204
{
205-
dataset,
205+
datasets: [dataset],
206206
task: async ({ input }) => {
207207
const response = await chatClient.converse({ messages: [{ message: input.question }] });
208208
return { messages: response.messages, steps: response.steps };

.agents/skills/evals-write-spec/references/evaluator-patterns.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ type MyTaskOutput = TaskOutput & {
2020
};
2121

2222
await executorClient.runExperiment(
23-
{ dataset, task },
23+
{ datasets: [dataset], task },
2424
selectEvaluators<MyExample, MyTaskOutput>([
2525
{
2626
name: 'NonEmptyDocuments',
@@ -246,7 +246,7 @@ A common pattern passes both CODE and LLM evaluators to `runExperiment`:
246246

247247
```ts
248248
await executorClient.runExperiment(
249-
{ dataset, task },
249+
{ datasets: [dataset], task },
250250
[
251251
createCriteriaEvaluator({ evaluators }),
252252
createToolCallsEvaluator({ evaluators }),

.buildkite/ftr-manifests/ftr_platform_stateful_configs.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,6 @@ enabled:
234234
- x-pack/platform/test/functional_basic/apps/transform/edit_clone/config.ts
235235
- x-pack/platform/test/functional_basic/apps/transform/creation/runtime_mappings_saved_search/config.ts
236236
- x-pack/platform/test/functional_basic/apps/transform/permissions/config.ts
237-
- x-pack/platform/test/functional_basic/apps/transform/feature_controls/config.ts
238237
- x-pack/platform/test/functional_cors/config.ts
239238
- x-pack/platform/test/functional_embedded/config.ts
240239
- x-pack/platform/test/functional_execution_context/config.ts
@@ -252,13 +251,11 @@ enabled:
252251
- x-pack/platform/test/functional/apps/aiops/config.ts
253252
- x-pack/platform/test/functional/apps/api_keys/config.ts
254253
- x-pack/platform/test/functional/apps/canvas/config.ts
255-
- x-pack/platform/test/functional/apps/cross_cluster_replication/config.ts
256254
- x-pack/platform/test/functional/apps/dashboard/group1/config.ts
257255
- x-pack/platform/test/functional/apps/dashboard/group3/config.ts
258256
- x-pack/platform/test/functional/apps/discover/group1/config.ts
259257
- x-pack/platform/test/functional/apps/discover/group2/config.ts
260258
- x-pack/platform/test/functional/apps/discover/group3/config.ts
261-
- x-pack/platform/test/functional/apps/index_lifecycle_management/config.ts
262259
- x-pack/platform/test/functional/apps/index_management/config.ts
263260
- x-pack/platform/test/functional/apps/lens/group1/config.ts
264261
- x-pack/platform/test/functional/apps/lens/group2/config.ts
@@ -287,7 +284,6 @@ enabled:
287284
- x-pack/platform/test/functional/apps/license_management/config.ts
288285
- x-pack/platform/test/functional/apps/logstash/config.ts
289286
- x-pack/platform/test/functional/apps/managed_content/config.ts
290-
- x-pack/platform/test/functional/apps/management/config.ts
291287
- x-pack/platform/test/functional/apps/maps/group1/config.ts
292288
- x-pack/platform/test/functional/apps/maps/group2/config.ts
293289
- x-pack/platform/test/functional/apps/maps/group3/config.ts
@@ -325,7 +321,6 @@ enabled:
325321
- x-pack/platform/test/functional/apps/transform/actions/config.ts
326322
- x-pack/platform/test/functional/apps/transform/edit_clone/config.ts
327323
- x-pack/platform/test/functional/apps/transform/permissions/config.ts
328-
- x-pack/platform/test/functional/apps/transform/feature_controls/config.ts
329324
- x-pack/platform/test/functional/apps/user_profiles/config.ts
330325
- x-pack/platform/test/functional/apps/visualize/config.ts
331326
- x-pack/platform/test/functional/apps/watcher/config.ts

.buildkite/scout_ci_config.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,12 @@ plugins:
1212
- cloud_security_posture
1313
- console
1414
- contentManagementExamples
15+
- cross_cluster_replication
1516
- custom_branding
1617
- dashboard
1718
- dashboard_markdown
1819
- data
20+
- data_view_editor
1921
- data_views
2022
- data_view_management
2123
- dev_tools
@@ -31,6 +33,7 @@ plugins:
3133
- graph
3234
- grokdebugger
3335
- home
36+
- index_lifecycle_management
3437
- index_management
3538
- infra
3639
- ingest_hub
@@ -39,6 +42,7 @@ plugins:
3942
- kibana_overview
4043
- lens
4144
- logstash
45+
- management
4246
- maps
4347
- ml
4448
- monitoring

.buildkite/scripts/common/setup_job_env.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ EOF
130130
# Set up Kibana Evals secrets
131131
{
132132
if [[ "${KBN_EVALS:-}" =~ ^(1|true)$ ]]; then
133-
echo "KBN_EVALS was set - exposing evals connectors and ES export credentials"
133+
echo "KBN_EVALS was set - exposing evals connectors and export credentials"
134134

135135
KBN_EVALS_CONFIG_JSON="$(vault_get kbn-evals config | base64 -d)"
136136
# Validate config shape (safe; does not print secrets)
@@ -145,10 +145,6 @@ EOF
145145
export KBN_EVALS_CONFIG_B64
146146
KBN_EVALS_CONFIG_B64="$(printf '%s' "$KBN_EVALS_CONFIG_JSON" | base64)"
147147

148-
# Elasticsearch cluster for evaluation results export
149-
export EVALUATIONS_ES_URL="$(jq -r '.evaluationsEs.url // empty' <<<"$KBN_EVALS_CONFIG_JSON")"
150-
export EVALUATIONS_ES_API_KEY="$(jq -r '.evaluationsEs.apiKey // empty' <<<"$KBN_EVALS_CONFIG_JSON")"
151-
152148
# Optional: separate cluster for trace-based evaluators
153149
export TRACING_ES_URL="$(jq -r '.tracingEs.url // empty' <<<"$KBN_EVALS_CONFIG_JSON")"
154150
export TRACING_ES_API_KEY="$(jq -r '.tracingEs.apiKey // empty' <<<"$KBN_EVALS_CONFIG_JSON")"

.buildkite/scripts/steps/evals/run_suite.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ fi
1818
# The value should be the platform-level `pluginId` use-case identifier.
1919
# `@kbn/evals` defaults this to `kbn_evals`, but you can override via KBN_EVALS_TELEMETRY_PLUGIN_ID.
2020

21-
# Set a base run id from the Buildkite build. The evaluator fixture appends the
22-
# connector id to produce a unique run_id per model (e.g. bk-<build>-<connector>).
23-
# Correlation across models in the same build uses ci.buildkite.build_id which
24-
# is populated automatically from BUILDKITE_BUILD_ID in score_repository.ts.
21+
# Set a base build run ID from the Buildkite build. This is used as a seed for
22+
# generating deterministic per-task experiment IDs (not as the experiment_id itself).
23+
# Suite-run grouping in the UI uses metadata.ci.build_id which is populated
24+
# automatically from BUILDKITE_BUILD_ID in the Buildkite metadata.
2525
if [[ -z "${TEST_RUN_ID:-}" ]] && [[ -n "${BUILDKITE_BUILD_ID:-}" ]]; then
2626
export TEST_RUN_ID="bk-${BUILDKITE_BUILD_ID}"
2727
fi

.buildkite/scripts/steps/kbn_ui_publish.sh

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,14 +96,11 @@ if [[ "${DRY_RUN:-}" == "1" ]]; then
9696
fi
9797

9898
report_step "Fetching Artifactory credentials"
99-
# The secret is stored at `kv/ci-shared/serverless/cloud-ui/kbn-ui-artifactory-registry`,
100-
# so that engineering orgs and CIs from kibana and cloud-ui can both access it without
101-
# granting broader vault permissions.
102-
# Secret layout:
99+
# Secret layout at `secret/ci/elastic-kibana/kbn-ui-artifactory`:
103100
# registry - full npm registry URL
104101
# npm_token - auth token
105-
NPM_REGISTRY="$(vault_kv_get kv/ci-shared/serverless/cloud-ui/kbn-ui-artifactory-registry registry_url)"
106-
NPM_TOKEN="$(vault_kv_get kv/ci-shared/serverless/cloud-ui/kbn-ui-artifactory-registry npm_token)"
102+
NPM_REGISTRY="$(vault_get kbn-ui-artifactory registry)"
103+
NPM_TOKEN="$(vault_get kbn-ui-artifactory npm_token)"
107104
if [[ -z "$NPM_REGISTRY" || -z "$NPM_TOKEN" ]]; then
108105
echo "ERROR: Artifactory credentials missing from vault." >&2
109106
exit 1

.eslintrc.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3002,8 +3002,8 @@ module.exports = {
30023002
'@kbn/*',
30033003
'!@kbn/i18n',
30043004
'!@kbn/i18n-react',
3005-
'!@kbn/core-chrome-layout-constants',
3006-
'!@kbn/core-chrome-layout-utils',
3005+
'!@kbn/ui-chrome-layout-constants',
3006+
'!@kbn/ui-chrome-layout-utils',
30073007
],
30083008
},
30093009
],

.github/CODEOWNERS

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,6 +360,8 @@ src/core/packages/user-storage/server-mocks @elastic/appex-sharedux
360360
src/core/test-helpers/kbn-server @elastic/kibana-core
361361
src/core/test-helpers/model-versions @elastic/kibana-core
362362
src/platform/kbn-ui/chrome-layout @elastic/appex-sharedux
363+
src/platform/kbn-ui/chrome-layout-constants @elastic/appex-sharedux
364+
src/platform/kbn-ui/chrome-layout-utils @elastic/appex-sharedux
363365
src/platform/kbn-ui/side-navigation @elastic/appex-sharedux
364366
src/platform/packages/private/analytics/utils/analytics_collection_utils @elastic/kibana-core
365367
src/platform/packages/private/dashboard/dashboard-navigation-options-common @elastic/kibana-presentation
@@ -915,7 +917,6 @@ src/platform/test/plugin_functional/plugins/core_plugin_route_timeouts @elastic/
915917
src/platform/test/plugin_functional/plugins/core_provider_plugin @elastic/kibana-core
916918
src/platform/test/plugin_functional/plugins/data_search @elastic/kibana-data-discovery
917919
src/platform/test/plugin_functional/plugins/elasticsearch_client_plugin @elastic/kibana-core
918-
src/platform/test/plugin_functional/plugins/eui_provider_dev_warning @elastic/appex-sharedux
919920
src/platform/test/plugin_functional/plugins/hardening @elastic/kibana-security
920921
src/platform/test/plugin_functional/plugins/index_patterns @elastic/kibana-data-discovery
921922
src/platform/test/plugin_functional/plugins/kbn_sample_panel_action @elastic/appex-sharedux
@@ -1189,6 +1190,7 @@ x-pack/platform/plugins/shared/inbox @elastic/security-genai-research-and-develo
11891190
x-pack/platform/plugins/shared/index_management @elastic/kibana-management
11901191
x-pack/platform/plugins/shared/inference @elastic/search-kibana
11911192
x-pack/platform/plugins/shared/inference_endpoint @elastic/search-kibana
1193+
x-pack/platform/plugins/shared/inference_workflows @elastic/search-kibana
11921194
x-pack/platform/plugins/shared/ingest_hub @elastic/obs-onboarding-team
11931195
x-pack/platform/plugins/shared/ingest_pipelines @elastic/kibana-management
11941196
x-pack/platform/plugins/shared/lens @elastic/kibana-visualizations
@@ -3405,6 +3407,8 @@ x-pack/solutions/observability/plugins/observability_shared/public/components/pr
34053407
/src/core/packages/chrome @elastic/appex-sharedux
34063408
/src/platform/kbn-ui/_tooling @elastic/appex-sharedux
34073409
/src/platform/kbn-ui/chrome-layout @elastic/appex-sharedux
3410+
/src/platform/kbn-ui/chrome-layout-constants @elastic/appex-sharedux
3411+
/src/platform/kbn-ui/chrome-layout-utils @elastic/appex-sharedux
34083412
/src/platform/kbn-ui/side-navigation @elastic/appex-sharedux
34093413
/x-pack/platform/test/serverless/api_integration/test_suites/favorites @elastic/appex-sharedux # Assigned per https://github.com/elastic/kibana/pull/200985
34103414
/src/platform/test/api_integration/apis/short_url/**/*.ts @elastic/appex-sharedux # Assigned per https://github.com/elastic/kibana/pull/200209/files#r1846654156

docs/extend/plugin-list.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ mapped_pages:
153153
| [enterpriseSearch](https://github.com/elastic/kibana/blob/main/x-pack/solutions/search/plugins/enterprise_search/README.md) | This plugin provides Kibana user interfaces for managing the Enterprise Search solution and its products, App Search and Workplace Search. |
154154
| [entityManager](https://github.com/elastic/kibana/blob/main/x-pack/platform/plugins/shared/entity_manager/README.md) | This plugin provides access to observed entity data, such as information about hosts, pods, containers, services, and more. |
155155
| [entityStore](https://github.com/elastic/kibana/blob/main/x-pack/solutions/security/plugins/entity_store/README.md) | Central place for Entities management and logs extraction. |
156-
| [evals](https://github.com/elastic/kibana/blob/main/x-pack/platform/plugins/shared/evals/README.md) | The Evals plugin provides an in-Kibana UI for browsing LLM evaluation run results, per-evaluator statistics, and OpenTelemetry traces produced by the @kbn/evals evaluation framework. |
156+
| [evals](https://github.com/elastic/kibana/blob/main/x-pack/platform/plugins/shared/evals/README.md) | The Evals plugin provides an in-Kibana UI for browsing LLM evaluation experiment results, per-evaluator statistics, and OpenTelemetry traces produced by the @kbn/evals evaluation framework. |
157157
| [eventLog](https://github.com/elastic/kibana/blob/main/x-pack/platform/plugins/shared/event_log/README.md) | The event log plugin provides a persistent history of alerting and action activities. |
158158
| [exploratoryView](https://github.com/elastic/kibana/blob/main/x-pack/solutions/observability/plugins/exploratory_view/README.md) | A shared component for visualizing observability data types via lens embeddable. For further details. |
159159
| [features](https://github.com/elastic/kibana/blob/main/x-pack/platform/plugins/shared/features/README.md) | The features plugin enhance Kibana with a per-feature privilege system. |
@@ -173,6 +173,7 @@ mapped_pages:
173173
| [indicesMetadata](https://github.com/elastic/kibana/blob/main/x-pack/platform/plugins/private/indices_metadata/README.md) | Plugin for managing and retrieving metadata about indices in Kibana. This plugin collects and processes metadata from Elasticsearch indices, data streams, ILM policies, and index templates. |
174174
| [inference](https://github.com/elastic/kibana/blob/main/x-pack/platform/plugins/shared/inference/README.md) | The inference plugin is a central place to handle all interactions with the Elasticsearch Inference API and external LLM APIs. Its goals are: |
175175
| [inferenceEndpoint](https://github.com/elastic/kibana/blob/main/x-pack/platform/plugins/shared/inference_endpoint/README.md) | A Kibana plugin |
176+
| [inferenceWorkflows](https://github.com/elastic/kibana/blob/main/x-pack/platform/plugins/shared/inference_workflows/README.md) | Registers AI workflow steps (ai.prompt, ai.summarize, ai.classify) that use the inference plugin to power LLM-based automation in Kibana Workflows. |
176177
| [infra](https://github.com/elastic/kibana/blob/main/x-pack/solutions/observability/plugins/infra/README.md) | This is the home of the infra plugin, which aims to provide a solution for the infrastructure monitoring use-case within Kibana. |
177178
| [ingestHub](https://github.com/elastic/kibana/blob/main/x-pack/platform/plugins/shared/ingest_hub/README.md) | Cross-solution onboarding page for adding data sources and integrations. Gated behind the ingestHub.enabled feature flag. |
178179
| [ingestPipelines](https://github.com/elastic/kibana/blob/main/x-pack/platform/plugins/shared/ingest_pipelines/README.md) | The ingest_pipelines plugin provides Kibana support for Elasticsearch's ingest pipelines. |

0 commit comments

Comments
 (0)