Skip to content

Commit dc00a2c

Browse files
shahzad31shahzad31
committed
Merge branch 'master' into fix/monitor-list-expaned-row-should-follow-filters
2 parents 02f014c + 45e227b commit dc00a2c

File tree

2,323 files changed

+46079
-25376
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,323 files changed

+46079
-25376
lines changed

‎.eslintrc.js‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -189,13 +189,6 @@ module.exports = {
189189
'react-hooks/exhaustive-deps': 'off',
190190
},
191191
},
192-
{
193-
files: ['x-pack/legacy/plugins/uptime/**/*.{js,ts,tsx}'],
194-
rules: {
195-
'react-hooks/exhaustive-deps': 'off',
196-
'react-hooks/rules-of-hooks': 'off',
197-
},
198-
},
199192

200193
/**
201194
* Files that require Apache 2.0 headers, settings

‎.github/CODEOWNERS‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,16 @@
88
/src/plugins/share/ @elastic/kibana-app
99
/src/legacy/server/url_shortening/ @elastic/kibana-app
1010
/src/legacy/server/sample_data/ @elastic/kibana-app
11+
/src/legacy/core_plugins/kibana/public/dashboard/ @elastic/kibana-app
12+
/src/legacy/core_plugins/kibana/public/discover/ @elastic/kibana-app
13+
/src/legacy/core_plugins/kibana/public/visualize/ @elastic/kibana-app
14+
/src/legacy/core_plugins/kibana/public/local_application_service/ @elastic/kibana-app
15+
/src/legacy/core_plugins/kibana/public/home/ @elastic/kibana-app
16+
/src/legacy/core_plugins/kibana/public/dev_tools/ @elastic/kibana-app
17+
/src/plugins/home/ @elastic/kibana-app
18+
/src/plugins/kibana_legacy/ @elastic/kibana-app
19+
/src/plugins/timelion/ @elastic/kibana-app
20+
/src/plugins/dev_tools/ @elastic/kibana-app
1121

1222
# App Architecture
1323
/src/plugins/data/ @elastic/kibana-app-arch
@@ -57,6 +67,13 @@
5767
/x-pack/test/functional/services/transform_ui/ @elastic/ml-ui
5868
/x-pack/test/functional/services/transform.ts @elastic/ml-ui
5969

70+
# Maps
71+
/x-pack/legacy/plugins/maps/ @elastic/kibana-gis
72+
/x-pack/test/api_integration/apis/maps/ @elastic/kibana-gis
73+
/x-pack/test/functional/apps/maps/ @elastic/kibana-gis
74+
/x-pack/test/functional/es_archives/maps/ @elastic/kibana-gis
75+
/x-pack/test/visual_regression/tests/maps/index.js @elastic/kibana-gis
76+
6077
# Operations
6178
/src/dev/ @elastic/kibana-operations
6279
/src/setup_node_env/ @elastic/kibana-operations

‎.github/workflows/pr-project-assigner.yml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,11 @@ jobs:
1111
uses: elastic/github-actions/project-assigner@v1.0.0
1212
id: project_assigner
1313
with:
14-
issue-mappings: '[{"label": "Team:AppAch", "projectName": "kibana-app-arch", "columnId": 6173897}]'
15-
ghToken: ${{ secrets.GITHUB_TOKEN }}
14+
issue-mappings: |
15+
[
16+
{ "label": "Team:AppArch", "projectName": "kibana-app-arch", "columnId": 6173897 },
17+
{ "label": "Feature:Lens", "projectName": "Lens", "columnId": 6219362 },
18+
{ "label": "Team:Platform", "projectName": "kibana-platform", "columnId": 5514360 },
19+
{"label": "Team:Canvas", "projectName": "canvas", "columnId": 6187580}
20+
]
21+
ghToken: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/project-assigner.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
uses: elastic/github-actions/project-assigner@v1.0.0
1212
id: project_assigner
1313
with:
14-
issue-mappings: '[{"label": "Team:AppArch", "projectName": "kibana-app-arch", "columnId": 6173895}]'
14+
issue-mappings: '[{"label": "Team:AppArch", "projectName": "kibana-app-arch", "columnId": 6173895}, {"label": "Feature:Lens", "projectName": "Lens", "columnId": 6219363}, {"label": "Team:Canvas", "projectName": "canvas", "columnId": 6187593}]'
1515
ghToken: ${{ secrets.GITHUB_TOKEN }}
16-
16+
1717

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ disabledPlugins
2929
webpackstats.json
3030
/config/*
3131
!/config/kibana.yml
32-
!/config/apm.js
3332
coverage
3433
selenium
3534
.babel_register_cache.json

‎.i18nrc.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"embeddableApi": "src/plugins/embeddable",
1212
"embeddableExamples": "examples/embeddable_examples",
1313
"share": "src/plugins/share",
14+
"home": "src/plugins/home",
1415
"esUi": "src/plugins/es_ui_shared",
1516
"devTools": "src/plugins/dev_tools",
1617
"expressions": "src/plugins/expressions",

‎.node-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10.15.2
1+
10.18.0

‎.nvmrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10.15.2
1+
10.18.0

‎NOTICE.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Kibana source code with Kibana X-Pack source code
2-
Copyright 2012-2019 Elasticsearch B.V.
2+
Copyright 2012-2020 Elasticsearch B.V.
33

44
---
55
Pretty handling of logarithmic axes.

‎config/apm.js‎

Lines changed: 0 additions & 87 deletions
This file was deleted.

0 commit comments

Comments
 (0)