Skip to content

Commit bdbe095

Browse files
Merge branch 'master' into issue-50191-quickRanges
2 parents 2fa03f2 + 09c6f25 commit bdbe095

File tree

491 files changed

+6807
-4283
lines changed

Some content is hidden

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

491 files changed

+6807
-4283
lines changed

.eslintignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ bower_components
1111
/src/plugins/data/common/es_query/kuery/ast/_generated_/**
1212
/src/legacy/core_plugins/vis_type_timelion/public/_generated_/**
1313
src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data
14-
/src/legacy/ui/public/angular-bootstrap
1514
/src/legacy/ui/public/flot-charts
1615
/test/fixtures/scenarios
1716
/src/legacy/core_plugins/console/public/webpackShims

.eslintrc.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,8 @@ module.exports = {
302302
'test/plugin_functional/plugins/**/public/np_ready/**/*',
303303
'test/plugin_functional/plugins/**/server/np_ready/**/*',
304304
'src/legacy/core_plugins/**/public/np_ready/**/*',
305+
'src/legacy/core_plugins/vis_type_*/public/**/*',
306+
'!src/legacy/core_plugins/vis_type_*/public/legacy*',
305307
'src/legacy/core_plugins/**/server/np_ready/**/*',
306308
'x-pack/legacy/plugins/**/public/np_ready/**/*',
307309
'x-pack/legacy/plugins/**/server/np_ready/**/*',

docs/apm/troubleshooting.asciidoc

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ your proposed changes at https://github.com/elastic/kibana.
66

77
Also check out the https://discuss.elastic.co/c/apm[APM discussion forum].
88

9+
[[no-apm-data-found]]
910
==== No APM data found
1011

1112
This section can help with any of the following:
@@ -69,3 +70,41 @@ or because something is happening to the request that the Agent doesn't understa
6970
To resolve this, you'll need to head over to the relevant {apm-agents-ref}[Agent documentation].
7071
Specifically, view the Agent's supported technologies page.
7172
You can also use the Agent's public API to manually set a name for the transaction.
73+
74+
==== Fields are not searchable
75+
76+
In Elasticsearch, index patterns are used to define settings and mappings that determine how fields should be analyzed.
77+
The recommended index template file for APM Server is installed when Kibana starts.
78+
This template defines which fields are available in Kibana for features like the Kuery bar,
79+
or for linking to other plugins like Logs, Uptime, and Discover.
80+
81+
As an example, some agents store cookie values in `http.request.cookies`.
82+
Since `http.request` has disabled dynamic indexing, and `http.request.cookies` is not declared in a custom mapping,
83+
the values in `http.request.cookies` are not indexed and thus not searchable.
84+
85+
*Ensure an index pattern exists*
86+
As a first step, you should ensure the correct index pattern exists.
87+
In Kibana, navigate to *Management > Kibana > Index Patterns*.
88+
In the pattern list, you should see an apm index pattern; The default is `apm-*`.
89+
If you don't, the index pattern doesn't exist. See <<no-apm-data-found>> for information on how to fix this problem.
90+
91+
Selecting the `apm-*` index pattern shows a listing of every field defined in the pattern.
92+
93+
*Ensure a field is searchable*
94+
There are two things you can do to if you'd like to ensure a field is searchable:
95+
96+
1. Index your additional data as {apm-overview-ref}/metadata.html[labels] instead.
97+
These are dynamic by default, which means they will be indexed and become searchable and aggregatable.
98+
99+
2. Use the {apm-server-ref}/configuration-template.html[`append_fields`] feature. As an example,
100+
adding the following to `apm-server.yml` will enable dynamic indexing for `http.request.cookies`:
101+
102+
[source,yml]
103+
----
104+
setup.template.enabled: true
105+
setup.template.overwrite: true
106+
setup.template.append_fields:
107+
- name: http.request.cookies
108+
type: object
109+
dynamic: true
110+
----
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
[role="xpack"]
2+
[[alert-action-settings-kb]]
3+
=== Alerting and action settings in Kibana
4+
++++
5+
<titleabbrev>Alerting and action settings</titleabbrev>
6+
++++
7+
8+
Alerts and actions are enabled by default in {kib}, but require you configure the following in order to use them:
9+
10+
. <<using-kibana-with-security,Set up {kib} to work with {stack} {security-features}>>.
11+
. <<configuring-tls-kib-es,Set up TLS encryption between {kib} and {es}>>.
12+
. <<general-alert-action-settings,Specify a value for `xpack.encrypted_saved_objects.encryptionKey`>>.
13+
14+
You can configure the following settings in the `kibana.yml` file.
15+
16+
17+
[float]
18+
[[general-alert-action-settings]]
19+
==== General settings
20+
21+
`xpack.encrypted_saved_objects.encryptionKey`::
22+
23+
A string of 32 or more characters used to encrypt sensitive properties on alerts and actions before they're stored in {es}. Third party credentials &mdash; such as the username and password used to connect to an SMTP service &mdash; are an example of encrypted properties.
24+
+
25+
If not set, {kib} will generate a random key on startup, but all alert and action functions will be blocked. Generated keys are not allowed for alerts and actions because when a new key is generated on restart, existing encrypted data becomes inaccessible. For the same reason, alerts and actions in high-availability deployments of {kib} will behave unexpectedly if the key isn't the same on all instances of {kib}.
26+
+
27+
Although the key can be specified in clear text in `kibana.yml`, it's recommended to store this key securely in the <<secure-settings,{kib} Keystore>>.
28+
29+
[float]
30+
[[alert-settings]]
31+
==== Action settings
32+
33+
`xpack.actions.whitelistedHosts`::
34+
A list of hostnames that {kib} is allowed to connect to when built-in actions are triggered. It defaults to `[*]`, allowing any host, but keep in mind the potential for SSRF attacks when hosts are not explicitly whitelisted. An empty list `[]` can be used to block built-in actions from making any external connections.
35+
+
36+
Note that hosts associated with built-in actions, such as Slack and PagerDuty, are not automatically whitelisted. If you are not using the default `[*]` setting, you must ensure that the corresponding endpoints are whitelisted as well.
37+
38+
`xpack.actions.enabledActionTypes`::
39+
A list of action types that are enabled. It defaults to `[*]`, enabling all types. The names for built-in {kib} action types are prefixed with a `.` and include: `.server-log`, `.slack`, `.email`, `.index`, `.pagerduty`, and `.webhook`. An empty list `[]` will disable all action types.
40+
+
41+
Disabled action types will not appear as an option when creating new connectors, but existing connectors and actions of that type will remain in {kib} and will not function.
42+
43+
[float]
44+
[[action-settings]]
45+
==== Alert settings
46+
47+
You do not need to configure any additional settings to use alerting in {kib}.

