Skip to content

Commit ae4da53

Browse files
author
Sébastien Loix
authored
Merge branch 'main' into serverless/fix-background-color
2 parents 53561ec + 813eebe commit ae4da53

333 files changed

Lines changed: 4062 additions & 2756 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: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,18 @@ disabled:
8181
# Serverless configs, currently only for manual tests runs, CI integration planned
8282
- x-pack/test_serverless/api_integration/test_suites/common/config.ts
8383
- x-pack/test_serverless/api_integration/test_suites/observability/config.ts
84+
- x-pack/test_serverless/api_integration/test_suites/observability/config.feature_flags.ts
8485
- x-pack/test_serverless/api_integration/test_suites/search/config.ts
86+
- x-pack/test_serverless/api_integration/test_suites/search/config.feature_flags.ts
8587
- x-pack/test_serverless/api_integration/test_suites/security/config.ts
88+
- x-pack/test_serverless/api_integration/test_suites/security/config.feature_flags.ts
8689
- x-pack/test_serverless/functional/test_suites/common/config.ts
8790
- x-pack/test_serverless/functional/test_suites/observability/config.ts
91+
- x-pack/test_serverless/functional/test_suites/observability/config.feature_flags.ts
8892
- x-pack/test_serverless/functional/test_suites/search/config.ts
93+
- x-pack/test_serverless/functional/test_suites/search/config.feature_flags.ts
8994
- x-pack/test_serverless/functional/test_suites/security/config.ts
95+
- x-pack/test_serverless/functional/test_suites/security/config.feature_flags.ts
9096

9197
defaultQueue: 'n2-4-spot'
9298
enabled:

‎.buildkite/pipelines/quality-gates/pipeline.kibana-tests.yaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
env:
2+
ENVIRONMENT: ${ENVIRONMENT?}
3+
4+
steps:
5+
- label: ":pipeline::grey_question::seedling: Trigger Kibana Tests for ${ENVIRONMENT}"
6+
env:
7+
QG_PIPELINE_LOCATION: ".buildkite/pipelines/quality-gates"
8+
command: "make -C /agent run-environment-tests"
9+
agents:
10+
image: "docker.elastic.co/ci-agent-images/quality-gate-seedling:0.0.2"

‎.buildkite/pipelines/quality-gates/pipeline.tests-production.yaml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
steps:
2+
- label: ":pipeline::kibana::seedling: Trigger Kibana Tests for ${ENVIRONMENT}"
3+
command: echo "replace me with Kibana specific tests"
4+
agent:
5+
image: "docker.elastic.co/ci-agent-images/basic-buildkite-agent:1688566364"
6+
7+
- label: ":pipeline::fleet::seedling: Trigger Fleet Kibana Tests for ${ENVIRONMENT}"
8+
command: echo "replace me with Fleet specific Kibana tests"
9+
agent:
10+
image: "docker.elastic.co/ci-agent-images/basic-buildkite-agent:1688566364"
11+
12+
- label: ":pipeline::lock::seedling: Trigger Security Kibana Tests for ${ENVIRONMENT}"
13+
command: echo "replace me with Security specific Kibana tests"
14+
agent:
15+
image: "docker.elastic.co/ci-agent-images/basic-buildkite-agent:1688566364"

‎.buildkite/pipelines/quality-gates/pipeline.tests-qa.yaml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
steps:
2+
- label: ":pipeline::kibana::seedling: Trigger Kibana Tests for ${ENVIRONMENT}"
3+
command: echo "replace me with Kibana specific tests"
4+
agent:
5+
image: "docker.elastic.co/ci-agent-images/basic-buildkite-agent:1688566364"
6+
7+
- label: ":pipeline::fleet::seedling: Trigger Fleet Kibana Tests for ${ENVIRONMENT}"
8+
command: echo "replace me with Fleet specific Kibana tests"
9+
agent:
10+
image: "docker.elastic.co/ci-agent-images/basic-buildkite-agent:1688566364"
11+
12+
- label: ":pipeline::lock::seedling: Trigger Security Kibana Tests for ${ENVIRONMENT}"
13+
command: echo "replace me with Security specific Kibana tests"
14+
agent:
15+
image: "docker.elastic.co/ci-agent-images/basic-buildkite-agent:1688566364"

