Skip to content

Commit 4bd60ba

Browse files
committed
Merge remote-tracking branch 'upstream/master' into fix-search-examples-kibana-version
2 parents c1b8170 + 4dd25fa commit 4bd60ba

File tree

1,498 files changed

+16518
-12332
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,498 files changed

+16518
-12332
lines changed

.ci/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# NOTE: This Dockerfile is ONLY used to run certain tasks in CI. It is not used to run Kibana or as a distributable.
22
# If you're looking for the Kibana Docker image distributable, please see: src/dev/build/tasks/os_packages/docker_generator/templates/dockerfile.template.ts
33

4-
ARG NODE_VERSION=10.22.1
4+
ARG NODE_VERSION=12.19.0
55

66
FROM node:${NODE_VERSION} AS base
77

.ci/packer_cache_for_branch.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ node scripts/es snapshot --download-only;
1818
node scripts/es snapshot --license=oss --download-only;
1919

2020
# download reporting browsers
21-
(cd "x-pack" && yarn gulp downloadChromium);
21+
(cd "x-pack" && node ../node_modules/.bin/gulp downloadChromium);
2222

2323
# cache the chromedriver archive
2424
chromedriverDistVersion="$(node -e "console.log(require('chromedriver').version)")"
@@ -51,10 +51,6 @@ tar -cf "$HOME/.kibana/bootstrap_cache/$branch.tar" \
5151
.chromedriver \
5252
.geckodriver;
5353

54-
echo "Adding node_modules"
55-
# Find all of the node_modules directories that aren't test fixtures, and aren't inside other node_modules directories, and append them to the tar
56-
find . -type d -name node_modules -not -path '*__fixtures__*' -prune -print0 | xargs -0I % tar -rf "$HOME/.kibana/bootstrap_cache/$branch.tar" "%"
57-
5854
echo "created $HOME/.kibana/bootstrap_cache/$branch.tar"
5955

6056
if [[ "$branch" != "master" ]]; then

