Skip to content

Commit e80fe23

Browse files
Merge branch 'master' into loadingCount
2 parents 6188c74 + 27a4fe2 commit e80fe23

File tree

1,892 files changed

+29900
-12137
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,892 files changed

+29900
-12137
lines changed

.ci/Jenkinsfile_coverage

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,11 @@ stage("Kibana Pipeline") { // This stage is just here to help the BlueOcean UI a
4040
'oss-ciGroup11': kibanaPipeline.getOssCiGroupWorker(11),
4141
'oss-ciGroup12': kibanaPipeline.getOssCiGroupWorker(12),
4242
]),
43-
'kibana-xpack-agent-1': kibanaPipeline.withWorkers('kibana-xpack-tests-1', { kibanaPipeline.buildXpack() }, [
43+
'kibana-xpack-agent': kibanaPipeline.withWorkers('kibana-xpack-tests', { kibanaPipeline.buildXpack() }, [
4444
'xpack-ciGroup1': kibanaPipeline.getXpackCiGroupWorker(1),
4545
'xpack-ciGroup2': kibanaPipeline.getXpackCiGroupWorker(2),
46-
]),
47-
'kibana-xpack-agent-2': kibanaPipeline.withWorkers('kibana-xpack-tests-2', { kibanaPipeline.buildXpack() }, [
4846
'xpack-ciGroup3': kibanaPipeline.getXpackCiGroupWorker(3),
4947
'xpack-ciGroup4': kibanaPipeline.getXpackCiGroupWorker(4),
50-
]),
51-
52-
'kibana-xpack-agent-3': kibanaPipeline.withWorkers('kibana-xpack-tests-3', { kibanaPipeline.buildXpack() }, [
5348
'xpack-ciGroup5': kibanaPipeline.getXpackCiGroupWorker(5),
5449
'xpack-ciGroup6': kibanaPipeline.getXpackCiGroupWorker(6),
5550
'xpack-ciGroup7': kibanaPipeline.getXpackCiGroupWorker(7),
@@ -75,9 +70,7 @@ stage("Kibana Pipeline") { // This stage is just here to help the BlueOcean UI a
7570
echo extracting kibana-oss-tests
7671
tar -xzf /tmp/downloaded_coverage/coverage/kibana-oss-tests/kibana-coverage.tar.gz -C /tmp/extracted_coverage
7772
echo extracting kibana-xpack-tests
78-
for i in {1..3}; do
79-
tar -xzf /tmp/downloaded_coverage/coverage/kibana-xpack-tests-${i}/kibana-coverage.tar.gz -C /tmp/extracted_coverage
80-
done
73+
tar -xzf /tmp/downloaded_coverage/coverage/kibana-xpack-tests/kibana-coverage.tar.gz -C /tmp/extracted_coverage
8174
# replace path in json files to have valid html report
8275
pwd=$(pwd)
8376
du -sh /tmp/extracted_coverage/target/kibana-coverage/

.eslintrc.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,14 @@ module.exports = {
8888
'react-hooks/exhaustive-deps': 'off',
8989
},
9090
},
91+
{
92+
files: [
93+
'src/legacy/core_plugins/vis_default_editor/public/components/controls/**/*.{ts,tsx}',
94+
],
95+
rules: {
96+
'react-hooks/exhaustive-deps': 'off',
97+
},
98+
},
9199
{
92100
files: ['src/legacy/ui/public/vis/**/*.{js,ts,tsx}'],
93101
rules: {

.github/CODEOWNERS

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,17 @@
1212
/src/legacy/core_plugins/kibana/public/discover/ @elastic/kibana-app
1313
/src/legacy/core_plugins/kibana/public/visualize/ @elastic/kibana-app
1414
/src/legacy/core_plugins/kibana/public/local_application_service/ @elastic/kibana-app
15-
/src/legacy/core_plugins/kibana/public/home/ @elastic/kibana-app
1615
/src/legacy/core_plugins/kibana/public/dev_tools/ @elastic/kibana-app
1716
/src/legacy/core_plugins/metrics/ @elastic/kibana-app
1817
/src/legacy/core_plugins/vis_type_vislib/ @elastic/kibana-app
1918
# Exclude tutorials folder for now because they are not owned by Kibana app and most will move out soon
2019
/src/plugins/home/public @elastic/kibana-app
2120
/src/plugins/home/server/*.ts @elastic/kibana-app
2221
/src/plugins/home/server/services/ @elastic/kibana-app
22+
# Exclude tutorial resources folder for now because they are not owned by Kibana app and most will move out soon
23+
/src/legacy/core_plugins/kibana/public/home/*.ts @elastic/kibana-app
24+
/src/legacy/core_plugins/kibana/public/home/*.scss @elastic/kibana-app
25+
/src/legacy/core_plugins/kibana/public/home/np_ready/ @elastic/kibana-app
2326
/src/plugins/kibana_legacy/ @elastic/kibana-app
2427
/src/plugins/timelion/ @elastic/kibana-app
2528
/src/plugins/dev_tools/ @elastic/kibana-app
@@ -87,6 +90,7 @@
8790
/src/dev/ @elastic/kibana-operations
8891
/src/setup_node_env/ @elastic/kibana-operations
8992
/src/optimize/ @elastic/kibana-operations
93+
/src/es_archiver/ @elastic/kibana-operations
9094
/packages/*eslint*/ @elastic/kibana-operations
9195
/packages/*babel*/ @elastic/kibana-operations
9296
/packages/kbn-dev-utils*/ @elastic/kibana-operations
@@ -112,6 +116,7 @@
112116
/src/legacy/server/logging/ @elastic/kibana-platform
113117
/src/legacy/server/saved_objects/ @elastic/kibana-platform
114118
/src/legacy/server/status/ @elastic/kibana-platform
119+
/src/dev/run_check_core_api_changes.ts @elastic/kibana-platform
115120

116121
# Security
117122
/src/core/server/csp/ @elastic/kibana-security @elastic/kibana-platform
@@ -148,9 +153,9 @@
148153
**/*.scss @elastic/kibana-design
149154

150155
# Elasticsearch UI
151-
/src/legacy/core_plugins/console/ @elastic/es-ui
156+
/src/plugins/console/ @elastic/es-ui
152157
/src/plugins/es_ui_shared/ @elastic/es-ui
153-
/x-pack/legacy/plugins/console_extensions/ @elastic/es-ui
158+
/x-pack/plugins/console_extensions/ @elastic/es-ui
154159
/x-pack/legacy/plugins/cross_cluster_replication/ @elastic/es-ui
155160
/x-pack/legacy/plugins/index_lifecycle_management/ @elastic/es-ui
156161
/x-pack/legacy/plugins/index_management/ @elastic/es-ui

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
name: Assign a PR to project based on label
99
steps:
1010
- name: Assign to project
11-
uses: elastic/github-actions/[email protected].0
11+
uses: elastic/github-actions/[email protected].1
1212
id: project_assigner
1313
with:
1414
issue-mappings: |

.github/workflows/project-assigner.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
name: Assign issue or PR to project based on label
99
steps:
1010
- name: Assign to project
11-
uses: elastic/github-actions/[email protected].0
11+
uses: elastic/github-actions/[email protected].1
1212
id: project_assigner
1313
with:
1414
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}]'

.i18nrc.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"paths": {
33
"common.ui": "src/legacy/ui",
4-
"console": "src/legacy/core_plugins/console",
4+
"console": "src/plugins/console",
55
"core": "src/core",
66
"dashboardEmbeddableContainer": "src/plugins/dashboard_embeddable_container",
77
"data": [
@@ -35,11 +35,12 @@
3535
"tileMap": "src/legacy/core_plugins/tile_map",
3636
"timelion": ["src/legacy/core_plugins/timelion", "src/legacy/core_plugins/vis_type_timelion", "src/plugins/timelion"],
3737
"uiActions": "src/plugins/ui_actions",
38+
"visDefaultEditor": "src/legacy/core_plugins/vis_default_editor",
3839
"visTypeMarkdown": "src/legacy/core_plugins/vis_type_markdown",
3940
"visTypeMetric": "src/legacy/core_plugins/vis_type_metric",
4041
"visTypeTable": "src/legacy/core_plugins/vis_type_table",
4142
"visTypeTagCloud": "src/legacy/core_plugins/vis_type_tagcloud",
42-
"visTypeTimeseries": "src/legacy/core_plugins/vis_type_timeseries",
43+
"visTypeTimeseries": ["src/legacy/core_plugins/vis_type_timeseries", "src/plugins/vis_type_timeseries"],
4344
"visTypeVega": "src/legacy/core_plugins/vis_type_vega",
4445
"visTypeVislib": "src/legacy/core_plugins/vis_type_vislib",
4546
"visualizations": [

CONTRIBUTING.md

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,16 @@ yarn kbn bootstrap
174174

175175
(You can also run `yarn kbn` to see the other available commands. For more info about this tool, see https://github.com/elastic/kibana/tree/master/packages/kbn-pm.)
176176

177+
When switching branches which use different versions of npm packages you may need to run;
178+
```bash
179+
yarn kbn clean
180+
```
181+
182+
If you have failures during `yarn kbn bootstrap` you may have some corrupted packages in your yarn cache which you can clean with;
183+
```bash
184+
yarn cache clean
185+
```
186+
177187
#### Increase node.js heap size
178188

179189
Kibana is a big project and for some commands it can happen that the process hits the default heap limit and crashes with an out-of-memory error. If you run into this problem, you can increase maximum heap size by setting the `--max_old_space_size` option on the command line. To set the limit for all commands, simply add the following line to your shell config: `export NODE_OPTIONS="--max_old_space_size=2048"`.
@@ -193,7 +203,7 @@ yarn es snapshot
193203
##### Keeping data between snapshots
194204

195205
If you want to keep the data inside your Elasticsearch between usages of this command,
196-
you should use the following command, to keep your data folder outside the downloaded snapshot
206+
you should use the following command, to keep your data folder outside the downloaded snapshot
197207
folder:
198208

199209
```bash
@@ -290,6 +300,7 @@ Follow the [cross-cluster search](https://www.elastic.co/guide/en/kibana/current
290300

291301
### Running Kibana
292302

303+
Change to your local Kibana directory.
293304
Start the development server.
294305

295306
```bash

NOTICE.txt

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,40 @@ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
153153
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
154154
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
155155

156+
---
157+
This product bundles rules based on https://github.com/BlueTeamLabs/sentinel-attack
158+
which is available under a "MIT" license. The files based on this license are:
159+
160+
- windows_defense_evasion_via_filter_manager.json
161+
- windows_process_discovery_via_tasklist_command.json
162+
- windows_priv_escalation_via_accessibility_features.json
163+
- windows_persistence_via_application_shimming.json
164+
- windows_execution_via_trusted_developer_utilities.json
165+
- windows_execution_via_net_com_assemblies.json
166+
- windows_execution_via_connection_manager.json
167+
168+
MIT License
169+
170+
Copyright (c) 2019 Edoardo Gerosa, Olaf Hartong
171+
172+
Permission is hereby granted, free of charge, to any person obtaining a copy of
173+
this software and associated documentation files (the "Software"), to deal in
174+
the Software without restriction, including without limitation the rights to
175+
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
176+
of the Software, and to permit persons to whom the Software is furnished to do
177+
so, subject to the following conditions:
178+
179+
The above copyright notice and this permission notice shall be included in all
180+
copies or substantial portions of the Software.
181+
182+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
183+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
184+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
185+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
186+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
187+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
188+
SOFTWARE.
189+
156190
---
157191
This product includes code that is adapted from mapbox-gl-js, which is
158192
available under a "BSD-3-Clause" license.

docs/management/watcher-ui/index.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ If the {es} {security-features} are enabled, you must have the
3434
{ref}/security-privileges.html[`manage_watcher` or `monitor_watcher`]
3535
cluster privileges to use Watcher in {kib}.
3636

37-
Alternately, you can have the built-in `kibana_user` role
37+
Alternately, you can have the built-in `kibana_admin` role
3838
and either of these watcher roles:
3939

4040
* `watcher_admin`. You can perform all Watcher actions, including create and edit watches.

docs/migration/migrate_8_0.asciidoc

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,4 +80,30 @@ specified explicitly.
8080

8181
*Impact:* Any workflow that involved manually clearing generated bundles will have to be updated with the new path.
8282

83+
[float]
84+
[[breaking_80_user_role_changes]]
85+
=== User role changes
86+
87+
[float]
88+
==== `kibana_user` role has been removed and `kibana_admin` has been added.
89+
90+
*Details:* The `kibana_user` role has been removed and `kibana_admin` has been added to better
91+
reflect its intended use. This role continues to grant all access to every
92+
{kib} feature. If you wish to restrict access to specific features, create
93+
custom roles with {kibana-ref}/kibana-privileges.html[{kib} privileges].
94+
95+
*Impact:* Any users currently assigned the `kibana_user` role will need to
96+
instead be assigned the `kibana_admin` role to maintain their current
97+
access level.
98+
99+
[float]
100+
[[breaking_80_reporting_changes]]
101+
=== Reporting changes
102+
103+
[float]
104+
==== Legacy job parameters are no longer supported
105+
*Details:* POST URL snippets that were copied in Kibana 6.2 or below are no longer supported. These logs have
106+
been deprecated with warnings that have been logged throughout 7.x. Please use Kibana UI to re-generate the
107+
POST URL snippets if you depend on these for automated PDF reports.
108+
83109
// end::notable-breaking-changes[]

0 commit comments

Comments
 (0)