Skip to content

Commit d316ff5

Browse files
author
spalger
committed
Merge branch 'master' of github.com:elastic/kibana into implement/extend-injected-vars
2 parents 4471453 + d539acf commit d316ff5

72 files changed

Lines changed: 219 additions & 11788 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.

‎docs/index.asciidoc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ release-state can be: released | prerelease | unreleased
1414
:xpack-ref: https://www.elastic.co/guide/en/x-pack/current/
1515
:issue: https://github.com/elastic/kibana/issues/
1616
:pull: https://github.com/elastic/kibana/pull/
17+
:commit: https://github.com/elastic/kibana/commit/
18+
:security: https://www.elastic.co/community/security/
1719

1820

1921
include::introduction.asciidoc[]

‎docs/plugins.asciidoc‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,14 @@
66
Add-on functionality for Kibana is implemented with plug-in modules. You can use the `bin/kibana-plugin`
77
command to manage these modules. You can also install a plugin manually by moving the plugin file to the
88
`plugins` directory and unpacking the plugin files into a new directory.
9+
10+
[IMPORTANT]
11+
.Plugin compatibility
12+
==============================================
13+
14+
The Kibana plugin interfaces are in a state of constant development. We cannot provide backwards compatibility for plugins due to the high rate of change. Kibana enforces that the installed plugins match the version of Kibana itself. Plugin developers will have to release a new version of their plugin for each new Kibana release as a result.
15+
16+
==============================================
917
--
1018

1119
== Installing Plugins

‎docs/setup/docker.asciidoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ endif::[]
2121

2222
ifeval::["{release-state}"!="unreleased"]
2323

24-
The Docker image for Kibana v{version} can be retrieved with the following
24+
The Docker image for Kibana {version} can be retrieved with the following
2525
command:
2626

2727
["source","sh",subs="attributes"]

‎docs/setup/settings.asciidoc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ you'll need to update your `kibana.yml` file. You can also enable SSL and set a
1414
to Kibana. This setting cannot end in a slash (`/`).
1515
`server.maxPayloadBytes:`:: *Default: 1048576* The maximum payload size in bytes for incoming server requests.
1616
`server.name:`:: *Default: "your-hostname"* A human-readable display name that identifies this Kibana instance.
17+
`server.defaultRoute:`:: *Default: "/app/kibana"* This setting specifies the default route when opening Kibana. You can use this setting to modify the landing page when opening Kibana.
1718
`elasticsearch.url:`:: *Default: "http://localhost:9200"* The URL of the Elasticsearch instance to use for all your
1819
queries.
1920
`elasticsearch.preserveHost:`:: *Default: true* When this setting’s value is true Kibana uses the hostname specified in
@@ -63,3 +64,4 @@ information and all requests.
6364
The minimum value is 100.
6465
`status.allowAnonymous`:: *Default: false* If authentication is enabled, setting this to `true` allows
6566
unauthenticated users to access the Kibana server status API and status page.
67+
`console.enabled`:: *Default: true* Set to false to disable Console. Toggling this will cause the server to regenerate assets on the next startup, which may cause a delay before pages start being served.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
"@bigfunger/decompress-zip": "0.2.0-stripfix3",
7373
"@bigfunger/jsondiffpatch": "0.1.38-webpack",
7474
"@elastic/datemath": "2.3.0",
75-
"@elastic/kibana-ui-framework": "0.0.10",
75+
"@elastic/kibana-ui-framework": "0.0.11",
7676
"@spalger/filesaver": "1.1.2",
7777
"@spalger/leaflet-draw": "0.2.3",
7878
"@spalger/leaflet-heat": "0.1.3",

‎src/server/http/index.js‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
1-
import { parse } from 'url';
21
import { format } from 'url';
2+
import { resolve } from 'path';
33
import _ from 'lodash';
44
import fs from 'fs';
55
import Boom from 'boom';
66
import Hapi from 'hapi';
7-
import HapiTemplates from 'vision';
8-
import HapiStaticFiles from 'inert';
9-
import HapiProxy from 'h2o2';
107
import getDefaultRoute from './get_default_route';
118
import versionCheckMixin from './version_check';
129
import { shortUrlAssertValid } from './short_url_assert_valid';
@@ -140,6 +137,10 @@ module.exports = async function (kbnServer, server, config) {
140137
}
141138
});
142139

140+
// Expose static assets (fonts, favicons).
141+
server.exposeStaticDir('/ui/fonts/{path*}', resolve(__dirname, '../../ui/public/assets/fonts'));
142+
server.exposeStaticDir('/ui/favicons/{path*}', resolve(__dirname, '../../ui/public/assets/favicons'));
143+
143144
kbnServer.mixin(versionCheckMixin);
144145

145146
return kbnServer.mixin(require('./xsrf'));

‎src/ui/index.js‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ import UiBundleCollection from './ui_bundle_collection';
1111
import UiBundlerEnv from './ui_bundler_env';
1212

1313
export default async (kbnServer, server, config) => {
14-
15-
const loadingGif = readFile(fromRoot('src/ui/public/loading.gif'), { encoding: 'base64'});
16-
1714
const uiExports = kbnServer.uiExports = new UiExports({
1815
urlBasePath: config.get('server.basePath')
1916
});
@@ -43,7 +40,6 @@ export default async (kbnServer, server, config) => {
4340

4441
// render all views from the ui/views directory
4542
server.setupViews(resolve(__dirname, 'views'));
46-
server.exposeStaticFile('/loading.gif', resolve(__dirname, 'public/loading.gif'));
4743

4844
server.route({
4945
path: '/app/{id}',
@@ -90,7 +86,6 @@ export default async (kbnServer, server, config) => {
9086
function viewAppWithPayload(app, payload) {
9187
return this.view(app.templateName, {
9288
app: app,
93-
loadingGif: loadingGif,
9489
kibanaPayload: payload,
9590
bundlePath: `${config.get('server.basePath')}/bundles`,
9691
});

src/ui/public/favicons/android-chrome-192x192.png renamed to src/ui/public/assets/favicons/android-chrome-192x192.png

File renamed without changes.

‎src/ui/public/assets/favicons/android-chrome-256x256.png‎

6.28 KB
Loading

src/ui/public/favicons/apple-touch-icon.png renamed to src/ui/public/assets/favicons/apple-touch-icon.png

File renamed without changes.

0 commit comments

Comments
 (0)