Skip to content

Commit f2bd0e0

Browse files
committed
Merge branch 'master' into alerts/rename-resolved-to-recovered
* master: (119 commits) [Uptime] Fix headers io-ts type (#84089) [fleet] Add config options to accepted docker env vars (#84338) [Fleet] Support URL query state in agent logs UI (#84298) [basePathProxy] include query in redirect (#84356) [Security Solution] Add Endpoint policy feature checks (#83972) Fix issues with show_license_expiration (#84361) [Security Solution][Resolver] Add support for predefined schemas for endpoint and winlogbeat (#84103) [cli/dev] log a warning when --no-base-path is used with --dev (#84354) [Fleet] Support input-level vars & templates (#83878) [APM] Elastic chart issues (#84238) [Time to Visualize] Fix Unlink Action via Rollback of ReplacePanel (#83873) redirect to visualize listing page when by value visualization editor doesn't have a value input (#84287) add live region for field search (#84310) [ML] Persisted URL state for Anomalies table (#84314) [dev/cli] detect worker type using env, not cluster module (#83977) [Workplace Search] Migrate DisplaySettings tree (#84283) Deprecate `xpack.task_manager.index` setting (#84155) [Search] Search batching using bfetch (again) (#84043) Use .kibana instead of .kibana_current to mark migration completion (#83373) [Monitoring] Only look at ES for the missing data alert for now (#83839) ...
2 parents 0d57716 + a4c8dca commit f2bd0e0

File tree

1,333 files changed

+32554
-15592
lines changed

Some content is hidden

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

1,333 files changed

+32554
-15592
lines changed

.ci/build_docker.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,8 @@ cd "$(dirname "${0}")"
77
cp /usr/local/bin/runbld ./
88
cp /usr/local/bin/bash_standard_lib.sh ./
99

10-
docker build -t kibana-ci -f ./Dockerfile .
10+
if which docker >/dev/null; then
11+
docker build -t kibana-ci -f ./Dockerfile .
12+
else
13+
echo "Docker binary is not available. Skipping the docker build this time."
14+
fi

.ci/es-snapshots/Jenkinsfile_verify_es

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ kibanaPipeline(timeoutMinutes: 150) {
5555
'xpack-ciGroup8': kibanaPipeline.xpackCiGroupProcess(8),
5656
'xpack-ciGroup9': kibanaPipeline.xpackCiGroupProcess(9),
5757
'xpack-ciGroup10': kibanaPipeline.xpackCiGroupProcess(10),
58+
'xpack-ciGroup11': kibanaPipeline.xpackCiGroupProcess(11),
5859
]),
5960
])
6061
}

.ci/jobs.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ JOB:
3131
- x-pack-ciGroup8
3232
- x-pack-ciGroup9
3333
- x-pack-ciGroup10
34+
- x-pack-ciGroup11
3435
- x-pack-accessibility
3536
- x-pack-visualRegression
3637

.ci/packer_cache_for_branch.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ tar -cf "$HOME/.kibana/bootstrap_cache/$branch.tar" \
4949
.chromium \
5050
.es \
5151
.chromedriver \
52-
.geckodriver;
52+
.geckodriver \
53+
.yarn-local-mirror;
5354

5455
echo "created $HOME/.kibana/bootstrap_cache/$branch.tar"
5556

.github/CODEOWNERS

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,8 @@
6969
/x-pack/plugins/apm/ @elastic/apm-ui
7070
/x-pack/test/functional/apps/apm/ @elastic/apm-ui
7171
/src/plugins/apm_oss/ @elastic/apm-ui
72-
/src/apm.js @watson @vigneshshanmugam
72+
/src/apm.js @elastic/kibana-core @vigneshshanmugam
73+
/packages/kbn-apm-config-loader/ @elastic/kibana-core @vigneshshanmugam
7374
#CC# /src/plugins/apm_oss/ @elastic/apm-ui
7475
#CC# /x-pack/plugins/observability/ @elastic/apm-ui
7576

@@ -132,7 +133,7 @@
132133
/x-pack/test/functional_basic/apps/transform/ @elastic/ml-ui
133134

134135
# Maps
135-
/x-pack/plugins/maps/ @elastic/kibana-gis
136+
#CC# /x-pack/plugins/maps/ @elastic/kibana-gis
136137
/x-pack/test/api_integration/apis/maps/ @elastic/kibana-gis
137138
/x-pack/test/functional/apps/maps/ @elastic/kibana-gis
138139
/x-pack/test/functional/es_archives/maps/ @elastic/kibana-gis
@@ -141,9 +142,8 @@
141142
#CC# /src/plugins/maps_oss/ @elastic/kibana-gis
142143
#CC# /x-pack/plugins/file_upload @elastic/kibana-gis
143144
#CC# /x-pack/plugins/maps_legacy_licensing @elastic/kibana-gis
144-
#CC# /src/plugins/home/server/tutorials @elastic/kibana-gis
145-
#CC# /src/plugins/tile_map/ @elastic/kibana-gis
146-
#CC# /src/plugins/region_map/ @elastic/kibana-gis
145+
/src/plugins/tile_map/ @elastic/kibana-gis
146+
/src/plugins/region_map/ @elastic/kibana-gis
147147

148148
# Operations
149149
/src/dev/ @elastic/kibana-operations
@@ -204,6 +204,28 @@
204204
#CC# /x-pack/plugins/features/ @elastic/kibana-core
205205
#CC# /x-pack/plugins/global_search/ @elastic/kibana-core
206206

