Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into nls/date-round
Browse files Browse the repository at this point in the history
  • Loading branch information
smith committed Jan 26, 2021
2 parents ba1a4b7 + 0c2c451 commit 0c8556f
Show file tree
Hide file tree
Showing 296 changed files with 4,608 additions and 3,009 deletions.
8 changes: 4 additions & 4 deletions .browserslistrc
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
last 2 Firefox versions
last 2 Chrome versions
last 2 Safari versions
> 0.25%
not ie 11
not op_mini all
not samsung 4
last 2 Edge versions
last 1 ios_saf versions
last 1 and_chr versions
last 1 samsung versions

[dev]
last 1 chrome versions
Expand Down
1 change: 1 addition & 0 deletions .ci/teamcity/default/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ node scripts/build_kibana_platform_plugins \
--scan-dir "$XPACK_DIR/test/plugin_api_integration/plugins" \
--scan-dir "$XPACK_DIR/test/plugin_api_perf/plugins" \
--scan-dir "$XPACK_DIR/test/licensing_plugin/plugins" \
--scan-dir "$XPACK_DIR/test/usage_collection/plugins" \
--verbose
tc_end_block "Build Platform Plugins"

Expand Down
4 changes: 4 additions & 0 deletions .teamcity/src/builds/default/DefaultFunctionalBase.kt
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
package builds.default

import StandardAgents
import addTestSettings
import co.elastic.teamcity.common.requireAgent
import jetbrains.buildServer.configs.kotlin.v2019_2.BuildType

