Skip to content

Commit 8899a1c

Browse files
committed
Merge branch 'main' of github.com:elastic/kibana into afharo/spacetime-bundle-improvements-target_web
2 parents 5f07ca9 + 5f06375 commit 8899a1c

File tree

2,130 files changed

+50394
-31539
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,130 files changed

+50394
-31539
lines changed

.buildkite/scripts/common/setup_bazel.sh

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,29 @@ cat <<EOF > $KIBANA_DIR/.bazelrc
1111
build --build_metadata=ROLE=CI
1212
EOF
1313

14-
if [[ "${BAZEL_CACHE_MODE:-none}" == read* ]]; then
15-
echo "[bazel] enabling caching"
14+
BAZEL_CACHE_MODE=${BAZEL_CACHE_MODE:-gcs}
15+
16+
if [[ "$BAZEL_CACHE_MODE" == "gcs" ]]; then
17+
echo "[bazel] enabling caching with GCS buckets"
18+
19+
BAZEL_REGION="us-central1"
20+
if [[ "$(curl -is metadata.google.internal || true)" ]]; then
21+
# projects/1003139005402/zones/us-central1-a -> us-central1-a -> us-central1
22+
BAZEL_REGION=$(curl -sH Metadata-Flavor:Google http://metadata.google.internal/computeMetadata/v1/instance/zone | rev | cut -d'/' -f1 | cut -c3- | rev)
23+
fi
24+
25+
BAZEL_BUCKET="kibana-ci-bazel_$BAZEL_REGION"
26+
27+
echo "[bazel] using GCS bucket: $BAZEL_BUCKET"
28+
29+
cat <<EOF >> $KIBANA_DIR/.bazelrc
30+
build --remote_cache=https://storage.googleapis.com/$BAZEL_BUCKET
31+
build --google_default_credentials
32+
EOF
33+
fi
34+
35+
if [[ "$BAZEL_CACHE_MODE" == "buildbuddy" ]]; then
36+
echo "[bazel] enabling caching with Buildbuddy"
1637
cat <<EOF >> $KIBANA_DIR/.bazelrc
1738
build --bes_results_url=https://app.buildbuddy.io/invocation/
1839
build --bes_backend=grpcs://remote.buildbuddy.io
@@ -22,14 +43,7 @@ cat <<EOF >> $KIBANA_DIR/.bazelrc
2243
EOF
2344
fi
2445

25-
if [[ "${BAZEL_CACHE_MODE:-none}" == "read" ]]; then
26-
echo "[bazel] cache set to read-only"
27-
cat <<EOF >> $KIBANA_DIR/.bazelrc
28-
build --noremote_upload_local_results
29-
EOF
30-
fi
31-
32-
if [[ "${BAZEL_CACHE_MODE:-none}" != @(read|read-write|none|) ]]; then
33-
echo "invalid value for BAZEL_CACHE_MODE received ($BAZEL_CACHE_MODE), expected one of [read,read-write,none]"
46+
if [[ "$BAZEL_CACHE_MODE" != @(gcs|buildbuddy|none|) ]]; then
47+
echo "invalid value for BAZEL_CACHE_MODE received ($BAZEL_CACHE_MODE), expected one of [gcs,buildbuddy,none]"
3448
exit 1
3549
fi

.buildkite/scripts/pipelines/pull_request/pipeline.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ const SKIPPABLE_PATHS = [
2020
/^\.github\//,
2121
/\.md$/,
2222
/^\.backportrc\.json$/,
23+
/^nav-kibana-dev\.docnav\.json$/,
2324
];
2425

2526
const REQUIRED_PATHS = [

.buildkite/scripts/steps/bazel_cache/bootstrap_mac.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -euo pipefail
44

5-
export BAZEL_CACHE_MODE=read-write
5+
export BAZEL_CACHE_MODE=buildbuddy
66
export DISABLE_BOOTSTRAP_VALIDATION=true
77

88
# Since our Mac agents are currently static,

.buildkite/scripts/steps/on_merge_ts_refs_api_docs.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -euo pipefail
44

5-
export BAZEL_CACHE_MODE=read-write # Populate bazel remote cache for linux
5+
export BAZEL_CACHE_MODE=buildbuddy # Populate Buildbuddy bazel remote cache for linux
66
export BUILD_TS_REFS_CACHE_ENABLE=true
77
export BUILD_TS_REFS_CACHE_CAPTURE=true
88
export DISABLE_BOOTSTRAP_VALIDATION=true

.buildkite/scripts/steps/storybooks/build_and_upload.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const STORYBOOKS = [
2020
'custom_integrations',
2121
'dashboard_enhanced',
2222
'dashboard',
23-
'data_enhanced',
23+
'data',
2424
'embeddable',
2525
'expression_error',
2626
'expression_image',

.github/CODEOWNERS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@
7979
/src/plugins/inspector/ @elastic/kibana-app-services
8080
/src/plugins/unified_search/ @elastic/kibana-app-services
8181
/x-pack/examples/ui_actions_enhanced_examples/ @elastic/kibana-app-services
82-
/x-pack/plugins/data_enhanced/ @elastic/kibana-app-services
8382
/x-pack/plugins/embeddable_enhanced/ @elastic/kibana-app-services
8483
/x-pack/plugins/ui_actions_enhanced/ @elastic/kibana-app-services
8584
/x-pack/plugins/runtime_fields @elastic/kibana-app-services

0 commit comments

Comments
 (0)