207+
# Kibana Telemetry
208+
/packages/kbn-analytics/ @elastic/kibana-core
209+
/packages/kbn-telemetry-tools/ @elastic/kibana-core
210+
/src/plugins/kibana_usage_collection/ @elastic/kibana-core
211+
/src/plugins/newsfeed/ @elastic/kibana-core
212+
/src/plugins/telemetry/ @elastic/kibana-core
213+
/src/plugins/telemetry_collection_manager/ @elastic/kibana-core
214+
/src/plugins/telemetry_management_section/ @elastic/kibana-core
215+
/src/plugins/usage_collection/ @elastic/kibana-core
216+
/x-pack/plugins/telemetry_collection_xpack/ @elastic/kibana-core
217+
/.telemetryrc.json @elastic/kibana-core
218+
/x-pack/.telemetryrc.json @elastic/kibana-core
219+
src/plugins/telemetry/schema/legacy_oss_plugins.json @elastic/kibana-core
220+
src/plugins/telemetry/schema/oss_plugins.json @elastic/kibana-core
221+
x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kibana-core
222+
223+
# Kibana Localization
224+
/src/dev/i18n/ @elastic/kibana-localization @elastic/kibana-core
225+
/src/core/public/i18n/ @elastic/kibana-localization @elastic/kibana-core
226+
/packages/kbn-i18n/ @elastic/kibana-localization @elastic/kibana-core
227+
#CC# /x-pack/plugins/translations/ @elastic/kibana-localization @elastic/kibana-core
228+
207229
# Security
208230
/src/core/server/csp/ @elastic/kibana-security @elastic/kibana-core
209231
/src/plugins/security_oss/ @elastic/kibana-security
@@ -221,28 +243,6 @@
221243
#CC# /x-pack/plugins/security_solution/ @elastic/kibana-security
222244
#CC# /x-pack/plugins/security/ @elastic/kibana-security
223245

224-
# Kibana Localization
225-
/src/dev/i18n/ @elastic/kibana-localization
226-
/src/core/public/i18n/ @elastic/kibana-localization
227-
/packages/kbn-i18n/ @elastic/kibana-localization
228-
#CC# /x-pack/plugins/translations/ @elastic/kibana-localization
229-
230-
# Kibana Telemetry
231-
/packages/kbn-analytics/ @elastic/kibana-telemetry
232-
/packages/kbn-telemetry-tools/ @elastic/kibana-telemetry
233-
/src/plugins/kibana_usage_collection/ @elastic/kibana-telemetry
234-
/src/plugins/newsfeed/ @elastic/kibana-telemetry
235-
/src/plugins/telemetry/ @elastic/kibana-telemetry
236-
/src/plugins/telemetry_collection_manager/ @elastic/kibana-telemetry
237-
/src/plugins/telemetry_management_section/ @elastic/kibana-telemetry
238-
/src/plugins/usage_collection/ @elastic/kibana-telemetry
239-
/x-pack/plugins/telemetry_collection_xpack/ @elastic/kibana-telemetry
240-
/.telemetryrc.json @elastic/kibana-telemetry
241-
/x-pack/.telemetryrc.json @elastic/kibana-telemetry
242-
src/plugins/telemetry/schema/legacy_oss_plugins.json @elastic/kibana-telemetry
243-
src/plugins/telemetry/schema/oss_plugins.json @elastic/kibana-telemetry
244-
x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kibana-telemetry
245-
246246
# Kibana Alerting Services
247247
/x-pack/plugins/alerts/ @elastic/kibana-alerting-services
248248
/x-pack/plugins/actions/ @elastic/kibana-alerting-services

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,3 +75,6 @@ report.asciidoc
7575

7676
# TS incremental build cache
7777
*.tsbuildinfo
78+
79+
# Yarn local mirror content
80+
.yarn-local-mirror

.yarnrc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Configure an offline yarn mirror in the data folder
2+
yarn-offline-mirror ".yarn-local-mirror"
3+
4+
# Always look into the cache first before fetching online
5+
--install.prefer-offline true

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Kibana is your window into the [Elastic Stack](https://www.elastic.co/products).
1313

1414
If you just want to try Kibana out, check out the [Elastic Stack Getting Started Page](https://www.elastic.co/start) to give it a whirl.
1515

16-
If you're interested in diving a bit deeper and getting a taste of Kibana's capabilities, head over to the [Kibana Getting Started Page](https://www.elastic.co/guide/en/kibana/current/getting-started.html).
16+
If you're interested in diving a bit deeper and getting a taste of Kibana's capabilities, head over to the [Kibana Getting Started Page](https://www.elastic.co/guide/en/kibana/current/get-started.html).
1717

1818
### Using a Kibana Release
1919

docs/developer/architecture/add-data-tutorials.asciidoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ Then register the tutorial object by calling `home.tutorials.registerTutorial(tu
2828
String values can contain variables that are substituted when rendered. Variables are specified by `{}`.
2929
For example: `{config.docs.version}` is rendered as `6.2` when running the tutorial in {kib} 6.2.
3030

31-
link:{kib-repo}tree/{branch}/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/replace_template_strings.js#L23[Provided variables]
31+
link:{kib-repo}tree/{branch}/src/plugins/home/public/application/components/tutorial/replace_template_strings.js[Provided variables]
3232

3333
[discrete]
3434
==== Markdown
3535
String values can contain limited Markdown syntax.
3636

37-
link:{kib-repo}tree/{branch}/src/legacy/core_plugins/kibana/public/home/components/tutorial/content.js#L8[Enabled Markdown grammars]
37+
link:{kib-repo}tree/{branch}/src/legacy/core_plugins/kibana/public/home/components/tutorial/content.js[Enabled Markdown grammars]
3838

0 commit comments

Comments
 (0)