Skip to content

Commit

Permalink
Merge branch 'main' into task/olm-8538-endpoint-list-api-support-spac…
Browse files Browse the repository at this point in the history
…es-2
  • Loading branch information
paul-tavares authored Oct 8, 2024
2 parents cf4ce36 + 2dfd8f1 commit c45b17b
Show file tree
Hide file tree
Showing 384 changed files with 5,596 additions and 4,036 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,16 @@ steps:
DEPLOYMENT_SLICES: ${DEPLOYMENT_SLICES:-""}
soft_fail: true

- label: ":rocket: control-plane e2e tests"
- label: ":rocket: Run serverless synthetics check"
if: build.env("ENVIRONMENT") == "production-canary"
trigger: "ess-k8s-production-e2e-tests" # https://buildkite.com/elastic/ess-k8s-production-e2e-tests
trigger: "serverless-quality-gates"
build:
env:
REGION_ID: aws-us-east-1
NAME_PREFIX: ci_test_kibana-promotion_
message: "${BUILDKITE_MESSAGE} (triggered by pipeline.tests-production.yaml)"
env:
TARGET_ENV: production
SERVICE: kibana
CHECK_SYNTHETICS: true
CHECK_SYNTHETICS_TAG: serverless-platform-core-validation

- label: ":cookie: 24h bake time before continuing promotion"
if: build.env("ENVIRONMENT") == "production-canary"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@
# A failure in this pipeline build will prevent further progression to the subsequent stage.

steps:
- label: ":rocket: control-plane e2e tests"
trigger: "ess-k8s-qa-e2e-tests-daily" # https://buildkite.com/elastic/ess-k8s-qa-e2e-tests-daily
- label: ":rocket: Run serverless synthetics check"
trigger: "serverless-quality-gates"
build:
env:
REGION_ID: aws-eu-west-1
NAME_PREFIX: ci_test_kibana-promotion_
message: "${BUILDKITE_MESSAGE} (triggered by pipeline.tests-qa.yaml)"
env:
TARGET_ENV: qa
SERVICE: kibana
CHECK_SYNTHETICS: true
CHECK_SYNTHETICS_TAG: serverless-platform-core-validation
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,15 @@
# A failure in this pipeline build will prevent further progression to the subsequent stage.

steps:
- label: ":rocket: control-plane e2e tests"
trigger: "ess-k8s-staging-e2e-tests" # https://buildkite.com/elastic/ess-k8s-staging-e2e-tests
- label: ":rocket: Run serverless synthetics check"
trigger: "serverless-quality-gates"
build:
env:
REGION_ID: aws-us-east-1
NAME_PREFIX: ci_test_kibana-promotion_
message: "${BUILDKITE_MESSAGE} (triggered by pipeline.tests-staging.yaml)"
env:
TARGET_ENV: staging
SERVICE: kibana
CHECK_SYNTHETICS: true
CHECK_SYNTHETICS_TAG: serverless-platform-core-validation

- label: ":kibana: Kibana Serverless Tests for ${ENVIRONMENT}"
trigger: appex-qa-serverless-kibana-ftr-tests # https://buildkite.com/elastic/appex-qa-serverless-kibana-ftr-tests
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,16 @@ steps:
DEPLOYMENT_SLICES: ${DEPLOYMENT_SLICES:-""}
soft_fail: true

- label: ":rocket: control-plane e2e tests"
- label: ":rocket: Run serverless synthetics check"
if: build.env("ENVIRONMENT") == "production-canary"
trigger: "ess-k8s-production-e2e-tests" # https://buildkite.com/elastic/ess-k8s-production-e2e-tests
trigger: "serverless-quality-gates"
build:
env:
REGION_ID: aws-us-east-1
NAME_PREFIX: ci_test_kibana-promotion_
message: "${BUILDKITE_MESSAGE} (triggered by pipeline.tests-production.yaml)"
env:
TARGET_ENV: production
SERVICE: kibana
CHECK_SYNTHETICS: true
CHECK_SYNTHETICS_TAG: serverless-platform-core-validation

- label: ":cookie: 24h bake time before continuing promotion"
if: build.env("ENVIRONMENT") == "production-canary"
Expand Down
12 changes: 7 additions & 5 deletions .buildkite/pipelines/quality-gates/pipeline.tests-qa.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,15 @@ steps:
ENVIRONMENT: ${ENVIRONMENT}
message: "${BUILDKITE_MESSAGE} (triggered by pipeline.tests-qa.yaml)"