‎.buildkite/pipelines/quality-gates/pipeline.tests-staging.yaml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
steps:
2+
- label: ":pipeline::kibana::seedling: Trigger Kibana Tests for ${ENVIRONMENT}"
3+
command: echo "replace me with Kibana specific tests"
4+
agent:
5+
image: "docker.elastic.co/ci-agent-images/basic-buildkite-agent:1688566364"
6+
7+
- label: ":pipeline::fleet::seedling: Trigger Fleet Kibana Tests for ${ENVIRONMENT}"
8+
command: echo "replace me with Fleet specific Kibana tests"
9+
agent:
10+
image: "docker.elastic.co/ci-agent-images/basic-buildkite-agent:1688566364"
11+
12+
- label: ":pipeline::lock::seedling: Trigger Security Kibana Tests for ${ENVIRONMENT}"
13+
command: echo "replace me with Security specific Kibana tests"
14+
agent:
15+
image: "docker.elastic.co/ci-agent-images/basic-buildkite-agent:1688566364"

‎.buildkite/scripts/steps/functional/serverless_ftr.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,20 @@ export JOB="kibana-serverless-$SERVERLESS_ENVIRONMENT"
99
if [[ "$SERVERLESS_ENVIRONMENT" == "search" ]]; then
1010
SERVERLESS_CONFIGS=(
1111
"x-pack/test_serverless/api_integration/test_suites/search/config.ts"
12+
"x-pack/test_serverless/api_integration/test_suites/search/config.feature_flags.ts"
1213
"x-pack/test_serverless/functional/test_suites/search/config.ts"
1314
)
1415
elif [[ "$SERVERLESS_ENVIRONMENT" == "observability" ]]; then
1516
SERVERLESS_CONFIGS=(
1617
"x-pack/test_serverless/api_integration/test_suites/observability/config.ts"
18+
"x-pack/test_serverless/api_integration/test_suites/observability/config.feature_flags.ts"
1719
"x-pack/test_serverless/functional/test_suites/observability/config.ts"
1820
"x-pack/test_serverless/functional/test_suites/observability/cypress/config_headless.ts"
1921
)
2022
elif [[ "$SERVERLESS_ENVIRONMENT" == "security" ]]; then
2123
SERVERLESS_CONFIGS=(
2224
"x-pack/test_serverless/api_integration/test_suites/security/config.ts"
25+
"x-pack/test_serverless/api_integration/test_suites/security/config.feature_flags.ts"
2326
"x-pack/test_serverless/functional/test_suites/security/config.ts"
2427
)
2528
fi

‎.github/CODEOWNERS‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ packages/analytics/shippers/elastic_v3/server @elastic/kibana-core
3636
packages/analytics/shippers/fullstory @elastic/kibana-core
3737
packages/analytics/shippers/gainsight @elastic/kibana-core
3838
packages/kbn-apm-config-loader @elastic/kibana-core @vigneshshanmugam
39+
x-pack/plugins/apm_data_access @elastic/apm-ui
3940
x-pack/plugins/apm @elastic/apm-ui
4041
packages/kbn-apm-synthtrace @elastic/apm-ui
4142
packages/kbn-apm-synthtrace-client @elastic/apm-ui
@@ -987,6 +988,7 @@ x-pack/plugins/infra/server/lib/alerting @elastic/actionable-observability
987988
/.buildkite/ @elastic/kibana-operations
988989
/kbn_pm/ @elastic/kibana-operations
989990
/x-pack/dev-tools @elastic/kibana-operations
991+
catalog-info.yaml @elastic/kibana-operations @elastic/kibana-tech-leads
990992

991993
# Appex QA
992994
/src/dev/code_coverage @elastic/appex-qa

