Skip to content

Commit ab4eaa6

Browse files
committed
Merge remote-tracking branch 'upstream/master' into 64832-kql-handler-remove
# Conflicts: # x-pack/plugins/infra/server/lib/alerting/metric_threshold/register_metric_threshold_alert_type.ts # x-pack/test/api_integration/apis/infra/metrics_alerting.ts
2 parents ac4e305 + 496f492 commit ab4eaa6

File tree

2,078 files changed

+45356
-15958
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,078 files changed

+45356
-15958
lines changed

.backportrc.json

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,30 @@
11
{
22
"upstream": "elastic/kibana",
3-
"branches": [{ "name": "7.x", "checked": true }, "7.7", "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"],
4-
"labels": ["backport"]
3+
"targetBranchChoices": [
4+
{ "name": "master", "checked": true },
5+
{ "name": "7.x", "checked": true },
6+
"7.7",
7+
"7.6",
8+
"7.5",
9+
"7.4",
10+
"7.3",
11+
"7.2",
12+
"7.1",
13+
"7.0",
14+
"6.8",
15+
"6.7",
16+
"6.6",
17+
"6.5",
18+
"6.4",
19+
"6.3",
20+
"6.2",
21+
"6.1",
22+
"6.0",
23+
"5.6"
24+
],
25+
"targetPRLabels": ["backport"],
26+
"branchLabelMapping": {
27+
"^v7.8.0$": "7.x",
28+
"^v(\\d+).(\\d+).\\d+$": "$1.$2"
29+
}
530
}

.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ target
3030
/x-pack/legacy/plugins/canvas/canvas_plugin_src/lib/flot-charts
3131
/x-pack/legacy/plugins/canvas/shareable_runtime/build
3232
/x-pack/legacy/plugins/canvas/storybook
33+
/x-pack/plugins/monitoring/public/lib/jquery_flot
3334
/x-pack/legacy/plugins/infra/common/graphql/types.ts
3435
/x-pack/legacy/plugins/infra/public/graphql/types.ts
3536
/x-pack/legacy/plugins/infra/server/graphql/types.ts

.eslintrc.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -963,6 +963,12 @@ module.exports = {
963963
jquery: true,
964964
},
965965
},
966+
{
967+
files: ['x-pack/plugins/monitoring/public/lib/jquery_flot/**/*.js'],
968+
env: {
969+
jquery: true,
970+
},
971+
},
966972

967973
/**
968974
* TSVB overrides

.github/CODEOWNERS

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
# For more info, see https://help.github.com/articles/about-codeowners/
44

55
# App
6+
/x-pack/plugins/dashboard_enhanced/ @elastic/kibana-app
67
/x-pack/plugins/lens/ @elastic/kibana-app
78
/x-pack/plugins/graph/ @elastic/kibana-app
89
/src/legacy/server/url_shortening/ @elastic/kibana-app
@@ -11,18 +12,21 @@
1112
/src/legacy/core_plugins/kibana/public/discover/ @elastic/kibana-app
1213
/src/legacy/core_plugins/kibana/public/local_application_service/ @elastic/kibana-app
1314
/src/legacy/core_plugins/kibana/public/dev_tools/ @elastic/kibana-app
14-
/src/plugins/vis_type_vislib/ @elastic/kibana-app
15-
/src/plugins/vis_type_xy/ @elastic/kibana-app
16-
/src/plugins/vis_type_table/ @elastic/kibana-app
17-
/src/plugins/kibana_legacy/ @elastic/kibana-app
18-
/src/plugins/vis_type_timelion/ @elastic/kibana-app
1915
/src/plugins/dashboard/ @elastic/kibana-app
2016
/src/plugins/discover/ @elastic/kibana-app
2117
/src/plugins/input_control_vis/ @elastic/kibana-app
22-
/src/plugins/visualize/ @elastic/kibana-app
23-
/src/plugins/vis_type_timeseries/ @elastic/kibana-app
24-
/src/plugins/vis_type_metric/ @elastic/kibana-app
18+
/src/plugins/kibana_legacy/ @elastic/kibana-app
19+
/src/plugins/vis_default_editor/ @elastic/kibana-app
2520
/src/plugins/vis_type_markdown/ @elastic/kibana-app
21+
/src/plugins/vis_type_metric/ @elastic/kibana-app
22+
/src/plugins/vis_type_table/ @elastic/kibana-app
23+
/src/plugins/vis_type_tagcloud/ @elastic/kibana-app
24+
/src/plugins/vis_type_timelion/ @elastic/kibana-app
25+
/src/plugins/vis_type_timeseries/ @elastic/kibana-app
26+
/src/plugins/vis_type_vega/ @elastic/kibana-app
27+
/src/plugins/vis_type_vislib/ @elastic/kibana-app
28+
/src/plugins/vis_type_xy/ @elastic/kibana-app
29+
/src/plugins/visualize/ @elastic/kibana-app
2630

2731
# Core UI
2832
# Exclude tutorials folder for now because they are not owned by Kibana app and most will move out soon
@@ -84,6 +88,7 @@
8488
/x-pack/legacy/plugins/ingest_manager/ @elastic/ingest-management
8589
/x-pack/plugins/observability/ @elastic/logs-metrics-ui @elastic/apm-ui @elastic/uptime @elastic/ingest-management
8690
/x-pack/legacy/plugins/monitoring/ @elastic/stack-monitoring-ui
91+
/x-pack/plugins/monitoring/ @elastic/stack-monitoring-ui
8792
/x-pack/plugins/uptime @elastic/uptime
8893

8994
# Machine Learning
@@ -203,6 +208,7 @@
203208
/x-pack/plugins/snapshot_restore/ @elastic/es-ui
204209
/x-pack/plugins/upgrade_assistant/ @elastic/es-ui
205210
/x-pack/plugins/watcher/ @elastic/es-ui
211+
/x-pack/plugins/ingest_pipelines/ @elastic/es-ui
206212

207213
# Endpoint
208214
/x-pack/plugins/endpoint/ @elastic/endpoint-app-team @elastic/siem

.i18nrc.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"data": "src/plugins/data",
99
"embeddableApi": "src/plugins/embeddable",
1010
"embeddableExamples": "examples/embeddable_examples",
11+
"uiActionsExamples": "examples/ui_action_examples",
1112
"share": "src/plugins/share",
1213
"home": "src/plugins/home",
1314
"charts": "src/plugins/charts",
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<!-- Do not edit this file. It is automatically generated by API Documenter. -->
2+
3+
[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [AggGroupLabels](./kibana-plugin-plugins-data-public.agggrouplabels.md)
4+
5+
## AggGroupLabels variable
6+
7+
<b>Signature:</b>
8+
9+
```typescript
10+
AggGroupLabels: {
11+
[AggGroupNames.Buckets]: string;
12+
[AggGroupNames.Metrics]: string;
13+
[AggGroupNames.None]: string;
14+
}
15+
```
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<!-- Do not edit this file. It is automatically generated by API Documenter. -->
2+
3+
[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [AggGroupName](./kibana-plugin-plugins-data-public.agggroupname.md)
4+
5+
## AggGroupName type
6+
7+
<b>Signature:</b>
8+
9+
```typescript
10+
export declare type AggGroupName = $Values<typeof AggGroupNames>;
11+
```

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggtypefieldfilters.addfilter.md

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

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggtypefieldfilters.filter.md

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

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggtypefieldfilters.md

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

0 commit comments

Comments
 (0)