- label: ":rocket: control-plane e2e tests"
trigger: "ess-k8s-qa-e2e-tests-daily" # https://buildkite.com/elastic/ess-k8s-qa-e2e-tests-daily
- label: ":rocket: Run serverless synthetics check"
trigger: "serverless-quality-gates"
build:
env:
REGION_ID: aws-eu-west-1
NAME_PREFIX: ci_test_kibana-promotion_
message: "${BUILDKITE_MESSAGE} (triggered by pipeline.tests-qa.yaml)"
env:
TARGET_ENV: qa
SERVICE: kibana
CHECK_SYNTHETICS: true
CHECK_SYNTHETICS_TAG: serverless-platform-core-validation

- wait: ~

Expand Down
12 changes: 7 additions & 5 deletions .buildkite/pipelines/quality-gates/pipeline.tests-staging.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,15 @@
# A failure in this pipeline build will prevent further progression to the subsequent stage.

steps:
- label: ":rocket: control-plane e2e tests"
trigger: "ess-k8s-staging-e2e-tests" # https://buildkite.com/elastic/ess-k8s-staging-e2e-tests
- label: ":rocket: Run serverless synthetics check"
trigger: "serverless-quality-gates"
build:
env:
REGION_ID: aws-us-east-1
NAME_PREFIX: ci_test_kibana-promotion_
message: "${BUILDKITE_MESSAGE} (triggered by pipeline.tests-staging.yaml)"
env:
TARGET_ENV: staging
SERVICE: kibana
CHECK_SYNTHETICS: true
CHECK_SYNTHETICS_TAG: serverless-platform-core-validation

- label: ":kibana: Kibana Serverless Tests for ${ENVIRONMENT}"
trigger: appex-qa-serverless-kibana-ftr-tests # https://buildkite.com/elastic/appex-qa-serverless-kibana-ftr-tests
Expand Down
3 changes: 2 additions & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -1013,6 +1013,8 @@ packages/kbn-zod-helpers @elastic/security-detection-rule-management
# The #CC# prefix delineates Code Coverage,
# used for the 'team' designator within Kibana Stats

x-pack/test_serverless/api_integration/test_suites/common/platform_security @elastic/kibana-security

# Data Discovery
/x-pack/test_serverless/functional/es_archives/pre_calculated_histogram @elastic/kibana-data-discovery
/x-pack/test_serverless/functional/es_archives/kibana_sample_data_flights_index_pattern @elastic/kibana-data-discovery
Expand Down Expand Up @@ -1511,7 +1513,6 @@ x-pack/test/api_integration/apis/management/index_management/inference_endpoints
/x-pack/test/functional/es_archives/auditbeat/default @elastic/security-solution
/x-pack/test/functional/es_archives/auditbeat/hosts @elastic/security-solution
/x-pack/test_serverless/functional/page_objects/svl_management_page.ts @elastic/security-solution
/x-pack/test_serverless/api_integration/test_suites/common/platform_security/ @elastic/security-solution
/x-pack/test_serverless/api_integration/test_suites/security @elastic/security-solution
/x-pack/test_serverless/functional/page_objects/svl_sec_landing_page.ts @elastic/security-solution

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/add-fleet-issues-to-ingest-project.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
name: Add Fleet issue to Platform Ingest project
name: Add Fleet issue to Platform Ingest - UI & Integrations project

on:
issues:
types:
- labeled

env:
INGEST_PROJECT_ID: 'PVT_kwDOAGc3Zs4AEzn4'
INGEST_PROJECT_ID: 'PVT_kwDOAGc3Zs4AogrP'
FLEET_LABEL: 'Team:Fleet'
AREA_FIELD_ID: 'PVTSSF_lADOAGc3Zs4AEzn4zgEgZSo'
AREA_FIELD_ID: 'PVTSSF_lADOAGc3Zs4AogrPzggEiBs'
FLEET_UI_OPTION_ID: '411a7b86'