docs/settings/settings-xkb.asciidoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ include::{asciidoc-dir}/../../shared/settings.asciidoc[]
1010

1111
For more {kib} configuration settings, see <<settings>>.
1212

13+
include::alert-action-settings.asciidoc[]
1314
include::apm-settings.asciidoc[]
1415
include::dev-settings.asciidoc[]
1516
include::graph-settings.asciidoc[]

docs/setup/settings.asciidoc

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -457,16 +457,7 @@ Rollup user interface.
457457

458458
`i18n.locale`:: *Default: en* Set this value to change the Kibana interface language. Valid locales are: `en`, `zh-CN`, `ja-JP`.
459459

460-
`xpack.actions.enabledActionTypes:`:: *Default: +[ {asterisk} ]+* Set this value
461-
to an array of action types that are enabled. An element of `*` indicates all
462-
action types registered are enabled. The action types provided by Kibana are:
463-
`.server-log`, `.slack`, `.email`, `.index`, `.pagerduty`, `.webhook`.
464-
465-
`xpack.actions.whitelistedHosts:`:: *Default: +[ {asterisk} ]+* Set this value
466-
to an array of host names which actions such as email, slack, pagerduty, and
467-
webhook can connect to. An element of `*` indicates any host can be connected
468-
to. An empty array indicates no hosts can be connected to.
469-
460+
include::{docdir}/settings/alert-action-settings.asciidoc[]
470461
include::{docdir}/settings/apm-settings.asciidoc[]
471462
include::{docdir}/settings/dev-settings.asciidoc[]
472463
include::{docdir}/settings/graph-settings.asciidoc[]

docs/user/security/authentication/index.asciidoc

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
- <<pki-authentication>>
1313
- <<saml>>
1414
- <<oidc>>
15+
- <<kerberos>>
1516

