Skip to content

Commit 93f241f

Browse files
szwarckonradszwarckonrad
authored
Merge branch 'main' into remove-atp-on-policy-unassign
2 parents 67cd49c + 854cb15 commit 93f241f

2,407 files changed

Lines changed: 53419 additions & 52336 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_platform_stateful_configs.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,7 @@ enabled:
4444
- test/api_integration/config.js
4545
- test/examples/config.js
4646
- test/functional/apps/bundles/config.ts
47-
- test/functional/apps/console/monaco/config.ts
48-
- test/functional/apps/console/ace/config.ts
47+
- test/functional/apps/console/config.ts
4948
- test/functional/apps/context/config.ts
5049
- test/functional/apps/dashboard_elements/controls/common/config.ts
5150
- test/functional/apps/dashboard_elements/controls/options_list/config.ts

‎.buildkite/pipeline-utils/ci-stats/pick_test_group_run_order.ts‎

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,32 @@ function getEnabledFtrConfigs(patterns?: string[]) {
197197
}
198198
}
199199

200+
/**
201+
* Collects environment variables from labels on the PR
202+
* TODO: extract this (and other functions from this big file) to a separate module
203+
*/
204+
function collectEnvFromLabels() {
205+
const LABEL_MAPPING: Record<string, Record<string, string>> = {
206+
'ci:use-chrome-beta': {
207+
USE_CHROME_BETA: 'true',
208+
},
209+
};
210+
211+
const envFromlabels: Record<string, string> = {};
212+
if (!process.env.GITHUB_PR_LABELS) {
213+
return envFromlabels;
214+
} else {
215+
const labels = process.env.GITHUB_PR_LABELS.split(',');
216+
labels.forEach((label) => {
217+
const env = LABEL_MAPPING[label];
218+
if (env) {
219+
Object.assign(envFromlabels, env);
220+
}
221+
});
222+
return envFromlabels;
223+
}
224+
}
225+
200226
export async function pickTestGroupRunOrder() {
201227
const bk = new BuildkiteClient();
202228
const ciStats = new CiStatsClient();
@@ -273,9 +299,10 @@ export async function pickTestGroupRunOrder() {
273299
.filter(Boolean)
274300
: ['build'];
275301

276-
const FTR_EXTRA_ARGS: Record<string, string> = process.env.FTR_EXTRA_ARGS
302+
const ftrExtraArgs: Record<string, string> = process.env.FTR_EXTRA_ARGS
277303
? { FTR_EXTRA_ARGS: process.env.FTR_EXTRA_ARGS }
278304
: {};
305+
const envFromlabels: Record<string, string> = collectEnvFromLabels();
279306

280307
const { defaultQueue, ftrConfigsByQueue } = getEnabledFtrConfigs(FTR_CONFIG_PATTERNS);
281308

@@ -514,7 +541,8 @@ export async function pickTestGroupRunOrder() {
514541
agents: expandAgentQueue(queue),
515542
env: {
516543
FTR_CONFIG_GROUP_KEY: key,
517-
...FTR_EXTRA_ARGS,
544+
...ftrExtraArgs,
545+
...envFromlabels,
518546
},
519547
retry: {
520548
automatic: [

‎.buildkite/scripts/steps/cloud/deploy.json‎

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -161,33 +161,6 @@
161161
"ref_id": "main-elasticsearch"
162162
}
163163
],
164-
"enterprise_search": [
165-
{
166-
"elasticsearch_cluster_ref_id": "main-elasticsearch",
167-
"region": "gcp-us-west2",
168-
"plan": {
169-
"cluster_topology": [
170-
{
171-
"node_type": {
172-
"connector": true,
173-
"appserver": true,
174-
"worker": true
175-
},
176-
"instance_configuration_id": "gcp.enterprisesearch.1",
177-
"zone_count": 1,
178-
"size": {
179-
"resource": "memory",
180-
"value": 2048
181-
}
182-
}
183-
],
184-
"enterprise_search": {
185-
"version": null
186-
}
187-
},
188-
"ref_id": "main-enterprise_search"
189-
}
190-
],
191164
"kibana": [
192165
{
193166
"elasticsearch_cluster_ref_id": "main-elasticsearch",

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,13 @@ if [ "$BUILDKITE_PIPELINE_SLUG" == "kibana-performance-data-set-extraction" ]; t
3939
node scripts/run_performance.js --kibana-install-dir "$KIBANA_BUILD_LOCATION" --skip-warmup
4040
else
4141
# pipeline should use bare metal static worker
42-
echo "--- Running performance tests"
43-
node scripts/run_performance.js --kibana-install-dir "$KIBANA_BUILD_LOCATION"
42+
if [[ -z "${JOURNEYS_GROUP+x}" ]]; then
43+
echo "--- Running performance tests"
44+
node scripts/run_performance.js --kibana-install-dir "$KIBANA_BUILD_LOCATION"
45+
else
46+
echo "--- Running performance tests: '$JOURNEYS_GROUP' group"
47+
node scripts/run_performance.js --kibana-install-dir "$KIBANA_BUILD_LOCATION" --group "$JOURNEYS_GROUP"
48+
fi
4449
fi
4550

4651
echo "--- Upload journey step screenshots"

‎.buildkite/scripts/steps/storybooks/build_and_upload.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ const STORYBOOKS = [
2222
'coloring',
2323
'chart_icons',
2424
'content_management_examples',
25-
'controls',
2625
'custom_integrations',
2726
'dashboard_enhanced',
2827
'dashboard',

‎.buildkite/scripts/steps/test/ftr_configs.sh‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,19 @@ while read -r config; do
5757

5858
start=$(date +%s)
5959

60+
if [[ "${USE_CHROME_BETA:-}" =~ ^(1|true)$ ]]; then
61+
echo "USE_CHROME_BETA was set - using google-chrome-beta"
62+
export TEST_BROWSER_BINARY_PATH="$(which google-chrome-beta)"
63+
64+
# download the beta version of chromedriver
65+
export CHROMEDRIVER_VERSION=$(curl https://googlechromelabs.github.io/chrome-for-testing/last-known-good-versions.json -s | jq -r '.channels.Beta.version')
66+
export DETECT_CHROMEDRIVER_VERSION=false
67+
node node_modules/chromedriver/install.js --chromedriver-force-download
68+
69+
# set annotation on the build
70+
buildkite-agent annotate --style info --context chrome-beta "This build uses Google Chrome Beta @ ${CHROMEDRIVER_VERSION}"
71+
fi
72+
6073
# prevent non-zero exit code from breaking the loop
6174
set +e;
6275
node ./scripts/functional_tests \

‎.devcontainer/.env.template‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# /bin/bash or /bin/zsh (oh-my-zsh is installed by default as well)
22
SHELL=/bin/bash
3-
# Switch to 1 to enable FIPS environment, any other value to disable
3+
# Switch to 1 to enable FIPS environment, any other value to disable,
4+
# then close and reopen a new terminal to setup the environment
45
FIPS=0

‎.devcontainer/Dockerfile‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@ WORKDIR ${KBN_DIR}
4949

5050
# Node and NVM setup
5151
COPY .node-version /tmp/
52+
53+
USER vscode
54+
5255
RUN mkdir -p $NVM_DIR && \
5356
curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh | bash && \
5457
. "$NVM_DIR/nvm.sh" && \
@@ -61,6 +64,8 @@ RUN mkdir -p $NVM_DIR && \
6164
echo "source $NVM_DIR/nvm.sh" >> ${HOME}/.zshrc && \
6265
chown -R 1000:1000 "${HOME}/.npm"
6366

67+
USER root
68+
6469
# Reload the env everytime a new shell is opened incase the .env file changed.
6570
RUN echo "source $KBN_DIR/.devcontainer/scripts/env.sh" >> ${HOME}/.bashrc && \
6671
echo "source $KBN_DIR/.devcontainer/scripts/env.sh" >> ${HOME}/.zshrc

‎.github/CODEOWNERS‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,12 @@ packages/core/execution-context/core-execution-context-server-mocks @elastic/kib
183183
packages/core/fatal-errors/core-fatal-errors-browser @elastic/kibana-core
184184
packages/core/fatal-errors/core-fatal-errors-browser-internal @elastic/kibana-core
185185
packages/core/fatal-errors/core-fatal-errors-browser-mocks @elastic/kibana-core
186+
packages/core/feature-flags/core-feature-flags-browser @elastic/kibana-core
187+
packages/core/feature-flags/core-feature-flags-browser-internal @elastic/kibana-core
188+
packages/core/feature-flags/core-feature-flags-browser-mocks @elastic/kibana-core
189+
packages/core/feature-flags/core-feature-flags-server @elastic/kibana-core
190+
packages/core/feature-flags/core-feature-flags-server-internal @elastic/kibana-core
191+
packages/core/feature-flags/core-feature-flags-server-mocks @elastic/kibana-core
186192
test/plugin_functional/plugins/core_history_block @elastic/kibana-core
187193
packages/core/http/core-http-browser @elastic/kibana-core
188194
packages/core/http/core-http-browser-internal @elastic/kibana-core
@@ -453,6 +459,7 @@ examples/expressions_explorer @elastic/kibana-visualizations
453459
src/plugins/expressions @elastic/kibana-visualizations
454460
packages/kbn-failed-test-reporter-cli @elastic/kibana-operations @elastic/appex-qa
455461
examples/feature_control_examples @elastic/kibana-security
462+
examples/feature_flags_example @elastic/kibana-core
456463
x-pack/test/plugin_api_integration/plugins/feature_usage_test @elastic/kibana-security
457464
x-pack/plugins/features @elastic/kibana-core
458465
x-pack/test/functional_execution_context/plugins/alerts @elastic/kibana-core
@@ -1759,7 +1766,7 @@ x-pack/plugins/security_solution/server/lib/security_integrations @elastic/secur
17591766
/x-pack/plugins/monitoring/**/*.scss @elastic/observability-design
17601767

17611768
# Ent. Search design
1762-
/x-pack/plugins/enterprise_search/**/*.scss @elastic/ent-search-design
1769+
/x-pack/plugins/enterprise_search/**/*.scss @elastic/search-design
17631770

17641771
# Security design
17651772
/x-pack/plugins/endpoint/**/*.scss @elastic/security-design

‎.github/workflows/codeql.yml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,3 +54,34 @@ jobs:
5454
category: "/language:${{matrix.language}}"
5555
ref: ${{ env.CHECKOUT_REF }}
5656
sha: ${{ env.CHECKOUT_SHA }}
57+
alert:
58+
name: Alert
59+
runs-on: ubuntu-latest
60+
needs: analyze
61+
if: github.repository == 'elastic/kibana' # Hack: Do not run on forks
62+
steps:
63+
- name: Checkout kibana-operations
64+
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
65+
with:
66+
repository: 'elastic/kibana-operations'
67+
ref: main
68+
path: ./kibana-operations
69+
token: ${{secrets.KIBANAMACHINE_TOKEN}}
70+
71+
- name: CodeQL alert
72+
working-directory: ./kibana-operations/triage
73+
env:
74+
GITHUB_TOKEN: ${{secrets.KIBANAMACHINE_TOKEN}}
75+
SLACK_TOKEN: ${{secrets.CODE_SCANNING_SLACK_TOKEN}}
76+
run: |
77+
npm ci --omit=dev
78+
node codeql-alert
79+
80+
- name: CodeQL alert statistics
81+
working-directory: ./kibana-operations/triage
82+
env:
83+
GITHUB_TOKEN: ${{secrets.KIBANAMACHINE_TOKEN}}
84+
SLACK_TOKEN: ${{secrets.CODE_SCANNING_SLACK_TOKEN}}
85+
run: |
86+
npm ci --omit=dev
87+
node codeql-alert-stats

0 commit comments

Comments
 (0)