Skip to content

Commit a75da52

Browse files
author
Stacey Gammon
committed
Merge branch 'master' of github.com:elastic/kibana into 2020-05-14-examples-landing-page
2 parents 7a56b5d + 0b8e0c0 commit a75da52

721 files changed

Lines changed: 9187 additions & 6850 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.

.ci/Jenkinsfile_coverage

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ def handleIngestion(timestamp) {
2323
kibanaPipeline.downloadCoverageArtifacts()
2424
kibanaCoverage.prokLinks("### Process HTML Links")
2525
kibanaCoverage.collectVcsInfo("### Collect VCS Info")
26+
kibanaCoverage.generateReports("### Merge coverage reports")
27+
kibanaCoverage.uploadCombinedReports()
2628
kibanaCoverage.ingest(timestamp, '### Injest && Upload')
2729
kibanaCoverage.uploadCoverageStaticSite(timestamp)
2830
}

.eslintrc.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,11 @@ module.exports = {
202202
from: ['(src|x-pack)/plugins/*/server/**/*'],
203203
errorMessage: `Public code can not import from server, use a common directory.`,
204204
},
205+
{
206+
target: ['(src|x-pack)/plugins/*/common/**/*'],
207+
from: ['(src|x-pack)/plugins/*/(server|public)/**/*'],
208+
errorMessage: `Common code can not import from server or public, use a common directory.`,
209+
},
205210
{
206211
target: [
207212
'(src|x-pack)/legacy/**/*',

docs/canvas/canvas-elements.asciidoc

Lines changed: 20 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -27,36 +27,38 @@ By default, most of the elements you create use demo data until you change the d
2727

2828
* *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>>.
2929

30+
Each element can display a different data source. Pages and workpads often contain multiple data sources.
31+
3032
[float]
3133
[[canvas-add-object]]
3234
==== Add a saved object
3335

34-
Add a <<managing-saved-objects,saved object>>, then customize it to fit your display needs.
36+
Add <<managing-saved-objects,saved objects>> to your workpad, such as maps and visualizations.
3537

36-
. Click *Embed object*.
38+
. Click *Add element > Add from Visualize Library*.
3739

38-
. Select the object you want to add.
40+
. Select the saved object you want to add.
3941
+
4042
[role="screenshot"]
4143
image::images/canvas-map-embed.gif[]
4244

4345
. To use the customization options, click the panel menu, then select one of the following options:
4446

45-
* *Edit map* &mdash; Opens <<maps,Maps>> so that you can edit the original map.
47+
* *Edit map* &mdash; Opens <<maps,Maps>> or <<visualize,Visualize>> so that you can edit the original saved object.
4648

47-
* *Customize panel* &mdash; Specifies the object title options.
49+
* *Edit panel title* &mdash; Adds a title to the saved object.
4850

49-
* *Inspect* &mdash; Allows you to drill down into the element data.
51+
* *Customize time range* &mdash; Exposes a time filter dedicated to the saved object.
5052

51-
* *Customize time range* &mdash; Exposes a time filter dedicated to the map.
53+
* *Inspect* &mdash; Allows you to drill down into the element data.
5254

5355
[float]
5456
[[canvas-add-image]]
5557
==== Add your own image
5658

5759
To personalize your workpad, add your own logos and graphics.
5860

59-
. Click *Manage assets*.
61+
. Click *Add element > Manage assets*.
6062

6163
. On the *Manage workpad assets* window, drag and drop your images.
6264

@@ -83,40 +85,25 @@ Move and resize your elements to meet your design needs.
8385
[[format-canvas-elements]]
8486
==== Format elements
8587

86-
Align, distribute, and reorder elements for consistency and readability across your workpad pages.
87-
88-
Access the align, distribute, and reorder options by clicking the *Element options* icon.
89-
90-
[role="screenshot"]
91-
image::images/canvas_element_options.png[]
88+
For consistency and readability across your workpad pages, align, distribute, and reorder elements.
9289

93-
To align elements:
90+
To align two or more elements:
9491

9592
. Press and hold Shift, then select the elements you want to align.
9693

97-
. Click the , then select *Group*.
94+
. Click *Edit > Alignment*, then select the alignment option.
9895

99-
. Click the *Element options* icon, then select *Alignment*.
100-
101-
. Select the alignment option.
102-
103-
To distribute elements:
96+
To distribute three or more elements:
10497

10598
. Press and hold Shift, then select the elements you want to distribute.
10699

107-
. Click the *Element options* icon, then select *Group*.
108-
109-
. Click the *Element options* icon, then select *Distribution*.
110-
111-
. Select the distribution option.
100+
. Click *Edit > Distribution*, then select the distribution option.
112101

113102
To reorder elements:
114103

115104
. Select the element you want to reorder.
116105

117-
. Click the *Element options* icon, then select *Order*.
118-
119-
. Select the order option.
106+
. Click *Edit > Order*, then select the order option.
120107

121108
[float]
122109
[[data-display]]
@@ -157,14 +144,14 @@ text.align: center;
157144

158145
To use the elements across all workpads, save the elements.
159146

160-
When you're ready to save your element, select the element, then click the *Save as new element* icon.
147+
When you're ready to save your element, select the element, then click *Edit > Save as new element*.
161148

162149
[role="screenshot"]
163150
image::images/canvas_save_element.png[]
164151

165-
To save a group of elements, press and hold Shift, then select the elements you want to save.
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*.
166153

167-
To access your saved elements, click *Add element*, then select *My elements*.
154+
To access your saved elements, click *Add element > My elements*.
168155

169156
[float]
170157
[[delete-elements]]
@@ -174,9 +161,7 @@ When you no longer need an element, delete it from your workpad.
174161

175162
. Select the element you want to delete.
176163

177-
. Click the *Element options* icon.
164+
. Click *Edit > Delete*.
178165
+
179166
[role="screenshot"]
180167
image::images/canvas_element_options.png[]
181-
182-
. Select *Delete*.

docs/canvas/canvas-present-workpad.asciidoc

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,20 @@
44

55
When you are ready to present your workpad, use and enable the presentation options.
66

7-
[float]
8-
[[view-fullscreen-mode]]
9-
==== View your workpad in fullscreen mode
7+
. Configure the autoplay options.
108

11-
Click the *Enter fullscreen mode* icon.
9+
.. From the workpad menu, click *View > Autoplay settings*.
1210

11+
.. Under *Change cycling interval*, select the interval you want to use, or *Set a custom interval*.
12+
+
1313
[role="screenshot"]
14-
image::images/canvas-fullscreen.png[Fullscreen mode]
15-
16-
[float]
17-
[[enable-autoplay]]
18-
==== Enable autoplay
14+
image::images/canvas-autoplay-interval.png[Element autoplay interval]
1915

20-
Automatically cycle through your workpads pages in fullscreen mode.
16+
. To enable autoplay, click *View > Turn autoplay on*.
2117

22-
. Click the *Control settings* icon.
23-
24-
. Under *Change cycling interval*, select the interval you want to use.
18+
. To start your presentation, click *View > Enter fullscreen mode*.
2519
+
2620
[role="screenshot"]
27-
image::images/canvas-refresh-interval.png[Element data refresh interval]
21+
image::images/canvas-fullscreen.png[Fullscreen mode]
22+
23+
. When you are ready to exit fullscreen mode, press the Esc (Escape) key.

docs/canvas/canvas-share-workpad.asciidoc

Lines changed: 12 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -10,84 +10,56 @@ When you've finished your workpad, you can share it outside of {kib}.
1010

1111
Create a JSON file of your workpad that you can export outside of {kib}.
1212

13-
. From your workpad, click the *Share workpad* icon.
13+
Click *Share > Download as JSON*.
1414

15-
. Select *Download as JSON*.
16-
+
1715
[role="screenshot"]
1816
image::images/canvas-export-workpad.png[Export single workpad]
1917

20-
Want to export multiple workpads? Go to the *Canvas workpads* view, select the workpads you want to export, then click *Export*.
18+
Want to export multiple workpads? Go to the *Canvas* home page, select the workpads you want to export, then click *Export*.
2119

2220
[float]
2321
[[create-workpad-pdf]]
2422
==== Create a PDF
2523

2624
If you have a license that supports the {report-features}, you can create a PDF copy of your workpad that you can save and share outside {kib}.
2725

28-
For more information, refer to <<reporting-getting-started, Reporting from Kibana>>.
29-
30-
. From your workpad, click the *Share workpad* icon, then select *PDF reports*.
26+
Click *Share > PDF reports > Generate PDF*.
3127

32-
. Click *Generate PDF*.
33-
+
3428
[role="screenshot"]
3529
image::images/canvas-generate-pdf.gif[Generate PDF]
3630

31+
For more information, refer to <<reporting-getting-started, Reporting from Kibana>>.
32+
3733
[float]
3834
[[create-workpad-URL]]
3935
==== Create a POST URL
4036

4137
If you have a license that supports the {report-features}, you can create a POST URL that you can use to automatically generate PDF reports using Watcher or a script.
4238

43-
For more information, refer to <<automating-report-generation, Automating report generation>>.
44-
45-
. From your workpad, click the *Share workpad* icon, then select *PDF reports*.
39+
Click *Share > PDF reports > Copy POST URL*.
4640

47-
. Click *Copy POST URL*.
48-
+
4941
[role="screenshot"]
5042
image::images/canvas-create-URL.gif[Create POST URL]
5143

44+
For more information, refer to <<automating-report-generation, Automating report generation>>.
45+
5246
[float]
5347
[[add-workpad-website]]
5448
==== Share the workpad on a website
5549

5650
beta[] Canvas allows you to create _shareables_, which are workpads that you download and securely share on any website. To customize the behavior of the workpad on your website, you can choose to autoplay the pages or hide the workpad toolbar.
5751

58-
. From your workpad, click the *Share this workpad* icon, then select *Share on a website*.
52+
. Click *Share > Share on a website*.
5953

60-
. On the *Share on a website* pane, follow the instructions.
54+
. Follow the *Share on a website* instructions.
6155

6256
. To customize the workpad behavior to autoplay the pages or hide the toolbar, use the inline parameters.
6357
+
6458
To make sure that your data remains secure, the data in the JSON file is not connected to {kib}. Canvas does not display elements that manipulate the data on the workpad.
6559
+
6660
[role="screenshot"]
67-
image::images/canvas-embed_workpad.gif[Share the workpad on a website]
61+
image::canvas/images/canvas-embed_workpad.gif[Share the workpad on a website]
6862
+
6963
NOTE: Shareable workpads encode the current state of the workpad in a JSON file. When you make changes to the workpad, the changes do not appear in the shareable workpad on your website.
7064

71-
[float]
72-
[[change-the-workpad-settings]]
73-
==== Change the settings
74-
75-
After you've added the workpad to your website, you can change the autoplay and toolbar settings.
76-
77-
To change the autoplay settings:
78-
79-
. Click the settings icon.
80-
81-
. Click *Auto Play*, then change the settings.
82-
+
83-
[role="screenshot"]
84-
image::images/canvas_share_autoplay_480.gif[Autoplay settings]
85-
86-
To change the toolbar settings:
87-
88-
. Click the settings icon.
89-
90-
. Click *Toolbar*, then change the settings.
91-
+
92-
[role="screenshot"]
93-
image::images/canvas_share_hidetoolbar_480.gif[Hide toolbar settings]
65+
. To change the settings, click the settings icon, then choose the settings you want to use.

0 commit comments

Comments
 (0)