open class DefaultFunctionalBase(init: BuildType.() -> Unit = {}) : BuildType({
params {
param("env.KBN_NP_PLUGINS_BUILT", "true")
}

requireAgent(StandardAgents["4"]!!)

dependencies {
defaultBuildWithPlugins()
}
Expand Down
2 changes: 1 addition & 1 deletion dev_docs/kibana_platform_plugin_intro.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ We recognize the need to better clarify the relationship between core functional
The main difference between core functionality and functionality supplied by plugins, is in how it is accessed. Core is
passed to plugins as the first parameter to their `start` and `setup` lifecycle functions, while plugin supplied functionality is passed as the
second parameter. Plugin dependencies must be declared explicitly inside the `kibana.json` file. Core functionality is always provided. Read the
section on [how plugins interact with eachother and core](#how-plugins-interact-with-each-other-and-core) for more information.
section on <DocLink id="kibPlatformIntro" section="how-plugins-interact-with-each-other-and-core" text="how plugins interact with eachother and core"/> for more information.

## The anatomy of a plugin

Expand Down
5 changes: 0 additions & 5 deletions docs/management/advanced-options.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -134,11 +134,6 @@ The maximum numbers of buckets that a single data source can return. This might
arise when the user selects a short interval (for example, 1s) for a long time
period (1 year).

[[pagenavigation]]`pageNavigation`::
The style of navigation menu for Kibana. Choices are Legacy, the legacy style
where every plugin is represented in the nav, and Modern, a new format that
bundles related plugins together in flyaway nested navigation.

[[query-allowleadingwildcards]]`query:allowLeadingWildcards`::
Allows a wildcard (*) as the first character in a query clause. Only applies
when experimental query features are enabled in the query bar. To disallow
Expand Down
5 changes: 4 additions & 1 deletion docs/management/index-patterns.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -158,10 +158,13 @@ date values in {es}, you can use a {kib} field formatter to change the display t
<<field-formatters-geopoint, geopoints>>,
and <<field-formatters-numeric, numbers>>.

To customize the displayed field name provided by {es}, you can
use *Custom Label* .

A popularity counter keeps track of the fields you use most often.
The top five most popular fields and their values are displayed in <<discover,*Discover*>>.

To edit the field format and popularity counter, click the edit icon
To edit the field display, click the edit icon
(image:management/index-patterns/images/edit_icon.png[]) in the index pattern detail view.

[role="screenshot"]
Expand Down
Binary file modified docs/management/index-patterns/images/edit-field-format.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions docs/management/managing-fields.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ To format a field:
. Open the main menu, and click *Stack Management > Index Patterns*.
. Click the index pattern that contains the field you want to format.
. Find the field you want to format and click the edit icon (image:management/index-patterns/images/edit_icon.png[]).
. Enter a custom label for the field, if needed.
. Select a format and fill in the details.
+
[role="screenshot"]
Expand Down
42 changes: 27 additions & 15 deletions docs/maps/index.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -9,28 +9,40 @@
[partintro]
--

Maps enables you to parse through your geographical data at scale, with speed, and in real time. With features like multiple layers and indices in a map, plotting of raw documents, dynamic client-side styling, and global search across multiple layers, you can understand and monitor your data with ease.
Create beautiful maps from your geographical data. With **Maps**, you can:

With Maps, you can:

* Create maps with multiple layers and indices.
* Upload GeoJSON files into Elasticsearch.
* Build maps with multiple layers and indices.
* Upload GeoJSON.
* Embed your map in dashboards.
* Symbolize features using data values.
* Focus in on just the data you want.

*Ready to get started?* Start your tour of Maps with the <<maps-getting-started, getting started tutorial>>.
* Focus on only the data that’s important to you.

*Ready to get started?* Watch the https://videos.elastic.co/watch/BYzRDtH4u7RSD8wKhuEW1b[video], and then start your tour of **Maps** with the <<maps-getting-started, getting started tutorial>>.

++++
<script type="text/javascript" async src="https://play.vidyard.com/embed/v4.js">
</script>
<img
style="width: 100%; margin: auto; display: block;"
class="vidyard-player-embed"
src="https://play.vidyard.com/BYzRDtH4u7RSD8wKhuEW1b.jpg"
data-uuid="BYzRDtH4u7RSD8wKhuEW1b"
data-v="4"
data-type="inline"
/>
</br>
++++

[float]
=== Create maps with multiple layers and indices
You can use multiple layers and indices to show all your data in a single map. This enables your map to show how data sits relative to physical features like weather patterns, human-made features like international borders, and business-specific features like sales regions. You can plot individual documents or use aggregations to plot any data set, no matter how large.
=== Build maps with multiple layers and indices
Use multiple layers and indices to show all your data in a single map. Show how data sits relative to physical features like weather patterns, human-made features like international borders, and business-specific features like sales regions. Plot individual documents or use aggregations to plot any data set, no matter how large.

[role="screenshot"]
image::maps/images/sample_data_ecommerce.png[]

[float]
=== Upload GeoJSON files into Elasticsearch
Maps makes it easy to import geospatial data into the Elastic Stack. Using the GeoJSON Upload feature, you can drag and drop your point and shape data files directly into Elasticsearch, and then use them as layers in the map.
=== Upload GeoJSON
Use **Maps** to drag and drop your GeoJSON points, lines, and polygons into Elasticsearch, and then use them as layers in your map.

[float]
=== Embed your map in dashboards
Expand All @@ -43,11 +55,11 @@ image::maps/images/embed_in_dashboard.jpeg[]

[float]
=== Symbolize features using data values
You can customize each layer to highlight meaningful dimensions in your data. For example, you can use dark colors to symbolize areas with more web log traffic, and lighter colors to symbolize areas with less traffic.
Customize each layer to highlight meaningful dimensions in your data. For example, use dark colors to symbolize areas with more web log traffic, and lighter colors to symbolize areas with less traffic.

[float]
=== Focus in on just the data you want
You can search across your Elasticsearch layers to focus in on just the data you want. Draw a polygon on the map or use the shape from features to create spatial filters to narrow search results to documents that either intersect with, are within, or do not intersect with the specified geometry. Filter individual layers to compares facets.
=== Focus on only the data that’s important to you
Search across your Elasticsearch layers to focus in on just the data you want. Combine free text search with field-based search using the <<kuery-query,{kib} Query Language>>. Set the time filter to restrict layers by time. Draw a polygon on the map or use the shape from features to create spatial filters. Filter individual layers to compares facets.


--
Expand Down
50 changes: 25 additions & 25 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,12 @@
"yarn": "^1.21.1"
},
"dependencies": {
"@babel/core": "^7.11.6",
"@babel/runtime": "^7.11.2",
"@babel/core": "^7.12.10",
"@babel/runtime": "^7.12.5",
"@elastic/datemath": "link:packages/elastic-datemath",
"@elastic/elasticsearch": "npm:@elastic/elasticsearch-canary@^8.0.0-canary",
"@elastic/ems-client": "7.11.0",
"@elastic/eui": "31.0.0",
"@elastic/eui": "31.3.0",
"@elastic/filesaver": "1.1.2",
"@elastic/good": "^9.0.1-kibana3",
"@elastic/node-crypto": "1.2.1",
Expand Down Expand Up @@ -330,22 +330,22 @@
"yauzl": "^2.10.0"
},
"devDependencies": {
"@babel/cli": "^7.10.5",
"@babel/parser": "^7.11.2",
"@babel/plugin-proposal-class-properties": "^7.10.4",
"@babel/plugin-proposal-export-namespace-from": "^7.10.4",
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.10.4",
"@babel/plugin-proposal-object-rest-spread": "^7.11.0",
"@babel/plugin-proposal-optional-chaining": "^7.11.0",
"@babel/plugin-proposal-private-methods": "^7.10.4",
"@babel/plugin-transform-modules-commonjs": "^7.10.4",
"@babel/plugin-transform-runtime": "^7.11.0",
"@babel/preset-env": "^7.11.0",
"@babel/preset-react": "^7.10.4",
"@babel/preset-typescript": "^7.10.4",
"@babel/register": "^7.10.5",
"@babel/traverse": "^7.11.5",
"@babel/types": "^7.11.0",
"@babel/cli": "^7.12.10",
"@babel/parser": "^7.12.11",
"@babel/plugin-proposal-class-properties": "^7.12.1",
"@babel/plugin-proposal-export-namespace-from": "^7.12.1",
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.12.1",
"@babel/plugin-proposal-object-rest-spread": "^7.12.1",
"@babel/plugin-proposal-optional-chaining": "^7.12.7",
"@babel/plugin-proposal-private-methods": "^7.12.1",
"@babel/plugin-transform-modules-commonjs": "^7.12.1",
"@babel/plugin-transform-runtime": "^7.12.10",
"@babel/preset-env": "^7.12.11",
"@babel/preset-react": "^7.12.10",
"@babel/preset-typescript": "^7.12.7",
"@babel/register": "^7.12.10",
"@babel/traverse": "^7.12.12",
"@babel/types": "^7.12.12",
"@cypress/snapshot": "^2.1.7",
"@cypress/webpack-preprocessor": "^5.5.0",
"@elastic/apm-rum": "^5.6.1",
Expand Down Expand Up @@ -407,7 +407,7 @@
"@types/angular": "^1.6.56",
"@types/angular-mocks": "^1.7.0",
"@types/archiver": "^5.1.0",
"@types/babel__core": "^7.1.10",
"@types/babel__core": "^7.1.12",
"@types/base64-js": "^1.2.5",
"@types/bluebird": "^3.1.1",
"@types/chance": "^1.0.0",
Expand Down Expand Up @@ -580,10 +580,10 @@
"argsplit": "^1.0.5",
"autoprefixer": "^9.7.4",
"axe-core": "^4.0.2",
"babel-eslint": "^10.0.3",
"babel-jest": "^26.3.0",
"babel-loader": "^8.0.6",
"babel-plugin-add-module-exports": "^1.0.2",
"babel-eslint": "^10.1.0",
"babel-jest": "^26.6.3",
"babel-loader": "^8.2.2",
"babel-plugin-add-module-exports": "^1.0.4",
"babel-plugin-istanbul": "^6.0.0",
"babel-plugin-require-context-hook": "^1.0.0",
"babel-plugin-styled-components": "^1.10.7",
Expand Down Expand Up @@ -629,7 +629,7 @@
"eslint-import-resolver-node": "0.3.2",
"eslint-import-resolver-webpack": "0.11.1",
"eslint-module-utils": "2.5.0",
"eslint-plugin-babel": "^5.3.0",
"eslint-plugin-babel": "^5.3.1",
"eslint-plugin-ban": "^1.4.0",
"eslint-plugin-cypress": "^2.11.2",
"eslint-plugin-eslint-comments": "^3.2.0",
Expand Down
Loading

0 comments on commit 0c8556f

Please sign in to comment.