Skip to content

Commit e9c213b

Browse files
ogupteogupte
committed
Merge remote-tracking branch 'upstream/master' into apm-48538-remove-duration-map-from-rum-view
2 parents c3c1ecf + ed46b1b commit e9c213b

File tree

743 files changed

+27254
-6553
lines changed

Some content is hidden

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

743 files changed

+27254
-6553
lines changed

‎.ci/Jenkinsfile_baseline_capture‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ kibanaPipeline(timeoutMinutes: 120) {
1111
'CI_PARALLEL_PROCESS_NUMBER=1'
1212
]) {
1313
parallel([
14-
'oss-visualRegression': {
15-
workers.ci(name: 'oss-visualRegression', size: 's-highmem', ramDisk: true) {
16-
kibanaPipeline.functionalTestProcess('oss-visualRegression', './test/scripts/jenkins_visual_regression.sh')()
14+
'oss-baseline': {
15+
workers.ci(name: 'oss-baseline', size: 's-highmem', ramDisk: true, runErrorReporter: false) {
16+
kibanaPipeline.functionalTestProcess('oss-baseline', './test/scripts/jenkins_baseline.sh')()
1717
}
1818
},
19-
'xpack-visualRegression': {
20-
workers.ci(name: 'xpack-visualRegression', size: 's-highmem', ramDisk: true) {
21-
kibanaPipeline.functionalTestProcess('xpack-visualRegression', './test/scripts/jenkins_xpack_visual_regression.sh')()
19+
'xpack-baseline': {
20+
workers.ci(name: 'xpack-baseline', size: 's-highmem', ramDisk: true, runErrorReporter: false) {
21+
kibanaPipeline.functionalTestProcess('xpack-baseline', './test/scripts/jenkins_xpack_baseline.sh')()
2222
}
2323
},
2424
])

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
/x-pack/plugins/discover_enhanced/ @elastic/kibana-app
88
/x-pack/plugins/lens/ @elastic/kibana-app
99
/x-pack/plugins/graph/ @elastic/kibana-app
10+
/src/plugins/charts/ @elastic/kibana-app
1011
/src/plugins/dashboard/ @elastic/kibana-app
1112
/src/plugins/discover/ @elastic/kibana-app
1213
/src/plugins/input_control_vis/ @elastic/kibana-app
@@ -59,7 +60,6 @@
5960
# APM
6061
/x-pack/plugins/apm/ @elastic/apm-ui
6162
/x-pack/test/functional/apps/apm/ @elastic/apm-ui
62-
/src/legacy/core_plugins/apm_oss/ @elastic/apm-ui
6363
/src/plugins/apm_oss/ @elastic/apm-ui
6464
/src/apm.js @watson @vigneshshanmugam
6565

@@ -83,9 +83,6 @@
8383
/src/plugins/home/public @elastic/kibana-core-ui
8484
/src/plugins/home/server/*.ts @elastic/kibana-core-ui
8585
/src/plugins/home/server/services/ @elastic/kibana-core-ui
86-
# Exclude tutorial resources folder for now because they are not owned by Kibana app and most will move out soon
87-
/src/legacy/core_plugins/kibana/public/home/*.ts @elastic/kibana-core-ui
88-
/src/legacy/core_plugins/kibana/public/home/np_ready/ @elastic/kibana-core-ui
8986
/x-pack/plugins/global_search_bar/ @elastic/kibana-core-ui
9087

9188
# Observability UIs
@@ -167,7 +164,6 @@
167164

168165
# Security
169166
/src/core/server/csp/ @elastic/kibana-security @elastic/kibana-platform
170-
/x-pack/legacy/plugins/spaces/ @elastic/kibana-security
171167
/x-pack/plugins/spaces/ @elastic/kibana-security
172168
/x-pack/plugins/encrypted_saved_objects/ @elastic/kibana-security
173169
/x-pack/plugins/security/ @elastic/kibana-security
@@ -285,8 +281,6 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
285281
# Core design
286282
/src/plugins/dashboard/**/*.scss @elastic/kibana-core-ui-designers
287283
/x-pack/plugins/canvas/**/*.scss @elastic/kibana-core-ui-designers
288-
/src/legacy/core_plugins/kibana/public/home/**/*.scss @elastic/kibana-core-ui-designers
289-
/x-pack/legacy/plugins/spaces/**/*.scss @elastic/kibana-core-ui-designers
290284
/x-pack/plugins/spaces/**/*.scss @elastic/kibana-core-ui-designers
291285
/x-pack/plugins/security/**/*.scss @elastic/kibana-core-ui-designers
292286

‎.github/paths-labeller.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,11 @@
1616
- "x-pack/test/epm_api_integration/**/*.*"
1717
- "Team:uptime":
1818
- "x-pack/plugins/uptime/**/*.*"
19+
- "x-pack/plugins/apm/e2e/cypress/support/step_definitions/csm/*.*"
20+
- "x-pack/plugins/apm/public/application/csmApp.tsx"
21+
- "x-pack/plugins/apm/public/components/app/RumDashboard/**/*.*"
22+
- "x-pack/plugins/apm/public/components/app/RumDashboard/*.*"
23+
- "x-pack/plugins/apm/server/lib/rum_client/**/*.*"
24+
- "x-pack/plugins/apm/server/lib/rum_client/*.*"
25+
- "x-pack/plugins/apm/server/routes/rum_client.ts"
26+
- "x-pack/plugins/apm/server/projections/rum_overview.ts"

‎docs/developer/architecture/security/feature-registration.asciidoc‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,12 @@ Registering a feature consists of the following fields. For more information, co
3838
|`"Sample Feature"`
3939
|A human readable name for your feature.
4040

41+
|`category` (required)
42+
|{kib-repo}blob/{branch}/src/core/types/app_category.ts[`AppCategory`]
43+
|`DEFAULT_APP_CATEGORIES.kibana`
44+
|The `AppCategory` which best represents your feature. Used to organize the display
45+
of features within the management screens.
46+
4147
|`app` (required)
4248
|`string[]`
4349
|`["sample_app", "kibana"]`
@@ -96,6 +102,7 @@ public setup(core, { features }) {
96102
name: 'Canvas',
97103
icon: 'canvasApp',
98104
navLinkId: 'canvas',
105+
category: DEFAULT_APP_CATEGORIES.kibana,
99106
app: ['canvas', 'kibana'],
100107
catalogue: ['canvas'],
101108
privileges: {
@@ -155,6 +162,7 @@ public setup(core, { features }) {
155162
}),
156163
icon: 'devToolsApp',
157164
navLinkId: 'dev_tools',
165+
category: DEFAULT_APP_CATEGORIES.management,
158166
app: ['kibana'],
159167
catalogue: ['console', 'searchprofiler', 'grokdebugger'],
160168
privileges: {
@@ -217,6 +225,7 @@ public setup(core, { features }) {
217225
order: 100,
218226
icon: 'discoverApp',
219227
navLinkId: 'discover',
228+
category: DEFAULT_APP_CATEGORIES.kibana,
220229
app: ['kibana'],
221230
catalogue: ['discover'],
222231
privileges: {

‎docs/developer/plugin-list.asciidoc‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,12 @@ which also contains the timelion APIs and backend, look at the vis_type_timelion
181181
To integrate with the telemetry services for usage collection of your feature, there are 2 steps:
182182
183183
184+
|{kib-repo}blob/{branch}/src/plugins/vis_default_editor/README.md[visDefaultEditor]
185+
|The default editor is used in most primary visualizations, e.x. Area, Data table, Pie, etc.
186+
It acts as a container for a particular visualization and options tabs. Contains the default "Data" tab in public/components/sidebar/data_tab.tsx.
187+
The plugin exposes the static DefaultEditorController class to consume.
188+
189+
184190
|{kib-repo}blob/{branch}/src/plugins/vis_type_markdown/README.md[visTypeMarkdown]
185191
|The markdown visualization that can be used to place text panels on dashboards.
186192

‎docs/development/core/server/kibana-plugin-core-server.appcategory.arialabel.md‎

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-core-server](./kibana-plugin-core-server.md) &gt; [AppCategory](./kibana-plugin-core-server.appcategory.md) &gt; [ariaLabel](./kibana-plugin-core-server.appcategory.arialabel.md)
4+
5+
## AppCategory.ariaLabel property
6+
7+
If the visual label isn't appropriate for screen readers, can override it here
8+
9+
<b>Signature:</b>
10+
11+
```typescript
12+
ariaLabel?: string;
13+
```

‎docs/development/core/server/kibana-plugin-core-server.appcategory.euiicontype.md‎

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-core-server](./kibana-plugin-core-server.md) &gt; [AppCategory](./kibana-plugin-core-server.appcategory.md) &gt; [euiIconType](./kibana-plugin-core-server.appcategory.euiicontype.md)
4+
5+
## AppCategory.euiIconType property
6+
7+
Define an icon to be used for the category If the category is only 1 item, and no icon is defined, will default to the product icon Defaults to initials if no icon is defined
8+
9+
<b>Signature:</b>
10+
11+
```typescript
12+
euiIconType?: string;
13+
```

‎docs/development/core/server/kibana-plugin-core-server.appcategory.id.md‎

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-core-server](./kibana-plugin-core-server.md) &gt; [AppCategory](./kibana-plugin-core-server.appcategory.md) &gt; [id](./kibana-plugin-core-server.appcategory.id.md)
4+
5+
## AppCategory.id property
6+
7+
Unique identifier for the categories
8+
9+
<b>Signature:</b>
10+
11+
```typescript
12+
id: string;
13+
```

‎docs/development/core/server/kibana-plugin-core-server.appcategory.label.md‎

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-core-server](./kibana-plugin-core-server.md) &gt; [AppCategory](./kibana-plugin-core-server.appcategory.md) &gt; [label](./kibana-plugin-core-server.appcategory.label.md)
4+
5+
## AppCategory.label property
6+
7+
Label used for category name. Also used as aria-label if one isn't set.
8+
9+
<b>Signature:</b>
10+
11+
```typescript
12+
label: string;
13+
```

‎docs/development/core/server/kibana-plugin-core-server.appcategory.md‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<!-- Do not edit this file. It is automatically generated by API Documenter. -->
2+
3+
[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [AppCategory](./kibana-plugin-core-server.appcategory.md)
4+
5+
## AppCategory interface
6+
7+
A category definition for nav links to know where to sort them in the left hand nav
8+
9+
<b>Signature:</b>
10+
11+
```typescript
12+
export interface AppCategory
13+
```
14+
15+
## Properties
16+
17+
| Property | Type | Description |
18+
| --- | --- | --- |
19+
| [ariaLabel](./kibana-plugin-core-server.appcategory.arialabel.md) | <code>string</code> | If the visual label isn't appropriate for screen readers, can override it here |
20+
| [euiIconType](./kibana-plugin-core-server.appcategory.euiicontype.md) | <code>string</code> | Define an icon to be used for the category If the category is only 1 item, and no icon is defined, will default to the product icon Defaults to initials if no icon is defined |
21+
| [id](./kibana-plugin-core-server.appcategory.id.md) | <code>string</code> | Unique identifier for the categories |
22+
| [label](./kibana-plugin-core-server.appcategory.label.md) | <code>string</code> | Label used for category name. Also used as aria-label if one isn't set. |
23+
| [order](./kibana-plugin-core-server.appcategory.order.md) | <code>number</code> | The order that categories will be sorted in Prefer large steps between categories to allow for further editing (Default categories are in steps of 1000) |
24+

0 commit comments

Comments
 (0)