Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/6.x' into 6.x
Browse files Browse the repository at this point in the history
  • Loading branch information
lukasolson committed Jul 25, 2018
2 parents 861375d + 0f0e96b commit 8f3692e
Show file tree
Hide file tree
Showing 188 changed files with 10,972 additions and 1,187 deletions.
2 changes: 1 addition & 1 deletion .backportrc.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"upstream": "elastic/kibana",
"branches": [{ "name": "6.x", "checked": true }, "6.3", "6.2", "6.1", "6.0", "5.6"],
"branches": [{ "name": "6.x", "checked": true }, "6.4", "6.3", "6.2", "6.1", "6.0", "5.6"],
"labels": ["backport"]
}
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Kibana 6.4.0
# Kibana 6.5.0

Kibana is your window into the [Elastic Stack](https://www.elastic.co/products). Specifically, it's a browser-based analytics and search dashboard for Elasticsearch.

Expand Down Expand Up @@ -43,9 +43,9 @@ For the daring, snapshot builds are available. These builds are created nightly

| platform | default | OSS |
| --- | --- | --- |
| OSX | [tar](https://snapshots.elastic.co/downloads/kibana/kibana-6.4.0-SNAPSHOT-darwin-x86_64.tar.gz) | [tar](https://snapshots.elastic.co/downloads/kibana/kibana-oss-6.4.0-SNAPSHOT-darwin-x86_64.tar.gz) |
| Linux | [tar](https://snapshots.elastic.co/downloads/kibana/kibana-6.4.0-SNAPSHOT-linux-x86_64.tar.gz) [deb](https://snapshots.elastic.co/downloads/kibana/kibana-6.4.0-SNAPSHOT-amd64.deb) [rpm](https://snapshots.elastic.co/downloads/kibana/kibana-6.4.0-SNAPSHOT-x86_64.rpm) | [tar](https://snapshots.elastic.co/downloads/kibana/kibana-oss-6.4.0-SNAPSHOT-linux-x86_64.tar.gz) [deb](https://snapshots.elastic.co/downloads/kibana/kibana-oss-6.4.0-SNAPSHOT-amd64.deb) [rpm](https://snapshots.elastic.co/downloads/kibana/kibana-oss-6.4.0-SNAPSHOT-x86_64.rpm) |
| Windows | [zip](https://snapshots.elastic.co/downloads/kibana/kibana-6.4.0-SNAPSHOT-windows-x86_64.zip) | [zip](https://snapshots.elastic.co/downloads/kibana/kibana-oss-6.4.0-SNAPSHOT-windows-x86_64.zip) |
| OSX | [tar](https://snapshots.elastic.co/downloads/kibana/kibana-6.5.0-SNAPSHOT-darwin-x86_64.tar.gz) | [tar](https://snapshots.elastic.co/downloads/kibana/kibana-oss-6.5.0-SNAPSHOT-darwin-x86_64.tar.gz) |
| Linux | [tar](https://snapshots.elastic.co/downloads/kibana/kibana-6.5.0-SNAPSHOT-linux-x86_64.tar.gz) [deb](https://snapshots.elastic.co/downloads/kibana/kibana-6.5.0-SNAPSHOT-amd64.deb) [rpm](https://snapshots.elastic.co/downloads/kibana/kibana-6.5.0-SNAPSHOT-x86_64.rpm) | [tar](https://snapshots.elastic.co/downloads/kibana/kibana-oss-6.5.0-SNAPSHOT-linux-x86_64.tar.gz) [deb](https://snapshots.elastic.co/downloads/kibana/kibana-oss-6.5.0-SNAPSHOT-amd64.deb) [rpm](https://snapshots.elastic.co/downloads/kibana/kibana-oss-6.5.0-SNAPSHOT-x86_64.rpm) |
| Windows | [zip](https://snapshots.elastic.co/downloads/kibana/kibana-6.5.0-SNAPSHOT-windows-x86_64.zip) | [zip](https://snapshots.elastic.co/downloads/kibana/kibana-oss-6.5.0-SNAPSHOT-windows-x86_64.zip) |

## Documentation

Expand Down
13 changes: 11 additions & 2 deletions docs/CHANGELOG.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,15 @@ This section summarizes the changes in each release.

[float]
=== Bug fixes

Accessibility::
* [Fixes #19012] Adds missing aria level on the solutions page in {kib}. In
particular, it adds aria-level to KuiCardDescriptionTitle. {pull}20579[#20579]

Dashboard::
* [Fixes #20635] Reduces the scale factor to 4 when migrating panels that are in
a dashboard with margins. {pull}20727[#20727]

Discover::
* [Fixes #19445] Removes outdated Aria attribute {pull}20532[#20532]

Expand All @@ -102,12 +111,12 @@ a dashboard with margins.

Visualization::
* [Fixes #19378, #16884] Fixes editor sidebar to better handle long field
names {pull}20455[#20455]
names {pull}20476[#20476]
* [Fixes #20240] Fixes issues with the flickering of visualizations on
refresh {pull}20817[#20817]
* Avoids shard failures when performing a `geo_bounding_box` filter on coordinate
maps {pull}19548[#19548]
* Fixes disabled aggregations in the visualization editor {pull}18796[#18796]
* Fixes disabled aggregations in the visualization editor {pull}20450[#20450]

[float]
=== Important documentation and developer changes
Expand Down
2 changes: 1 addition & 1 deletion docs/index.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
:blog-ref: https://www.elastic.co/blog/
:wikipedia: https://en.wikipedia.org/wiki

include::{asciidoc-dir}/../../shared/versions64.asciidoc[]
include::{asciidoc-dir}/../../shared/versions65.asciidoc[]

:docker-repo: docker.elastic.co/kibana/kibana
:docker-image: docker.elastic.co/kibana/kibana:{version}
Expand Down
4 changes: 2 additions & 2 deletions docs/reporting/report-intervals.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ takes to generate the reports--otherwise, the report queue can back up. To
avoid this, increase the time between report requests.
By default, report generation times out if the report cannot be generated
within 30 seconds. If you are generating reports that contain complex
within two minutes. If you are generating reports that contain many complex
visualizations or your machine is slow or under constant heavy load, it
might take longer than 30 seconds to generate a report. You can increase
might take longer than two minutes to generate a report. You can increase
the timeout by setting `xpack.reporting.queue.timeout` in `kibana.yml`.
===================
2 changes: 1 addition & 1 deletion docs/settings/reporting-settings.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ How often idle workers poll the index for pending jobs. Defaults to `3000` (3 se
`xpack.reporting.queue.timeout`::
How long each worker has to produce a report. If your machine is slow or under
heavy load, you might need to increase this timeout. Specified in milliseconds.
Defaults to `30000` (30 seconds).
Defaults to `120000` (two minutes).

[float]
[[reporting-capture-settings]]
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"dashboarding"
],
"private": false,
"version": "6.4.0",
"version": "6.5.0",
"branch": "6.x",
"build": {
"number": 8467,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -571,7 +571,7 @@ function discoverController(
.then(resp => {
$scope.visData = resp;
const visEl = $element.find('#discoverHistogram')[0];
visualizationLoader(visEl, $scope.vis, $scope.visData, $scope.uiState, { listenOnChange: true });
visualizationLoader.render(visEl, $scope.vis, $scope.visData, $scope.uiState, { listenOnChange: true });
});
}

Expand Down
Loading

0 comments on commit 8f3692e

Please sign in to comment.