Skip to content

Commit 121fe0a

Browse files
committed
Merge branch 'master' into node-version-validator-elastic#12976
2 parents ed3067d + 56a69b1 commit 121fe0a

File tree

106 files changed

+6266
-1193
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+6266
-1193
lines changed

docs/discover/context.asciidoc

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ pattern the context is based on.
3232

3333
While not required, it is recommended to only
3434
use fields which have {ref}/doc-values.html[doc values] enabled to achieve
35-
good performance and avoid unnecessary {ref}/modules-fielddata.html[field
35+
good performance and avoid unnecessary {ref}/modules-fielddata.html[field
3636
data] usage. Common examples for suitable fields include log line numbers,
3737
monotonically increasing counters and high-precision timestamps.
3838
--
@@ -43,6 +43,8 @@ NOTE: The number of documents displayed by default can be configured
4343
via the `context:defaultSize` setting in <<advanced-options, *Management >
4444
Advanced Settings*>>.
4545

46+
[float]
47+
[[change-context-size]]
4648
=== Changing the Context Size
4749

4850
You can change the number documents displayed before and after the anchor
@@ -66,6 +68,8 @@ NOTE: The default number of documents loaded with each button click can be
6668
configured via the `context:step` setting in <<advanced-options, *Management >
6769
Advanced Settings*>>.
6870

71+
[float]
72+
[[filter-context]]
6973
=== Filtering the Context
7074

7175
Depending on how the documents are partitioned into index patterns, the context

docs/plugins.asciidoc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ The Kibana plugin interfaces are in a state of constant development. We cannot
1515
==============================================
1616
--
1717

18-
[[_installing_plugins]]
18+
[[install-plugin]]
1919
== Installing Plugins
2020

2121
Use the following command to install a plugin:
@@ -82,6 +82,7 @@ You can specify the environment variable directly when installing plugins:
8282
$ http_proxy="http://proxy.local:4242" bin/kibana-plugin install <package name or URL>
8383

8484

85+
[[update-remove-plugin]]
8586
== Updating & Removing Plugins
8687

8788
To update a plugin, remove the current version and reinstall the plugin.
@@ -95,6 +96,7 @@ You can also remove a plugin manually by deleting the plugin's subdirectory unde
9596

9697
NOTE: Removing a plugin will result in an "optimize" run which will delay the next start of Kibana.
9798

99+
[[disable-plugin]]
98100
== Disabling Plugins
99101

100102
Use the following command to disable a plugin:
@@ -108,6 +110,7 @@ NOTE: Disabling or enabling a plugin will result in an "optimize" run which will
108110

109111
<1> You can find a plugin's plugin ID as the value of the `name` property in the plugin's `package.json` file.
110112

113+
[[configure-plugin-manager]]
111114
== Configuring the Plugin Manager
112115

113116
By default, the plugin manager provides you with feedback on the status of the activity you've asked the plugin manager

docs/setup/docker.asciidoc

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ A list of all published Docker images and tags can be found at
77
https://www.docker.elastic.co[www.docker.elastic.co]. The source code can be
88
found on https://github.com/elastic/kibana-docker/tree/{branch}[GitHub].
99

10+
[float]
11+
[[image-type]]
1012
=== Image types
1113

1214
These images are free to use under the Elastic license. They contain open source
@@ -19,6 +21,8 @@ Elastic license levels.
1921
Alternatively, you can download `-oss` images, which contain only features that
2022
are available under the Apache 2.0 license.
2123

24+
[float]
25+
[[pull-image]]
2226
=== Pulling the image
2327
Obtaining Kibana for Docker is as simple as issuing a +docker pull+ command
2428
against the Elastic Docker registry.
@@ -42,14 +46,17 @@ docker pull {docker-repo}-oss:{version}
4246

4347
endif::[]
4448

49+
[float]
50+
[[configuring-kibana-docker]]
4551
=== Configuring Kibana on Docker
4652

4753
The Docker images provide several methods for configuring Kibana. The
4854
conventional approach is to provide a `kibana.yml` file as described in
4955
{kibana-ref}/settings.html[Configuring Kibana], but it's also possible to use
5056
environment variables to define settings.
5157

52-
[[docker-bind-mount-config]]
58+
[float]
59+
[[bind-mount-config]]
5360
==== Bind-mounted configuration
5461

5562
One way to configure Kibana on Docker is to provide `kibana.yml` via bind-mounting.
@@ -65,7 +72,8 @@ services:
6572
- ./kibana.yml:/usr/share/kibana/config/kibana.yml
6673
--------------------------------------------
6774

68-
[[docker-env-config]]
75+
[float]
76+
[[environment-variable-config]]
6977
==== Environment variable configuration
7078

7179
Under Docker, Kibana can be configured via environment variables. When
@@ -106,6 +114,8 @@ services:
106114
Since environment variables are translated to CLI arguments, they take
107115
precedence over settings configured in `kibana.yml`.
108116

117+
[float]
118+
[[docker-defaults]]
109119
==== Docker defaults
110120
The following settings have different default values when using the Docker
111121
images:
@@ -123,8 +133,8 @@ In the {xpack} image, the following additional defaults are also set:
123133
`xpack.monitoring.ui.container.elasticsearch.enabled`:: `true`
124134

125135
These settings are defined in the default `kibana.yml`. They can be overridden
126-
with a <<docker-bind-mount-config,custom `kibana.yml`>> or via
127-
<<docker-env-config,environment variables>>.
136+
with a <<bind-mount-config,custom `kibana.yml`>> or via
137+
<<environment-variable-config,environment variables>>.
128138

129139
IMPORTANT: If replacing `kibana.yml` with a custom version, be sure to copy the
130140
above defaults to the custom file if you want to retain them. If not, they will

docs/setup/production.asciidoc

Lines changed: 1 addition & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -40,42 +40,7 @@ For information about setting up Kibana users, see
4040
[[enabling-ssl]]
4141
=== Enabling SSL
4242

43-
Kibana supports TLS/SSL encryption for both client requests and the requests the
44-
Kibana server sends to Elasticsearch.
45-
46-
To encrypt communications between the browser and the Kibana server, you configure the `server.ssl.enabled`,
47-
`server.ssl.certificate` and `server.ssl.key` properties in `kibana.yml`:
48-
49-
[source,text]
50-
----
51-
# SSL for outgoing requests from the Kibana Server (PEM formatted)
52-
server.ssl.enabled: true
53-
server.ssl.key: /path/to/your/server.key
54-
server.ssl.certificate: /path/to/your/server.crt
55-
----
56-
57-
If you are using {security} or a proxy that provides an HTTPS endpoint for Elasticsearch,
58-
you can configure Kibana to access Elasticsearch via HTTPS so communications between
59-
the Kibana server and Elasticsearch are encrypted.
60-
61-
To do this, you specify the HTTPS
62-
protocol when you configure the Elasticsearch URL in `kibana.yml`:
63-
64-
[source,text]
65-
----
66-
elasticsearch.url: "https://<your_elasticsearch_host>.com:9200"
67-
----
68-
69-
If you are using a self-signed certificate for Elasticsearch, set the `certificateAuthorities` property in
70-
`kibana.yml` to specify the location of the PEM file. Setting the `certificateAuthorities` property lets you use the
71-
default `verificationMode` option of `full`.
72-
73-
[source,text]
74-
----
75-
# If you need to provide a CA certificate for your Elasticsearch instance, put
76-
# the path of the pem file here.
77-
elasticsearch.ssl.certificateAuthorities: [ "/path/to/your/ca/cacert.pem" ]
78-
----
43+
See <<configuring-tls>>.
7944

8045
[float]
8146
[[load-balancing]]

docs/setup/settings.asciidoc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ The Kibana server reads properties from the `kibana.yml` file on startup. The de
55
on `localhost:5601`. To change the host or port number, or connect to Elasticsearch running on a different machine,
66
you'll need to update your `kibana.yml` file. You can also enable SSL and set a variety of other options. Finally, environment variables can be injected into configuration using `${MY_ENV_VAR}` syntax.
77

8-
Kibana Configuration Settings
8+
.Kibana Configuration Settings
9+
910
`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.
1011

1112
`cpu.cgroup.path.override:`:: Override for cgroup cpu path when mounted in manner that is inconsistent with `/proc/self/cgroup`

docs/visualize/tilemap.asciidoc

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,14 @@ NOTE: By default, Kibana uses the https://www.elastic.co/elastic-maps-service[El
77
to display map tiles. To use other tile service providers, configure the <<tilemap-settings,tilemap settings>>
88
in `kibana.yml`.
99

10+
[float]
11+
[[configuration]]
1012
=== Configuration
1113

14+
[float]
1215
==== Data
1316

17+
[float]
1418
===== Metrics
1519

1620
The default _metrics_ aggregation for a coordinate map is the *Count* aggregation. You can select any of the following
@@ -31,6 +35,7 @@ the number of unique values in a field. Select a field from the drop-down.
3135

3236
Enter a string in the *Custom Label* field to change the display label.
3337

38+
[float]
3439
===== Buckets
3540

3641
Coordinate maps use the {ref}/search-aggregations-bucket-geohashgrid-aggregation.html[_geohash_] aggregation. Select a field, typically coordinates, from the
@@ -66,6 +71,7 @@ NOTE: In Elasticsearch releases 1.4.3 and later, this functionality requires you
6671

6772
The availability of these options varies depending on the aggregation you choose.
6873

74+
[float]
6975
==== Options
7076

7177

@@ -98,8 +104,7 @@ After changing options, click the *Apply changes* button to update your visuali
98104
changes* button to keep your visualization in its current state.
99105

100106
[float]
101-
[[navigating-map]]
102-
107+
[[navigate-map]]
103108
=== Navigating the Map
104109

105110
Once your tilemap visualization is ready, you can explore the map in several ways:

docs/visualize/time-series-visual-builder.asciidoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ aggregations and pipeline aggregations to display complex data in a meaningful w
1010

1111
image:images/tsvb-screenshot.png["Time Series Visual Builder Interface"]
1212

13+
[[time-series-visualizations]]
1314
=== Featured Visualizations
1415

1516
Time Series Visual Build comes with 6 different visualization types. You can
@@ -73,6 +74,7 @@ You define which field group to show in the rows and what columns of data to dis
7374
image:images/tsvb-table.png["Table Visualization"]
7475

7576

77+
[[time-series-interface]]
7678
=== Interface Overview
7779

7880
The user interface for each visualization is compose of a "Data" tab and "Panel

docs/visualize/xychart.asciidoc

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,14 @@ NOTE: In Elasticsearch releases 1.4.3 and later, this functionality requires you
3333

3434
The availability of these options varies depending on the aggregation you choose.
3535

36+
[float]
37+
[[metrics-axes]]
3638
=== Metrics & Axes
3739

3840
Select the *Metrics & Axes* tab to change the way each individual metric is shown on the chart.
3941
The data series are styled in the _Metrics_ section, while the axes are styled in the X and Y axis sections.
4042

43+
[float]
4144
==== Metrics
4245
Modify how each metric from the Data panel is visualized on the chart.
4346

@@ -46,6 +49,7 @@ Modify how each metric from the Data panel is visualized on the chart.
4649
*Value Axis*:: choose the axis you want to plot this data too (the properties of each are configured under Y-axes).
4750
*Line mode*:: should the outline of lines or bars appear *smooth*, *straight*, or *stepped*.
4851

52+
[float]
4953
==== Y-axis
5054

5155
Style all the Y-axes of the chart.
@@ -61,6 +65,7 @@ Style all the Y-axes of the chart.
6165
this box to change both upper and lower bounds to match the values returned in the data.
6266
*Custom Extents*:::: You can define custom minimum and maximum for each axis
6367

68+
[float]
6469
==== X-Axis
6570

6671
*Position*:: position of the X-Axis (*left* or *right* for horizontal charts, and *top* or *bottom* for vertical charts).
@@ -70,16 +75,19 @@ Style all the Y-axes of the chart.
7075
*Labels - Rotate*:::: You can enter the number in degrees for how much you want to rotate labels
7176
*Labels - Truncate*:::: You can enter the size in pixels to which the label is truncated
7277

73-
78+
[float]
79+
[[panel-settings]]
7480
=== Panel Settings
7581

7682
These are options that apply to the entire chart and not just the individual data series.
7783

84+
[float]
7885
==== Common options
7986
*Legend Position*:: Move your legend to the *left*, *right*, *top* or *bottom*
8087
*Show Tooltip*:: Enables or disables the display of tooltip on hovering over chart objects
8188
*Current Time Marker*:: Show a line indicating the current time
8289

90+
[float]
8391
==== Grid options
8492
You can enable grid on the chart. By default grid is displayed on the category axis only.
8593

package.json

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@
6161
"debug-break": "node --nolazy --inspect-brk scripts/kibana --dev",
6262
"precommit": "node scripts/precommit_hook",
6363
"karma": "karma start",
64-
"lint": "echo 'use `node scripts/eslint`' && false",
65-
"lintroller": "echo 'use `node scripts/eslint --fix`' && false",
64+
"lint": "echo 'use `node scripts/eslint` and/or `node scripts/tslint`' && false",
65+
"lintroller": "echo 'use `node scripts/eslint --fix` and/or `node scripts/tslint --fix`' && false",
6666
"makelogs": "echo 'use `node scripts/makelogs`' && false",
6767
"mocha": "echo 'use `node scripts/mocha`' && false",
6868
"sterilize": "grunt sterilize",
@@ -226,7 +226,11 @@
226226
"@kbn/eslint-plugin-license-header": "link:packages/kbn-eslint-plugin-license-header",
227227
"@kbn/plugin-generator": "link:packages/kbn-plugin-generator",
228228
"@kbn/test": "link:packages/kbn-test",
229-
"@types/globby": "^6.1.0",
229+
"@types/eslint": "^4.16.2",
230+
"@types/execa": "^0.9.0",
231+
"@types/getopts": "^2.0.0",
232+
"@types/glob": "^5.0.35",
233+
"@types/listr": "^0.13.0",
230234
"@types/minimatch": "^2.0.29",
231235
"angular-mocks": "1.4.7",
232236
"babel-eslint": "8.1.2",
@@ -283,6 +287,7 @@
283287
"karma-safari-launcher": "1.0.0",
284288
"leadfoot": "1.7.5",
285289
"license-checker": "^16.0.0",
290+
"listr": "^0.14.1",
286291
"load-grunt-config": "0.19.2",
287292
"makelogs": "^4.0.5",
288293
"marked-text-renderer": "0.1.0",
@@ -305,6 +310,9 @@
305310
"ts-jest": "^22.4.6",
306311
"ts-loader": "^3.5.0",
307312
"ts-node": "^6.0.3",
313+
"tslint": "^5.10.0",
314+
"tslint-config-prettier": "^1.12.0",
315+
"tslint-plugin-prettier": "^1.3.0",
308316
"typescript": "^2.8.3",
309317
"vinyl-fs": "^3.0.2",
310318
"xml2js": "^0.4.19",

packages/kbn-dev-utils/index.d.ts

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
import { Readable } from 'stream';
2+
3+
type LogLevel = 'silent' | 'error' | 'warning' | 'info' | 'debug' | 'verbose';
4+
5+
export class ToolingLog extends Readable {
6+
public verbose(...args: any[]): void;
7+
public debug(...args: any[]): void;
8+
public info(...args: any[]): void;
9+
public success(...args: any[]): void;
10+
public warning(...args: any[]): void;
11+
public error(errOrMsg: string | Error): void;
12+
public write(...args: any[]): void;
13+
public indent(spaces: number): void;
14+
public getLevel(): LogLevel;
15+
public setLevel(level: LogLevel): void;
16+
}
17+
18+
export function createToolingLog(level?: LogLevel): ToolingLog;

packages/kbn-dev-utils/tsconfig.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"extends": "../../tsconfig.json",
3+
"include": [
4+
"index.d.ts"
5+
],
6+
}

packages/kbn-pm/tslint.yaml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
extends: ../../tslint.yaml
2+
3+
rules:
4+
max-classes-per-file: false
5+
interface-name: false
6+
variable-name: false
7+
no-empty: false
8+
object-literal-sort-keys: false
9+
member-ordering: false
10+
no-console: false
11+
only-arrow-functions: false
12+
no-shadowed-variable: false
13+
no-empty-interface: false
14+
ordered-imports: false
15+
interface-over-type-literal: false
16+
prettier: false
17+
prefer-const: false
18+
member-access: false
19+
no-unused-variable: false
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
extends: ../../tslint.yaml
2+
3+
rules:
4+
max-classes-per-file: false
5+
interface-name: false
6+
variable-name: false
7+
no-empty: false
8+
object-literal-sort-keys: false
9+
member-ordering: false
10+
member-access: false
11+
ordered-imports: false
12+
interface-over-type-literal: false
13+
array-type: false
14+
prefer-const: false

scripts/tslint.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
require('../src/babel-register');
2+
require('../src/dev/tslint').runTslintCli();

0 commit comments

Comments
 (0)