Skip to content

Commit aadb624

Browse files
paul-tavarespaul-tavares
committed
Merge remote-tracking branch 'upstream/master' into task/EMT-164-UI-details-policy-status
# Conflicts: # x-pack/plugins/endpoint/public/applications/endpoint/store/hosts/action.ts # x-pack/plugins/endpoint/public/applications/endpoint/store/hosts/middleware.ts # x-pack/plugins/endpoint/public/applications/endpoint/store/hosts/reducer.ts # x-pack/plugins/endpoint/public/applications/endpoint/types.ts # x-pack/plugins/endpoint/public/applications/endpoint/view/hosts/details/host_details.tsx
2 parents a0d2389 + 9703d85 commit aadb624

1,261 files changed

Lines changed: 21073 additions & 15841 deletions

File tree

Some content is hidden

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

‎.eslintrc.js‎

Lines changed: 37 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -185,31 +185,40 @@ module.exports = {
185185
zones: [
186186
{
187187
target: [
188-
'src/legacy/**/*',
189-
'x-pack/**/*',
190-
'!x-pack/**/*.test.*',
191-
'!x-pack/test/**/*',
188+
'(src|x-pack)/legacy/**/*',
192189
'(src|x-pack)/plugins/**/(public|server)/**/*',
193-
'src/core/(public|server)/**/*',
194190
'examples/**/*',
195191
],
196192
from: [
197193
'src/core/public/**/*',
198-
'!src/core/public/index.ts',
199-
'!src/core/public/mocks.ts',
200-
'!src/core/public/*.test.mocks.ts',
194+
'!src/core/public/index.ts', // relative import
195+
'!src/core/public/mocks{,.ts}',
196+
'!src/core/server/types{,.ts}',
201197
'!src/core/public/utils/**/*',
198+
'!src/core/public/*.test.mocks{,.ts}',
202199

203200
'src/core/server/**/*',
204-
'!src/core/server/index.ts',
205-
'!src/core/server/mocks.ts',
206-
'!src/core/server/types.ts',
207-
'!src/core/server/test_utils.ts',
201+
'!src/core/server/index.ts', // relative import
202+
'!src/core/server/mocks{,.ts}',
203+
'!src/core/server/types{,.ts}',
204+
'!src/core/server/test_utils',
208205
// for absolute imports until fixed in
209206
// https://github.com/elastic/kibana/issues/36096
210-
'!src/core/server/types',
211-
'!src/core/server/*.test.mocks.ts',
212-
207+
'!src/core/server/*.test.mocks{,.ts}',
208+
],
209+
allowSameFolder: true,
210+
errorMessage:
211+
'Plugins may only import from top-level public and server modules in core.',
212+
},
213+
{
214+
target: [
215+
'(src|x-pack)/legacy/**/*',
216+
'(src|x-pack)/plugins/**/(public|server)/**/*',
217+
'examples/**/*',
218+
'!(src|x-pack)/**/*.test.*',
219+
'!(x-pack/)?test/**/*',
220+
],
221+
from: [
213222
'(src|x-pack)/plugins/**/(public|server)/**/*',
214223
'!(src|x-pack)/plugins/**/(public|server)/(index|mocks).{js,ts,tsx}',
215224
],
@@ -730,6 +739,19 @@ module.exports = {
730739
},
731740
},
732741

742+
/**
743+
* Alerting Services overrides
744+
*/
745+
{
746+
// typescript only for front and back end
747+
files: [
748+
'x-pack/{,legacy/}plugins/{alerting,alerting_builtins,actions,task_manager,event_log}/**/*.{ts,tsx}',
749+
],
750+
rules: {
751+
'@typescript-eslint/no-explicit-any': 'error',
752+
},
753+
},
754+
733755
/**
734756
* Lens overrides
735757
*/

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
/src/plugins/vis_type_timelion/ @elastic/kibana-app
1919
/src/plugins/dashboard/ @elastic/kibana-app
2020
/src/plugins/discover/ @elastic/kibana-app
21+
/src/plugins/input_control_vis/ @elastic/kibana-app
2122
/src/plugins/visualize/ @elastic/kibana-app
2223
/src/plugins/vis_type_timeseries/ @elastic/kibana-app
2324
/src/plugins/vis_type_metric/ @elastic/kibana-app

‎.github/paths-labeller.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
- "Feature:ExpressionLanguage":
99
- "src/plugins/expressions/**/*.*"
1010
- "src/plugins/bfetch/**/*.*"
11+
- "Team:apm"
12+
- "x-pack/plugins/apm/**/*.*"
13+
- "x-pack/legacy/plugins/apm/**/*.*"
1114
- "Team:uptime":
1215
- "x-pack/plugins/uptime/**/*.*"
1316
- "x-pack/legacy/plugins/uptime/**/*.*"

‎.i18nrc.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"esUi": "src/plugins/es_ui_shared",
1515
"devTools": "src/plugins/dev_tools",
1616
"expressions": "src/plugins/expressions",
17-
"inputControl": "src/legacy/core_plugins/input_control_vis",
17+
"inputControl": "src/plugins/input_control_vis",
1818
"inspector": "src/plugins/inspector",
1919
"inspectorViews": "src/legacy/core_plugins/inspector_views",
2020
"interpreter": "src/legacy/core_plugins/interpreter",
@@ -49,9 +49,9 @@
4949
"visTypeMarkdown": "src/plugins/vis_type_markdown",
5050
"visTypeMetric": "src/plugins/vis_type_metric",
5151
"visTypeTable": "src/plugins/vis_type_table",
52-
"visTypeTagCloud": "src/legacy/core_plugins/vis_type_tagcloud",
52+
"visTypeTagCloud": "src/plugins/vis_type_tagcloud",
5353
"visTypeTimeseries": ["src/legacy/core_plugins/vis_type_timeseries", "src/plugins/vis_type_timeseries"],
54-
"visTypeVega": "src/legacy/core_plugins/vis_type_vega",
54+
"visTypeVega": "src/plugins/vis_type_vega",
5555
"visTypeVislib": "src/legacy/core_plugins/vis_type_vislib",
5656
"visTypeXy": "src/legacy/core_plugins/vis_type_xy",
5757
"visualizations": "src/plugins/visualizations",

‎docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigoptions.enabled.md‎

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

‎docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigoptions.id.md‎

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

‎docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigoptions.md‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,12 @@
22

33
[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [AggConfigOptions](./kibana-plugin-plugins-data-public.aggconfigoptions.md)
44

5-
## AggConfigOptions interface
5+
## AggConfigOptions type
66

77
<b>Signature:</b>
88

99
```typescript
10-
export interface AggConfigOptions
10+
export declare type AggConfigOptions = Assign<AggConfigSerialized, {
11+
type: IAggType;
12+
}>;
1113
```
12-
13-
## Properties
14-
15-
| Property | Type | Description |
16-
| --- | --- | --- |
17-
| [enabled](./kibana-plugin-plugins-data-public.aggconfigoptions.enabled.md) | <code>boolean</code> | |
18-
| [id](./kibana-plugin-plugins-data-public.aggconfigoptions.id.md) | <code>string</code> | |
19-
| [params](./kibana-plugin-plugins-data-public.aggconfigoptions.params.md) | <code>Record&lt;string, any&gt;</code> | |
20-
| [schema](./kibana-plugin-plugins-data-public.aggconfigoptions.schema.md) | <code>string</code> | |
21-
| [type](./kibana-plugin-plugins-data-public.aggconfigoptions.type.md) | <code>IAggType</code> | |
22-

‎docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigoptions.params.md‎

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

‎docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigoptions.schema.md‎

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

‎docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigoptions.type.md‎

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

0 commit comments

Comments
 (0)