jobs:
Expand Down
2 changes: 1 addition & 1 deletion docs/management/connectors/action-types/gemini.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Name:: The name of the connector.
API URL:: The {gemini} request URL.
Project ID:: The project which has Vertex AI endpoint enabled.
Region:: The GCP region where the Vertex AI endpoint enabled.
Default model:: The GAI model for {gemini} to use. Current support is for the Google Gemini models, defaulting to gemini-1.5-pro-001. The model can be set on a per request basis by including a "model" parameter alongside the request body.
Default model:: The GAI model for {gemini} to use. Current support is for the Google Gemini models, defaulting to gemini-1.5-pro-002. The model can be set on a per request basis by including a "model" parameter alongside the request body.
Credentials JSON:: The GCP service account JSON file for authentication.

[float]
Expand Down
4 changes: 2 additions & 2 deletions docs/settings/alert-action-settings.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ The default model to use for requests, which varies by connector:
+
--
* For an <<bedrock-action-type,{bedrock} connector>>, current support is for the Anthropic Claude models. Defaults to `anthropic.claude-3-5-sonnet-20240620-v1:0`.
* For a <<gemini-action-type,{gemini} connector>>, current support is for the Gemini models. Defaults to `gemini-1.5-pro-001`.
* For a <<gemini-action-type,{gemini} connector>>, current support is for the Gemini models. Defaults to `gemini-1.5-pro-002`.
* For a <<openai-action-type,OpenAI connector>>, it is optional and applicable only when `xpack.actions.preconfigured.<connector-id>.config.apiProvider` is `OpenAI`.
--

Expand Down Expand Up @@ -491,7 +491,7 @@ For an <<bedrock-action-type,{bedrock} connector>>, specifies the AWS access key
`xpack.actions.preconfigured.<connector-id>.secrets.apikey`::
An API key secret that varies by connector:

`xpack.actions.preconfigured.<connector-id>.secrets.credentialsJSON`::
`xpack.actions.preconfigured.<connector-id>.secrets.credentialsJson`::
For an <<gemini-action-type,{gemini} connector>>, specifies the GCP service account credentials JSON file for authentication.
+
--
Expand Down
4 changes: 3 additions & 1 deletion docs/user/ml/index.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,14 @@ image::user/ml/images/ml-data-visualizer-sample.png[{data-viz} for sample flight
You can upload different file formats for analysis with the *{data-viz}*.

File formats supported up to 500 MB:

* CSV
* TSV
* NDJSON
* Log files

File formats supported up to 60 MB:

* PDF
* Microsoft Office files (Word, Excel, PowerPoint)
* Plain Text (TXT)
Expand Down Expand Up @@ -258,4 +260,4 @@ menu. If the split field is selected, you can either select specific charts
(partitions) or set the maximum number of top change points to plot. It's
possible to preserve the applied time range or use the time bound from the page
date picker. You can also add or edit change point charts directly from the
**Dashboard** app.
**Dashboard** app.
1 change: 1 addition & 0 deletions oas_docs/output/kibana.serverless.staging.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8096,6 +8096,7 @@ paths:
- Security Endpoint Management API
/api/endpoint/suggestions/{suggestion_type}:
post:
deprecated: true
operationId: GetEndpointSuggestions
parameters:
- in: path
Expand Down
1 change: 1 addition & 0 deletions oas_docs/output/kibana.serverless.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8096,6 +8096,7 @@ paths:
- Security Endpoint Management API
/api/endpoint/suggestions/{suggestion_type}:
post:
deprecated: true
operationId: GetEndpointSuggestions
parameters:
- in: path
Expand Down
1 change: 1 addition & 0 deletions oas_docs/output/kibana.staging.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11468,6 +11468,7 @@ paths:
- Security Endpoint Management API
/api/endpoint/suggestions/{suggestion_type}:
post:
deprecated: true
operationId: GetEndpointSuggestions
parameters:
- in: path
Expand Down
1 change: 1 addition & 0 deletions oas_docs/output/kibana.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11468,6 +11468,7 @@ paths:
- Security Endpoint Management API
/api/endpoint/suggestions/{suggestion_type}:
post:
deprecated: true
operationId: GetEndpointSuggestions
parameters:
- in: path
Expand Down
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -1075,7 +1075,6 @@
"classnames": "2.2.6",
"color": "^4.2.3",
"commander": "^4.1.1",
"compare-versions": "3.5.1",
"constate": "^3.3.2",
"copy-to-clipboard": "^3.0.8",
"core-js": "^3.37.1",
Expand Down Expand Up @@ -1200,7 +1199,7 @@
"query-string": "^6.13.2",
"rbush": "^3.0.1",
"re-resizable": "^6.9.9",
"re2js": "0.4.1",
"re2js": "0.4.2",
"react": "^17.0.2",
"react-ace": "^7.0.5",
"react-diff-view": "^3.2.1",
Expand Down
2 changes: 2 additions & 0 deletions packages/deeplinks/search/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,5 @@ export const SERVERLESS_ES_CONNECTORS_ID = 'serverlessConnectors';
export const SERVERLESS_ES_SEARCH_PLAYGROUND_ID = 'searchPlayground';
export const SERVERLESS_ES_SEARCH_INFERENCE_ENDPOINTS_ID = 'searchInferenceEndpoints';
export const SEARCH_HOMEPAGE = 'searchHomepage';
export const SEARCH_INDICES_START = 'elasticsearchStart';
export const SEARCH_INDICES = 'elasticsearchIndices';
8 changes: 7 additions & 1 deletion packages/deeplinks/search/deep_links.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ import {
SERVERLESS_ES_SEARCH_PLAYGROUND_ID,
SERVERLESS_ES_SEARCH_INFERENCE_ENDPOINTS_ID,
SEARCH_HOMEPAGE,
SEARCH_INDICES_START,
SEARCH_INDICES,
} from './constants';

export type EnterpriseSearchApp = typeof ENTERPRISE_SEARCH_APP_ID;
Expand All @@ -34,6 +36,8 @@ export type ConnectorsId = typeof SERVERLESS_ES_CONNECTORS_ID;
export type SearchPlaygroundId = typeof SERVERLESS_ES_SEARCH_PLAYGROUND_ID;
export type SearchInferenceEndpointsId = typeof SERVERLESS_ES_SEARCH_INFERENCE_ENDPOINTS_ID;
export type SearchHomepage = typeof SEARCH_HOMEPAGE;
export type SearchStart = typeof SEARCH_INDICES_START;
export type SearchIndices = typeof SEARCH_INDICES;

export type ContentLinkId = 'searchIndices' | 'connectors' | 'webCrawlers';

Expand All @@ -59,4 +63,6 @@ export type DeepLinkId =
| `${EnterpriseSearchContentApp}:${ContentLinkId}`
| `${EnterpriseSearchApplicationsApp}:${ApplicationsLinkId}`
| `${EnterpriseSearchAppsearchApp}:${AppsearchLinkId}`
| `${EnterpriseSearchRelevanceApp}:${RelevanceLinkId}`;
| `${EnterpriseSearchRelevanceApp}:${RelevanceLinkId}`
| SearchStart
| SearchIndices;
2 changes: 2 additions & 0 deletions packages/kbn-esql-validation-autocomplete/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -76,3 +76,5 @@ export {
} from './src/shared/resources_helpers';

export { wrapAsEditorMessage } from './src/code_actions/utils';

export { getRecommendedQueries } from './src/autocomplete/recommended_queries/templates';
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

import { METADATA_FIELDS } from '../../shared/constants';
import { setup, indexes, integrations } from './helpers';
import { getRecommendedQueries } from '../recommended_queries/templates';

const visibleIndices = indexes
.filter(({ hidden }) => !hidden)
Expand Down Expand Up @@ -72,8 +73,17 @@ describe('autocomplete.suggest', () => {
const metadataFieldsAndIndex = metadataFields.filter((field) => field !== '_index');

test('on <kbd>SPACE</kbd> without comma ",", suggests adding metadata', async () => {
const recommendedQueries = getRecommendedQueries({
fromCommand: '',
timeField: 'dateField',
});
const { assertSuggestions } = await setup();
const expected = ['METADATA $0', ',', '| '].sort();
const expected = [
'METADATA $0',
',',
'| ',
...recommendedQueries.map((query) => query.queryString),
].sort();

await assertSuggestions('from a, b /', expected);
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,9 @@ const setup = async (caret = '?') => {
};

describe('autocomplete.suggest', () => {
test('does not load fields when suggesting within a single FROM, SHOW, ROW command', async () => {
test('does not load fields when suggesting within a single SHOW, ROW command', async () => {
const { suggest, callbacks } = await setup();

await suggest('FROM kib, ? |');
await suggest('FROM ?');
await suggest('FROM ? |');
await suggest('sHoW ?');
await suggest('row ? |');

Expand Down
Loading

0 comments on commit c45b17b

Please sign in to comment.