Skip to content

Commit 2c25076

Browse files
author
Joel Griffith
committed
Merge remote-tracking branch 'upstream/master' into bugfix/reporting-maps-tiles
2 parents d088c32 + cfbd095 commit 2c25076

File tree

665 files changed

+10080
-7249
lines changed

Some content is hidden

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

665 files changed

+10080
-7249
lines changed

.backportrc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"upstream": "elastic/kibana",
3-
"branches": [{ "name": "7.x", "checked": true }, "7.5", "7.4", "7.3", "7.2", "7.1", "7.0", "6.8", "6.7", "6.6", "6.5", "6.4", "6.3", "6.2", "6.1", "6.0", "5.6"],
3+
"branches": [{ "name": "7.x", "checked": true }, "7.6", "7.5", "7.4", "7.3", "7.2", "7.1", "7.0", "6.8", "6.7", "6.6", "6.5", "6.4", "6.3", "6.2", "6.1", "6.0", "5.6"],
44
"labels": ["backport"]
55
}

.eslintignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ bower_components
99
/built_assets
1010
/html_docs
1111
/src/plugins/data/common/es_query/kuery/ast/_generated_/**
12-
/src/fixtures/vislib/mock_data
12+
src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data
1313
/src/legacy/ui/public/angular-bootstrap
1414
/src/legacy/ui/public/flot-charts
1515
/test/fixtures/scenarios

.eslintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ module.exports = {
7777
},
7878
},
7979
{
80-
files: ['src/legacy/core_plugins/kbn_vislib_vis_types/**/*.{js,ts,tsx}'],
80+
files: ['src/legacy/core_plugins/vis_type_vislib/**/*.{js,ts,tsx}'],
8181
rules: {
8282
'react-hooks/exhaustive-deps': 'off',
8383
},

.github/CODEOWNERS

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -117,21 +117,21 @@
117117
/x-pack/test/api_integration/apis/security/ @elastic/kibana-security
118118

119119
# Kibana Localization
120-
/src/dev/i18n @elastic/kibana-localization
120+
/src/dev/i18n/ @elastic/kibana-localization
121121

122122
# Pulse
123123
/packages/kbn-analytics/ @elastic/pulse
124124
/src/legacy/core_plugins/ui_metric/ @elastic/pulse
125125
/src/plugins/usage_collection/ @elastic/pulse
126-
/x-pack/legacy/plugins/telemetry @elastic/pulse
126+
/x-pack/legacy/plugins/telemetry/ @elastic/pulse
127127

128128
# Kibana Alerting Services
129-
/x-pack/legacy/plugins/alerting @elastic/kibana-alerting-services
130-
/x-pack/legacy/plugins/actions @elastic/kibana-alerting-services
131-
/x-pack/legacy/plugins/task_manager @elastic/kibana-alerting-services
132-
/x-pack/test/alerting_api_integration @elastic/kibana-alerting-services
133-
/x-pack/test/plugin_api_integration/plugins/task_manager @elastic/kibana-alerting-services
134-
/x-pack/test/plugin_api_integration/test_suites/task_manager @elastic/kibana-alerting-services
129+
/x-pack/legacy/plugins/alerting/ @elastic/kibana-alerting-services
130+
/x-pack/legacy/plugins/actions/ @elastic/kibana-alerting-services
131+
/x-pack/plugins/task_manager/ @elastic/kibana-alerting-services
132+
/x-pack/test/alerting_api_integration/ @elastic/kibana-alerting-services
133+
/x-pack/test/plugin_api_integration/plugins/task_manager/ @elastic/kibana-alerting-services
134+
/x-pack/test/plugin_api_integration/test_suites/task_manager/ @elastic/kibana-alerting-services
135135
/x-pack/legacy/plugins/triggers_actions_ui/ @elastic/kibana-alerting-services
136136
/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/ @elastic/kibana-alerting-services
137137
/x-pack/test/functional_with_es_ssl/fixtures/plugins/alerts/ @elastic/kibana-alerting-services

.i18nrc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"interpreter": "src/legacy/core_plugins/interpreter",
2222
"kbn": "src/legacy/core_plugins/kibana",
2323
"kbnDocViews": "src/legacy/core_plugins/kbn_doc_views",
24-
"kbnVislibVisTypes": "src/legacy/core_plugins/kbn_vislib_vis_types",
24+
"kbnVislibVisTypes": "src/legacy/core_plugins/vis_type_vislib",
2525
"management": ["src/legacy/core_plugins/management", "src/plugins/management"],
2626
"kibana_react": "src/legacy/core_plugins/kibana_react",
2727
"kibana-react": "src/plugins/kibana_react",

.sass-lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ files:
22
include:
33
- 'src/legacy/core_plugins/metrics/**/*.s+(a|c)ss'
44
- 'src/legacy/core_plugins/timelion/**/*.s+(a|c)ss'
5-
- 'src/legacy/ui/public/vislib/**/*.s+(a|c)ss'
5+
- 'src/legacy/core_plugins/vis_type_vislib/**/*.s+(a|c)ss'
66
- 'x-pack/legacy/plugins/rollup/**/*.s+(a|c)ss'
77
- 'x-pack/legacy/plugins/security/**/*.s+(a|c)ss'
88
- 'x-pack/legacy/plugins/canvas/**/*.s+(a|c)ss'
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<!-- Do not edit this file. It is automatically generated by API Documenter. -->
2+
3+
[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [DeprecationSettings](./kibana-plugin-server.deprecationsettings.md) &gt; [docLinksKey](./kibana-plugin-server.deprecationsettings.doclinkskey.md)
4+
5+
## DeprecationSettings.docLinksKey property
6+
7+
Key to documentation links
8+
9+
<b>Signature:</b>
10+
11+
```typescript
12+
docLinksKey: string;
13+
```
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-server](./kibana-plugin-server.md) &gt; [DeprecationSettings](./kibana-plugin-server.deprecationsettings.md)
4+
5+
## DeprecationSettings interface
6+
7+
UiSettings deprecation field options.
8+
9+
<b>Signature:</b>
10+
11+
```typescript
12+
export interface DeprecationSettings
13+
```
14+
15+
## Properties
16+
17+
| Property | Type | Description |
18+
| --- | --- | --- |
19+
| [docLinksKey](./kibana-plugin-server.deprecationsettings.doclinkskey.md) | <code>string</code> | Key to documentation links |
20+
| [message](./kibana-plugin-server.deprecationsettings.message.md) | <code>string</code> | Deprecation message |
21+
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<!-- Do not edit this file. It is automatically generated by API Documenter. -->
2+
3+
[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [DeprecationSettings](./kibana-plugin-server.deprecationsettings.md) &gt; [message](./kibana-plugin-server.deprecationsettings.message.md)
4+
5+
## DeprecationSettings.message property
6+
7+
Deprecation message
8+
9+
<b>Signature:</b>
10+
11+
```typescript
12+
message: string;
13+
```
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<!-- Do not edit this file. It is automatically generated by API Documenter. -->
2+
3+
[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [ImageValidation](./kibana-plugin-server.imagevalidation.md) &gt; [maxSize](./kibana-plugin-server.imagevalidation.maxsize.md)
4+
5+
## ImageValidation.maxSize property
6+
7+
<b>Signature:</b>
8+
9+
```typescript
10+
maxSize: {
11+
length: number;
12+
description: string;
13+
};
14+
```

0 commit comments

Comments
 (0)