Fixes conflict

This commit is contained in:
KOTungseth 2020-12-07 11:11:53 -06:00
parent 865824bb87
commit 1cc2986353

View file

@ -1,7 +1,102 @@
[[vega]]
=== Add custom panels with Vega
<<<<<<< Updated upstream:docs/user/dashboard/vega.asciidoc
<<<<<<< Updated upstream:docs/user/dashboard/vega.asciidoc
<<<<<<< Updated upstream:docs/user/dashboard/vega.asciidoc
In this tutorial, learn how to edit Vega-Lite in {kib} to create
=======
=======
>>>>>>> Stashed changes:docs/user/dashboard/vega.asciidoc
=======
>>>>>>> Stashed changes:docs/user/dashboard/vega.asciidoc
<<<<<<< HEAD:docs/user/dashboard/tutorials.asciidoc
Learn how to use *Lens*, *Vega*, and *Timelion* by going through one of the step-by-step tutorials.
[[lens-tutorial]]
=== Compare sales over time with Lens
Ready to create your own visualization with *Lens*? Use the following tutorial to create a visualization that lets you compare sales over time.
[float]
[[lens-before-begin]]
==== Before you begin
To start, add the <<add-sample-data, sample ecommerce data>>.
[float]
==== Build the visualization
Drag and drop your data onto the visualization builder pane.
. Select the *kibana_sample_data_ecommerce* index pattern.
. Click image:images/time-filter-calendar.png[], then click *Last 7 days*.
+
The *Available fields* automatically update.
. Drag and drop the *taxful_total_price* data field to the visualization builder pane.
+
[role="screenshot"]
image::images/lens_tutorial_1.png[Lens tutorial]
To display the average order prices over time, *Lens* automatically added *order_date* to the *X-axis*.
To break down your data, drag and drop the *category.keyword* field to the visualization builder pane. Lens
knows that you want to show the top categories and compare them across the dates,
and creates a chart that compares the sales for each of the top three categories:
[role="screenshot"]
image::images/lens_tutorial_2.png[Lens tutorial]
[float]
[[customize-lens-visualization]]
==== Customize your visualization
Make your visualization look exactly how you want with the customization options.
. Click *Average of taxful_total_price*, then change the *Display name* to Sales.
+
[role="screenshot"]
image::images/lens_tutorial_3.1.png[Lens tutorial]
. Click *Close*.
. Click *Top values of category.keyword*, then change *Number of values* to `10`.
+
[role="screenshot"]
image::images/lens_tutorial_3.2.png[Lens tutorial]
. Click *Close*.
+
The visualization updates to show there are only six available categories.
. Look at the *Suggestions*. An area chart is not an option, but for the sales data, a stacked area chart might be the best option.
To switch the chart type, click *Stacked bar chart*, then click *Stacked area* from the *Select a visualization* dropdown.
+
[role="screenshot"]
image::images/lens_tutorial_3.png[Lens tutorial]
[float]
[[lens-tutorial-next-steps]]
==== What's next?
Now that you've created your *Lens* visualization, add it to a <<dashboard,dashboard>> or <<canvas,Canvas workpad>>.
[[vega-lite-tutorial-create-your-first-visualizations]]
=== Create your first visualization with Vega-Lite
In this tutorial, you will learn about how to edit Vega-Lite in {kib} to create
=======
In this tutorial, learn how to edit Vega-Lite in {kib} to create
>>>>>>> 865824bb873bceb52474b8bc279df9524077b131:docs/user/dashboard/vega.asciidoc
<<<<<<< Updated upstream:docs/user/dashboard/vega.asciidoc
<<<<<<< Updated upstream:docs/user/dashboard/vega.asciidoc
>>>>>>> Stashed changes:docs/user/dashboard/vega.asciidoc
=======
>>>>>>> Stashed changes:docs/user/dashboard/vega.asciidoc
=======
>>>>>>> Stashed changes:docs/user/dashboard/vega.asciidoc
a stacked area chart from an {es} search query. It will give you a starting point
for a more comprehensive
https://vega.github.io/vega-lite/tutorials/getting_started.html[introduction to Vega-Lite],
@ -605,7 +700,27 @@ The final result of this tutorial is this spec:
[float]
[[vega-tutorial-update-kibana-filters-from-vega]]
<<<<<<< Updated upstream:docs/user/dashboard/vega.asciidoc
<<<<<<< Updated upstream:docs/user/dashboard/vega.asciidoc
<<<<<<< Updated upstream:docs/user/dashboard/vega.asciidoc
=== Try it: Update {kib} filters from Vega
=======
=======
>>>>>>> Stashed changes:docs/user/dashboard/vega.asciidoc
=======
>>>>>>> Stashed changes:docs/user/dashboard/vega.asciidoc
<<<<<<< HEAD:docs/user/dashboard/tutorials.asciidoc
=== Update {kib} filters from Vega
=======
=== Try it: Update {kib} filters from Vega
>>>>>>> 865824bb873bceb52474b8bc279df9524077b131:docs/user/dashboard/vega.asciidoc
<<<<<<< Updated upstream:docs/user/dashboard/vega.asciidoc
<<<<<<< Updated upstream:docs/user/dashboard/vega.asciidoc
>>>>>>> Stashed changes:docs/user/dashboard/vega.asciidoc
=======
>>>>>>> Stashed changes:docs/user/dashboard/vega.asciidoc
=======
>>>>>>> Stashed changes:docs/user/dashboard/vega.asciidoc
In this tutorial you will build an area chart in Vega using an {es} search query,
and add a click handler and drag handler to update {kib} filters.
@ -1198,5 +1313,26 @@ The final Vega spec for this tutorial is here:
For more information about *Vega* and *Vega-Lite*, refer to:
<<<<<<< Updated upstream:docs/user/dashboard/vega.asciidoc
<<<<<<< Updated upstream:docs/user/dashboard/vega.asciidoc
<<<<<<< Updated upstream:docs/user/dashboard/vega.asciidoc
* <<reference-for-kibana-extensions,Reference for Kibana extensions>>
* <<resources-and-examples,Resources and examples>>
=======
=======
>>>>>>> Stashed changes:docs/user/dashboard/vega.asciidoc
=======
>>>>>>> Stashed changes:docs/user/dashboard/vega.asciidoc
<<<<<<< HEAD:docs/user/dashboard/tutorials.asciidoc
For additional information on Timelion conditional capabilities, go to https://www.elastic.co/blog/timeseries-if-then-else-with-timelion[I have but one .condition()].
=======
* <<reference-for-kibana-extensions,Reference for Kibana extensions>>
* <<resources-and-examples,Resources and examples>>
>>>>>>> 865824bb873bceb52474b8bc279df9524077b131:docs/user/dashboard/vega.asciidoc
<<<<<<< Updated upstream:docs/user/dashboard/vega.asciidoc
<<<<<<< Updated upstream:docs/user/dashboard/vega.asciidoc
>>>>>>> Stashed changes:docs/user/dashboard/vega.asciidoc
=======
>>>>>>> Stashed changes:docs/user/dashboard/vega.asciidoc
=======
>>>>>>> Stashed changes:docs/user/dashboard/vega.asciidoc