1617
[[basic-authentication]]
1718
==== Basic authentication
@@ -214,3 +215,26 @@ leaked, it can't be re-used after logout. This is known as "local" logout.
214215
{kib} can also initiate a "global" logout or _Single Logout_ if it's supported by the external authentication provider and not
215216
explicitly disabled by {es}. In this case, the user is redirected to the external authentication provider for log out of
216217
all applications associated with the active provider session.
218+
219+
[[kerberos]]
220+
==== Kerberos single sign-on
221+
222+
As with the previous SSOs, make sure that you have configured {es} first accordingly. See {ref}/kerberos-realm.html[Kerberos authentication].
223+
224+
Next, to enable Kerberos in {kib}, you will need to enable the Kerberos authentication provider in the `kibana.yml` configuration file, as follows:
225+
226+
[source,yaml]
227+
-----------------------------------------------
228+
xpack.security.authc.providers: [kerberos]
229+
-----------------------------------------------
230+
231+
You may want to be able to authenticate with the basic authentication provider as a secondary mechanism or while you are setting up Kerberos for the stack:
232+
233+
[source,yaml]
234+
-----------------------------------------------
235+
xpack.security.authc.providers: [kerberos, basic]
236+
-----------------------------------------------
237+
238+
As a reminder, the order is important as it determines the order in which each authentication provider is attempted.
239+
240+
Kibana uses SPNEGO, which wraps the Kerberos protocol for use with HTTP, extending it to web applications. At the end of the Kerberos handshake, Kibana will forward the service ticket to Elasticsearch. Elasticsearch will unpack it and it will respond with an access and refresh token which are then used for subsequent authentication.

src/core/public/overlays/modal/modal_service.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
/* eslint-disable max-classes-per-file */
2121

2222
import { i18n as t } from '@kbn/i18n';
23-
import { EuiModal, EuiConfirmModal, EuiOverlayMask } from '@elastic/eui';
23+
import { EuiModal, EuiConfirmModal, EuiOverlayMask, EuiConfirmModalProps } from '@elastic/eui';
2424
import React from 'react';
2525
import { render, unmountComponentAtNode } from 'react-dom';
2626
import { Subject } from 'rxjs';
@@ -68,6 +68,7 @@ export interface OverlayModalConfirmOptions {
6868
className?: string;
6969
closeButtonAriaLabel?: string;
7070
'data-test-subj'?: string;
71+
defaultFocusedButton?: EuiConfirmModalProps['defaultFocusedButton'];
7172
}
7273

7374
/**

src/core/public/public.api.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
import { Breadcrumb } from '@elastic/eui';
88
import { EuiButtonEmptyProps } from '@elastic/eui';
9+
import { EuiConfirmModalProps } from '@elastic/eui';
910
import { EuiGlobalToastListToast } from '@elastic/eui';
1011
import { ExclusiveUnion } from '@elastic/eui';
1112
import { IconType } from '@elastic/eui';

src/dev/precommit_hook/casing_check_config.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ export const IGNORE_DIRECTORY_GLOBS = [
8888
'src/babel-*',
8989
'packages/*',
9090
'packages/kbn-ui-framework/generator-kui',
91-
'src/legacy/ui/public/angular-bootstrap',
9291
'src/legacy/ui/public/flot-charts',
9392
'src/legacy/ui/public/utils/lodash-mixins',
9493
'test/functional/fixtures/es_archiver/visualize_source-filters',
@@ -124,9 +123,6 @@ export const TEMPORARILY_IGNORED_PATHS = [
124123
'src/legacy/core_plugins/timelion/server/series_functions/__tests__/fixtures/tlConfig.js',
125124
'src/fixtures/config_upgrade_from_4.0.0_to_4.0.1-snapshot.json',
126125
'src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/terms/_seriesMultiple.js',
127-
'src/legacy/ui/public/angular-bootstrap/bindHtml/bindHtml.js',
128-
'src/legacy/ui/public/angular-bootstrap/tooltip/tooltip-html-unsafe-popup.html',
129-
'src/legacy/ui/public/angular-bootstrap/tooltip/tooltip-popup.html',
130126
'src/legacy/ui/public/assets/favicons/android-chrome-192x192.png',
131127
'src/legacy/ui/public/assets/favicons/android-chrome-256x256.png',
132128
'src/legacy/ui/public/assets/favicons/android-chrome-512x512.png',

0 commit comments

Comments
 (0)