‎catalog-info.yaml‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
---
2+
apiVersion: backstage.io/v1alpha1
3+
kind: Component
4+
metadata:
5+
name: kibana
6+
description: Kibana is a user interface that lets you visualize your Elasticsearch data and navigate the Elastic Stack.
7+
8+
annotations:
9+
backstage.io/source-location: url:https://github.com/elastic/kibana/tree/main
10+
github.com/project-slug: elastic/kibana
11+
github.com/team-slug: elastic/kibana-tech-leads
12+
buildkite.com/project-slug: elastic/kibana
13+
14+
tags:
15+
- typescript
16+
- javascript
17+
- dashboards
18+
- metrics
19+
- visualizations
20+
- observability
21+
22+
links:
23+
- title: Documentation
24+
url: https://www.elastic.co/guide/en/kibana/current/index.html
25+
26+
spec:
27+
type: monorepo
28+
owner: group:kibana-tech-leads
29+
lifecycle: production
30+
31+
---
32+
33+
apiVersion: backstage.io/v1alpha1
34+
kind: Resource
35+
metadata:
36+
name: kibana-tests-pipeline
37+
description: Definition of the kibana pipeline
38+
links:
39+
- title: Pipeline
40+
url: https://buildkite.com/elastic/kibana-tests
41+
spec:
42+
type: buildkite-pipeline
43+
owner: group:kibana-tech-leads
44+
system: buildkite
45+
implementation:
46+
apiVersion: buildkite.elastic.dev/v1
47+
kind: Pipeline
48+
metadata:
49+
name: kibana-tests
50+
description: Pipeline that tests the service integration in various environments
51+
spec:
52+
repository: elastic/kibana
53+
pipeline_file: ./.buildkite/pipelines/pipeline.kibana-tests.yaml
54+
provider_settings:
55+
trigger_mode: none
56+
teams:
57+
kibana-operations:
58+
access_level: MANAGE_BUILD_AND_READ
59+
security-engineering-productivity:
60+
access_level: BUILD_AND_READ
61+
fleet:
62+
access_level: BUILD_AND_READ
63+
kibana-tech-leads:
64+
access_level: BUILD_AND_READ
65+
kibana-core:
66+
access_level: BUILD_AND_READ
67+
cloud-tooling:
68+
access_level: BUILD_AND_READ
69+
everyone:
70+
access_level: READ_ONLY

‎docs/developer/architecture/core/configuration-service.asciidoc‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,3 +212,22 @@ export const config = {
212212
}),
213213
};
214214
----
215+
216+
For Serverless vs. Traditional configuration, you are encouraged to use the `offeringBasedSchema` helper:
217+
218+
[source,js]
219+
----
220+
import { schema, offeringBasedSchema } from '@kbn/config-schema'
221+
222+
export const config = {
223+
schema: schema.object({
224+
// Enabled by default in Dev mode
225+
enabled: schema.boolean({ defaultValue: schema.contextRef('dev') }),
226+
227+
// Setting only allowed in the Serverless offering
228+
plansForWorldPeace: offeringBasedSchema({
229+
serverless: schema.string({ defaultValue: 'Free hugs' }),
230+
}),
231+
}),
232+
};
233+
----

‎docs/developer/plugin-list.asciidoc‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -434,6 +434,10 @@ The plugin exposes the static DefaultEditorController class to consume.
434434
|This plugin provides access to App Monitoring features provided by Elastic. It allows you to monitor your software services and applications in real-time; visualize detailed performance information on your services, identify and analyze errors, and monitor host-level and APM agent-specific metrics like JVM and Go runtime metrics.
435435
436436
437+
|{kib-repo}blob/{branch}/x-pack/plugins/apm_data_access[apmDataAccess]
438+
|WARNING: Missing README.
439+
440+
437441
|{kib-repo}blob/{branch}/x-pack/plugins/asset_manager/README.md[assetManager]
438442
|This plugin provides access to the asset data stored in assets-* indices, primarily
439443
for inventory and topology purposes.

0 commit comments

Comments
 (0)