.eslintrc.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1035,12 +1035,19 @@ module.exports = {
10351035
* Alerting Services overrides
10361036
*/
10371037
{
1038-
// typescript only for front and back end
1038+
// typescript for front and back end
10391039
files: ['x-pack/plugins/{alerts,stack_alerts,actions,task_manager,event_log}/**/*.{ts,tsx}'],
10401040
rules: {
10411041
'@typescript-eslint/no-explicit-any': 'error',
10421042
},
10431043
},
1044+
{
1045+
// typescript only for back end
1046+
files: ['x-pack/plugins/triggers_actions_ui/server/**/*.ts'],
1047+
rules: {
1048+
'@typescript-eslint/no-explicit-any': 'error',
1049+
},
1050+
},
10441051

10451052
/**
10461053
* Lens overrides

.github/CODEOWNERS

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
/src/plugins/vis_type_vislib/ @elastic/kibana-app
2727
/src/plugins/vis_type_xy/ @elastic/kibana-app
2828
/src/plugins/visualize/ @elastic/kibana-app
29-
/src/plugins/visualizations/ @elastic/kibana-application
29+
/src/plugins/visualizations/ @elastic/kibana-app
3030

3131
# Application Services
3232
/examples/bfetch_explorer/ @elastic/kibana-app-arch
@@ -123,8 +123,8 @@
123123
# ML team owns and maintains the transform plugin despite it living in the Elasticsearch management section.
124124
/x-pack/plugins/transform/ @elastic/ml-ui
125125
/x-pack/test/functional/apps/transform/ @elastic/ml-ui
126-
/x-pack/test/functional/services/transform/ @elastic/ml-ui/
127-
x-pack/test/api_integration_basic/apis/ml/ @elastic/ml-ui
126+
/x-pack/test/functional/services/transform/ @elastic/ml-ui
127+
/x-pack/test/api_integration_basic/apis/ml/ @elastic/ml-ui
128128
/x-pack/test/functional_basic/apps/ml/ @elastic/ml-ui
129129

130130
/x-pack/test/api_integration_basic/apis/transform/ @elastic/ml-ui
@@ -137,6 +137,7 @@ x-pack/test/api_integration_basic/apis/ml/ @elastic/ml-ui
137137
/x-pack/test/functional/es_archives/maps/ @elastic/kibana-gis
138138
/x-pack/test/visual_regression/tests/maps/index.js @elastic/kibana-gis
139139
#CC# /src/plugins/maps_legacy/ @elastic/kibana-gis
140+
#CC# /src/plugins/maps_oss/ @elastic/kibana-gis
140141
#CC# /x-pack/plugins/file_upload @elastic/kibana-gis
141142
#CC# /x-pack/plugins/maps_legacy_licensing @elastic/kibana-gis
142143
#CC# /src/plugins/home/server/tutorials @elastic/kibana-gis
@@ -261,6 +262,7 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
261262
# Elasticsearch UI
262263
/src/plugins/dev_tools/ @elastic/es-ui
263264
/src/plugins/console/ @elastic/es-ui
265+
/src/plugins/es_ui_shared/ @elastic/es-ui
264266
/x-pack/plugins/cross_cluster_replication/ @elastic/es-ui
265267
/x-pack/plugins/index_lifecycle_management/ @elastic/es-ui
266268
/x-pack/plugins/console_extensions/ @elastic/es-ui

.github/paths-labeller.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
- "x-pack/plugins/apm/**/*.*"
1313
- "Team:Ingest Management":
1414
- "x-pack/plugins/fleet/**/*.*"
15-
- "x-pack/test/api_integration/apis/fleet/**/*.*"
16-
- "x-pack/test/epm_api_integration/**/*.*"
15+
- "x-pack/test/fleet_api_integration/**/*.*"
1716
- "Team:uptime":
1817
- "x-pack/plugins/uptime/**/*.*"
1918
- "x-pack/plugins/apm/e2e/cypress/support/step_definitions/csm/*.*"

.node-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10.22.1
1+
12.19.0

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10.22.1
1+
12.19.0

docs/development/core/public/kibana-plugin-core-public.uisettingsparams.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ export interface UiSettingsParams<T = unknown>
1919
| [category](./kibana-plugin-core-public.uisettingsparams.category.md) | <code>string[]</code> | used to group the configured setting in the UI |
2020
| [deprecation](./kibana-plugin-core-public.uisettingsparams.deprecation.md) | <code>DeprecationSettings</code> | optional deprecation information. Used to generate a deprecation warning. |
2121
| [description](./kibana-plugin-core-public.uisettingsparams.description.md) | <code>string</code> | description provided to a user in UI |
22+
| [metric](./kibana-plugin-core-public.uisettingsparams.metric.md) | <code>{</code><br/><code> type: UiStatsMetricType;</code><br/><code> name: string;</code><br/><code> }</code> | Metric to track once this property changes |
2223
| [name](./kibana-plugin-core-public.uisettingsparams.name.md) | <code>string</code> | title in the UI |
2324
| [optionLabels](./kibana-plugin-core-public.uisettingsparams.optionlabels.md) | <code>Record&lt;string, string&gt;</code> | text labels for 'select' type UI element |
2425
| [options](./kibana-plugin-core-public.uisettingsparams.options.md) | <code>string[]</code> | array of permitted values for this setting |
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<!-- Do not edit this file. It is automatically generated by API Documenter. -->
2+
3+
[Home](./index.md) &gt; [kibana-plugin-core-public](./kibana-plugin-core-public.md) &gt; [UiSettingsParams](./kibana-plugin-core-public.uisettingsparams.md) &gt; [metric](./kibana-plugin-core-public.uisettingsparams.metric.md)
4+
5+
## UiSettingsParams.metric property
6+
7+
> Warning: This API is now obsolete.
8+
>
9+
> Temporary measure until https://github.com/elastic/kibana/issues/83084 is in place
10+
>
11+
12+
Metric to track once this property changes
13+
14+
<b>Signature:</b>
15+
16+
```typescript
17+
metric?: {
18+
type: UiStatsMetricType;
19+
name: string;
20+
};
21+
```

docs/development/core/server/kibana-plugin-core-server.uisettingsparams.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ export interface UiSettingsParams<T = unknown>
1919
| [category](./kibana-plugin-core-server.uisettingsparams.category.md) | <code>string[]</code> | used to group the configured setting in the UI |
2020
| [deprecation](./kibana-plugin-core-server.uisettingsparams.deprecation.md) | <code>DeprecationSettings</code> | optional deprecation information. Used to generate a deprecation warning. |
2121
| [description](./kibana-plugin-core-server.uisettingsparams.description.md) | <code>string</code> | description provided to a user in UI |
22+
| [metric](./kibana-plugin-core-server.uisettingsparams.metric.md) | <code>{</code><br/><code> type: UiStatsMetricType;</code><br/><code> name: string;</code><br/><code> }</code> | Metric to track once this property changes |
2223
| [name](./kibana-plugin-core-server.uisettingsparams.name.md) | <code>string</code> | title in the UI |
2324
| [optionLabels](./kibana-plugin-core-server.uisettingsparams.optionlabels.md) | <code>Record&lt;string, string&gt;</code> | text labels for 'select' type UI element |
2425
| [options](./kibana-plugin-core-server.uisettingsparams.options.md) | <code>string[]</code> | array of permitted values for this setting |

0 commit comments

Comments
 (0)