Skip to content

Commit 42c96a4

Browse files
committed
Merge branch 'master' of github.com:kevinlog/kibana into task/hostname-policy-response-ux-updates
2 parents 16a6126 + 5c457d1 commit 42c96a4

File tree

4,556 files changed

+214668
-154836
lines changed

Some content is hidden

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

4,556 files changed

+214668
-154836
lines changed

.ci/end2end.groovy

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -37,22 +37,31 @@ pipeline {
3737
deleteDir()
3838
gitCheckout(basedir: "${BASE_DIR}", githubNotifyFirstTimeContributor: false,
3939
shallow: false, reference: "/var/lib/jenkins/.git-references/kibana.git")
40+
41+
// Filter when to run based on the below reasons:
42+
// - On a PRs when:
43+
// - There are changes related to the APM UI project
44+
// - only when the owners of those changes are members of the apm-ui team (new filter)
45+
// - On merges to branches when:
46+
// - There are changes related to the APM UI project
47+
// - FORCE parameter is set to true.
4048
script {
49+
def apm_updated = false
4150
dir("${BASE_DIR}"){
42-
def regexps =[ "^x-pack/plugins/apm/.*" ]
43-
env.APM_UPDATED = isGitRegionMatch(patterns: regexps)
51+
apm_updated = isGitRegionMatch(patterns: [ "^x-pack/plugins/apm/.*" ])
52+
}
53+
if (isPR()) {
54+
def isMember = isMemberOf(user: env.CHANGE_AUTHOR, team: 'apm-ui')
55+
setEnvVar('RUN_APM_E2E', params.FORCE || (apm_updated && isMember))
56+
} else {
57+
setEnvVar('RUN_APM_E2E', params.FORCE || apm_updated)
4458
}
4559
}
4660
}
4761
}
4862
stage('Prepare Kibana') {
4963
options { skipDefaultCheckout() }
50-
when {
51-
anyOf {
52-
expression { return params.FORCE }
53-
expression { return env.APM_UPDATED != "false" }
54-
}
55-
}
64+
when { expression { return env.RUN_APM_E2E != "false" } }
5665
environment {
5766
JENKINS_NODE_COOKIE = 'dontKillMe'
5867
}
@@ -70,12 +79,7 @@ pipeline {
7079
}
7180
stage('Smoke Tests'){
7281
options { skipDefaultCheckout() }
73-
when {
74-
anyOf {
75-
expression { return params.FORCE }
76-
expression { return env.APM_UPDATED != "false" }
77-
}
78-
}
82+
when { expression { return env.RUN_APM_E2E != "false" } }
7983
steps{
8084
notifyTestStatus('Running smoke tests', 'PENDING')
8185
dir("${BASE_DIR}"){

.eslintignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ target
3939
/x-pack/legacy/plugins/maps/public/vendor/**
4040

4141
# package overrides
42-
/packages/eslint-config-kibana
42+
/packages/elastic-eslint-config-kibana
4343
/packages/kbn-interpreter/src/common/lib/grammar.js
4444
/packages/kbn-plugin-generator/template
4545
/packages/kbn-pm/dist

.eslintrc.js

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,6 @@ module.exports = {
9494
'jsx-a11y/no-onchange': 'off',
9595
},
9696
},
97-
{
98-
files: ['src/plugins/es_ui_shared/**/*.{js,mjs,ts,tsx}'],
99-
rules: {
100-
'react-hooks/exhaustive-deps': 'off',
101-
},
102-
},
10397
{
10498
files: ['src/plugins/kibana_react/**/*.{js,mjs,ts,tsx}'],
10599
rules: {
@@ -125,25 +119,12 @@ module.exports = {
125119
'jsx-a11y/click-events-have-key-events': 'off',
126120
},
127121
},
128-
{
129-
files: ['x-pack/legacy/plugins/index_management/**/*.{js,mjs,ts,tsx}'],
130-
rules: {
131-
'react-hooks/exhaustive-deps': 'off',
132-
'react-hooks/rules-of-hooks': 'off',
133-
},
134-
},
135122
{
136123
files: ['x-pack/plugins/ml/**/*.{js,mjs,ts,tsx}'],
137124
rules: {
138125
'react-hooks/exhaustive-deps': 'off',
139126
},
140127
},
141-
{
142-
files: ['x-pack/legacy/plugins/snapshot_restore/**/*.{js,mjs,ts,tsx}'],
143-
rules: {
144-
'react-hooks/exhaustive-deps': 'off',
145-
},
146-
},
147128

148129
/**
149130
* Files that require Apache 2.0 headers, settings
@@ -324,6 +305,8 @@ module.exports = {
324305
'!src/core/server/mocks{,.ts}',
325306
'!src/core/server/types{,.ts}',
326307
'!src/core/server/test_utils{,.ts}',
308+
'!src/core/server/utils', // ts alias
309+
'!src/core/server/utils/**/*',
327310
// for absolute imports until fixed in
328311
// https://github.com/elastic/kibana/issues/36096
329312
'!src/core/server/*.test.mocks{,.ts}',

.github/CODEOWNERS

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,13 @@
6363
/src/plugins/apm_oss/ @elastic/apm-ui
6464
/src/apm.js @watson @vigneshshanmugam
6565

66+
# Client Side Monitoring (lives in APM directories but owned by Uptime)
67+
/x-pack/plugins/apm/e2e/cypress/support/step_definitions/rum @elastic/uptime
68+
/x-pack/plugins/apm/public/application/csmApp.tsx @elastic/uptime
69+
/x-pack/plugins/apm/public/components/app/RumDashboard @elastic/uptime
70+
/x-pack/plugins/apm/server/lib/rum_client @elastic/uptime
71+
/x-pack/plugins/apm/server/routes/rum_client.ts @elastic/uptime
72+
6673
# Beats
6774
/x-pack/legacy/plugins/beats_management/ @elastic/beats
6875

@@ -85,7 +92,6 @@
8592
/x-pack/plugins/ingest_manager/ @elastic/ingest-management
8693
/x-pack/legacy/plugins/ingest_manager/ @elastic/ingest-management
8794
/x-pack/plugins/observability/ @elastic/observability-ui
88-
/x-pack/legacy/plugins/monitoring/ @elastic/stack-monitoring-ui
8995
/x-pack/plugins/monitoring/ @elastic/stack-monitoring-ui
9096
/x-pack/plugins/uptime @elastic/uptime
9197

@@ -163,6 +169,7 @@
163169
/x-pack/plugins/encrypted_saved_objects/ @elastic/kibana-security
164170
/x-pack/plugins/security/ @elastic/kibana-security
165171
/x-pack/test/api_integration/apis/security/ @elastic/kibana-security
172+
/x-pack/test/ui_capabilities/ @elastic/kibana-security
166173
/x-pack/test/encrypted_saved_objects_api_integration/ @elastic/kibana-security
167174
/x-pack/test/functional/apps/security/ @elastic/kibana-security
168175
/x-pack/test/kerberos_api_integration/ @elastic/kibana-security
@@ -210,8 +217,19 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
210217
/x-pack/test/functional_with_es_ssl/fixtures/plugins/alerts/ @elastic/kibana-alerting-services
211218

212219
# Enterprise Search
213-
/x-pack/plugins/enterprise_search/ @elastic/app-search-frontend @elastic/workplace-search-frontend
214-
/x-pack/test/functional_enterprise_search/ @elastic/app-search-frontend @elastic/workplace-search-frontend
220+
# Shared
221+
/x-pack/plugins/enterprise_search/ @elastic/enterprise-search-frontend
222+
/x-pack/test/functional_enterprise_search/ @elastic/enterprise-search-frontend
223+
# App Search
224+
/x-pack/plugins/enterprise_search/public/applications/app_search @elastic/app-search-frontend
225+
/x-pack/plugins/enterprise_search/server/routes/app_search @elastic/app-search-frontend
226+
/x-pack/plugins/enterprise_search/server/collectors/app_search @elastic/app-search-frontend
227+
/x-pack/plugins/enterprise_search/server/saved_objects/app_search @elastic/app-search-frontend
228+
# Workplace Search
229+
/x-pack/plugins/enterprise_search/public/applications/workplace_search @elastic/workplace-search-frontend
230+
/x-pack/plugins/enterprise_search/server/routes/workplace_search @elastic/workplace-search-frontend
231+
/x-pack/plugins/enterprise_search/server/collectors/workplace_search @elastic/workplace-search-frontend
232+
/x-pack/plugins/enterprise_search/server/saved_objects/workplace_search @elastic/workplace-search-frontend
215233

216234
# Elasticsearch UI
217235
/src/plugins/dev_tools/ @elastic/es-ui

.github/ISSUE_TEMPLATE/APM.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
name: APM Issue
3+
about: Issues related to the APM solution in Kibana
4+
labels: Team:apm
5+
title: "[APM]"
6+
---
7+
8+
**Versions**
9+
Kibana: (if relevant)
10+
APM Server: (if relevant)
11+
Elasticsearch: (if relevant)

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,3 +60,6 @@ apm.tsconfig.json
6060
# release notes script output
6161
report.csv
6262
report.asciidoc
63+
64+
# TS incremental build cache
65+
*.tsbuildinfo

NOTICE.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,13 @@ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
281281
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
282282
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
283283

284+
---
285+
This product includes code in the function applyCubicBezierStyles that was
286+
inspired by a public Codepen, which was available under a "MIT" license.
287+
288+
Copyright (c) 2020 by Guillaume (https://codepen.io/guillaumethomas/pen/xxbbBKO)
289+
MIT License http://www.opensource.org/licenses/mit-license
290+
284291
---
285292
This product includes code that is adapted from mapbox-gl-js, which is
286293
available under a "BSD-3-Clause" license.

docs/apm/apm-app-users.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ Here are two examples:
8484
| Allow the use of the the {beat_kib_app}
8585

8686
| Spaces
87-
| `Read` or `All` on Dashboards, Visualize, and Discover
87+
| `Read` or `All` on Dashboards and Discover
8888
| Allow the user to view, edit, and create dashboards, as well as browse data.
8989
|====
9090

docs/apm/troubleshooting.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ GET /_template/apm-{version}
4949
*Using Logstash, Kafka, etc.*
5050
If you're not outputting data directly from APM Server to Elasticsearch (perhaps you're using Logstash or Kafka),
5151
then the index template will not be set up automatically. Instead, you'll need to
52-
{apm-server-ref}/_manually_loading_template_configuration.html[load the template manually].
52+
{apm-server-ref}/configuration-template.html[load the template manually].
5353

5454
*Using a custom index names*
5555
This problem can also occur if you've customized the index name that you write APM data to.
Lines changed: 167 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,167 @@
1+
[role="xpack"]
2+
[[add-canvas-elements]]
3+
=== Add elements
4+
5+
Create a story about your data by adding elements to your workpad that include images, text, charts, and more. You can create your own elements and connect them to your data sources, add saved objects, and add your own images.
6+
7+
[float]
8+
[[create-canvas-element]]
9+
==== Create an element
10+
11+
Choose the type of element you want to use, then connect it to your own data.
12+
13+
. Click *Add element*, then select the element you want to use.
14+
+
15+
[role="screenshot"]
16+
image::images/canvas-element-select.gif[Canvas elements]
17+
18+
. To familiarize yourself with the element, use the preconfigured data demo data.
19+
+
20+
By default, most of the elements you create use demo data until you change the data source. The demo data includes a small data set that you can use to experiment with your element.
21+
22+
. To connect the element to your data, select *Data*, then select one of the following data sources:
23+
24+
* *{es} SQL* — Access your data in {es} using SQL syntax. For information about SQL syntax, refer to {ref}/sql-spec.html[SQL language].
25+
26+
* *{es} documents* &mdash; Access your data in {es} without using aggregations. To use, select an index and fields, and optionally enter a query using the <<lucene-query,Lucene Query Syntax>>. Use the *{es} documents* data source when you have low volume datasets, to view raw documents, or to plot exact, non-aggregated values on a chart.
27+
28+
* *Timelion* &mdash; Access your time series data using <<timelion,Timelion>> queries. To use Timelion queries, you can enter a query using the <<lucene-query,Lucene Query Syntax>>.
29+
30+
Each element can display a different data source. Pages and workpads often contain multiple data sources.
31+
32+
[float]
33+
[[canvas-add-object]]
34+
==== Add a saved object
35+
36+
Add <<managing-saved-objects,saved objects>> to your workpad, such as maps and visualizations.
37+
38+
. Click *Add element > Add from Visualize Library*.
39+
40+
. Select the saved object you want to add.
41+
+
42+
[role="screenshot"]
43+
image::images/canvas-map-embed.gif[]
44+
45+
. To use the customization options, click the panel menu, then select one of the following options:
46+
47+
* *Edit map* &mdash; Opens <<maps,Maps>> or <<create-panels,Dashboard>> so that you can edit the original saved object.
48+
49+
* *Edit panel title* &mdash; Adds a title to the saved object.
50+
51+
* *Customize time range* &mdash; Exposes a time filter dedicated to the saved object.
52+
53+
* *Inspect* &mdash; Allows you to drill down into the element data.
54+
55+
[float]
56+
[[canvas-add-image]]
57+
==== Add your own image
58+
59+
To personalize your workpad, add your own logos and graphics.
60+
61+
. Click *Add element > Manage assets*.
62+
63+
. On the *Manage workpad assets* window, drag and drop your images.
64+
65+
. To add the image to the workpad, click the *Create image element* icon.
66+
+
67+
[role="screenshot"]
68+
image::images/canvas-add-image.gif[]
69+
70+
[float]
71+
[[move-canvas-elements]]
72+
==== Organize elements
73+
74+
Move and resize your elements to meet your design needs.
75+
76+
* To move, click and hold the element, then drag to the new location.
77+
78+
* To move by 1 pixel, select the element, press and hold Shift, then use your arrow keys.
79+
80+
* To move by 10 pixels, select the element, then use your arrow keys.
81+
82+
* To resize, click and drag the resize handles to the new dimensions.
83+
84+
[float]
85+
[[format-canvas-elements]]
86+
==== Format elements
87+
88+
For consistency and readability across your workpad pages, align, distribute, and reorder elements.
89+
90+
To align two or more elements:
91+
92+
. Press and hold Shift, then select the elements you want to align.
93+
94+
. Click *Edit > Alignment*, then select the alignment option.
95+
96+
To distribute three or more elements:
97+
98+
. Press and hold Shift, then select the elements you want to distribute.
99+
100+
. Click *Edit > Distribution*, then select the distribution option.
101+
102+
To reorder elements:
103+
104+
. Select the element you want to reorder.
105+
106+
. Click *Edit > Order*, then select the order option.
107+
108+
[float]
109+
[[data-display]]
110+
==== Change the element display options
111+
112+
Each element has its own display options to fit your design needs.
113+
114+
To choose the display options, click *Display*, then make your changes.
115+
116+
To define the appearance of the container and border:
117+
118+
. Next to *Element style*, click *+*, then select *Container style*.
119+
120+
. Expand *Container style*.
121+
122+
. Change the *Appearance* and *Border* options.
123+
124+
To apply CSS overrides:
125+
126+
. Next to *Element style*, click *+*, then select *CSS*.
127+
128+
. Enter the *CSS*.
129+
+
130+
For example, to center the Markdown element, enter:
131+
+
132+
[source,text]
133+
--------------------------------------------------
134+
.canvasRenderEl h1 {
135+
text.align: center;
136+
}
137+
--------------------------------------------------
138+
139+
. Click *Apply stylesheet*.
140+
141+
[float]
142+
[[save-elements]]
143+
==== Save elements
144+
145+
To use the elements across all workpads, save the elements.
146+
147+
When you're ready to save your element, select the element, then click *Edit > Save as new element*.
148+
149+
[role="screenshot"]
150+
image::images/canvas_save_element.png[]
151+
152+
To save a group of elements, press and hold Shift, select the elements you want to save, then click *Edit > Save as new element*.
153+
154+
To access your saved elements, click *Add element > My elements*.
155+
156+
[float]
157+
[[delete-elements]]
158+
==== Delete elements
159+
160+
When you no longer need an element, delete it from your workpad.
161+
162+
. Select the element you want to delete.
163+
164+
. Click *Edit > Delete*.
165+
+
166+
[role="screenshot"]
167+
image::images/canvas_element_options.png[]

0 commit comments

Comments
 (0)