Skip to content

Commit

Permalink
Merge branch 'master' into enable/ts-build-refs-cache
Browse files Browse the repository at this point in the history
  • Loading branch information
kibanamachine authored Feb 24, 2021
2 parents cf21818 + e1fa0bf commit 636945f
Showing 345 changed files with 4,101 additions and 2,812 deletions.
2 changes: 1 addition & 1 deletion .ci/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# NOTE: This Dockerfile is ONLY used to run certain tasks in CI. It is not used to run Kibana or as a distributable.
# If you're looking for the Kibana Docker image distributable, please see: src/dev/build/tasks/os_packages/docker_generator/templates/dockerfile.template.ts

ARG NODE_VERSION=14.15.4
ARG NODE_VERSION=14.16.0

FROM node:${NODE_VERSION} AS base

3 changes: 2 additions & 1 deletion .ci/Jenkinsfile_security_cypress
Original file line number Diff line number Diff line change
@@ -18,7 +18,8 @@ kibanaPipeline(timeoutMinutes: 180) {
workers.ci(name: job, size: 'l', ramDisk: true) {
kibanaPipeline.bash('test/scripts/jenkins_xpack_build_kibana.sh', 'Build Default Distributable')
kibanaPipeline.functionalTestProcess(job, 'test/scripts/jenkins_security_solution_cypress_chrome.sh')()
kibanaPipeline.functionalTestProcess(job, 'test/scripts/jenkins_security_solution_cypress_firefox.sh')()
// Temporarily disabled to figure out test flake
// kibanaPipeline.functionalTestProcess(job, 'test/scripts/jenkins_security_solution_cypress_firefox.sh')()
}
}
}
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
14.15.4
14.16.0
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
14.15.4
14.16.0
86 changes: 0 additions & 86 deletions docs/api/using-api.asciidoc

This file was deleted.

31 changes: 4 additions & 27 deletions docs/canvas/canvas-share-workpad.asciidoc
Original file line number Diff line number Diff line change
@@ -4,6 +4,8 @@

When you've finished your workpad, you can share it outside of {kib}.

For information on how to create PDFs and POST URLs, refer to <<reporting-getting-started, Reporting from {kib}>>.

[float]
[[export-single-workpad]]
=== Export workpads
@@ -17,37 +19,12 @@ image::images/canvas-export-workpad.png[Export single workpad through JSON, from

Want to export multiple workpads? Go to the *Canvas* home page, select the workpads you want to export, then click *Export*.

[float]
[[create-workpad-pdf]]
=== Create a PDF

If you have a subscription that supports the {report-features}, you can create a PDF copy of your workpad that you can save and share outside {kib}.

To begin, click *Share > PDF reports > Generate PDF*.

[role="screenshot"]
image::images/canvas-generate-pdf.gif[Image showing how to generate a PDF]

For more information, refer to <<reporting-getting-started, Reporting from Kibana>>.

[float]
[[create-workpad-URL]]
=== Create a POST URL

If you have a subscription that supports the {report-features}, you can create a POST URL that you can use to automatically generate PDF reports using <<watcher-ui,Watcher>> or a script.

To begin, click *Share > PDF reports > Advanced options > Copy POST URL*.

[role="screenshot"]
image::images/canvas-create-URL.gif[Image showing how to create POST URL]

For more information, refer to <<automating-report-generation, Automating report generation>>.

[float]
[[add-workpad-website]]
=== Share the workpad on a website

beta[] Canvas allows you to create _shareables_, which are workpads that you download and securely share on any website. To customize the behavior of the workpad on your website, you can choose to autoplay the pages or hide the workpad toolbar.
beta[] Canvas allows you to create _shareables_, which are workpads that you download and securely share on any website.
To customize the behavior of the workpad on your website, you can choose to autoplay the pages or hide the workpad toolbar.

. Click *Share > Share on a website*.

2 changes: 1 addition & 1 deletion docs/index.asciidoc
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
:blog-ref: https://www.elastic.co/blog/
:wikipedia: https://en.wikipedia.org/wiki

include::{docs-root}/shared/versions/stack/{source_branch}.asciidoc[]
include::{docs-root}/shared/versions/stack/7.10.asciidoc[]

:docker-repo: docker.elastic.co/kibana/kibana
:docker-image: docker.elastic.co/kibana/kibana:{version}
2 changes: 1 addition & 1 deletion docs/management/alerting/alert-management.asciidoc
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
=== Managing Alerts


The *Alerts* tab provides a cross-app view of alerting. Different {kib} apps like <<metrics-app,Metrics>>, <<xpack-apm,APM>>, <<uptime-app,Uptime>>, and <<xpack-siem,SIEM>> can offer their own alerts, and the *Alerts* tab provides a central place to:
The *Alerts* tab provides a cross-app view of alerting. Different {kib} apps like {observability-guide}/create-alerts.html[*Observability*], {security-guide}/prebuilt-rules.html[*Security*], <<geo-alerting, *Maps*>> and <<xpack-ml, *Machine Learning*>> can offer their own alerts. The *Alerts* tab provides a central place to:

* <<create-edit-alerts, Create and edit>> alerts
* <<controlling-alerts, Control alerts>> including enabling/disabling, muting/unmuting, and deleting
13 changes: 5 additions & 8 deletions docs/management/index-patterns.asciidoc
Original file line number Diff line number Diff line change
@@ -139,6 +139,10 @@ which indicates the type of data the field contains in {es},
such as strings or boolean values. The field mapping also determines
how you can use the field, such as whether it can be searched or aggregated.

When a new field is added to the index, the index pattern field list is updated
the next time the index pattern is loaded, for example, when you load the page or
move between {kib} apps.

[role="screenshot"]
image:management/index-patterns/images/new-index-pattern.png["Create index pattern"]

@@ -158,7 +162,7 @@ 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
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.
@@ -170,13 +174,6 @@ To edit the field display, click the edit icon
[role="screenshot"]
image:management/index-patterns/images/edit-field-format.png["Edit field format"]

[float]
==== Refresh the data fields

To pick up newly-added fields,
refresh (image:management/index-patterns/images/refresh-icon.png[Refresh icon]) the index fields list.
This action also resets the {kib} popularity counters for the fields.

[float]
[[default-index-pattern]]
=== Set the default index pattern
Binary file modified docs/management/index-patterns/images/new-index-pattern.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion docs/user/alerting/action-types.asciidoc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[role="xpack"]
[[action-types]]
== Action and connector types
== Actions and connectors

Actions are Kibana services or integrations with third-party systems that run as background tasks on the Kibana server when alert conditions are met. {kib} provides the following types of actions:

20 changes: 13 additions & 7 deletions docs/user/alerting/action-types/email.asciidoc
Original file line number Diff line number Diff line change
@@ -13,12 +13,12 @@ NOTE: For emails to have a footer with a link back to {kib}, set the <<server-pu
Email connectors have the following configuration properties:

Name:: The name of the connector. The name is used to identify a connector in the management UI connector listing, or in the connector list when configuring an action.
Sender:: The from address for all emails sent with this connector, specified in `user@host-name` format.
Sender:: The from address for all emails sent with this connector. This can be specified in `user@host-name` format or as `"human name <user@host-name>"` format. See the https://nodemailer.com/message/addresses/[Nodemailer address documentation] for more information.
Host:: Host name of the service provider. If you are using the <<action-settings, `xpack.actions.allowedHosts`>> setting, make sure this hostname is added to the allowed hosts.
Port:: The port to connect to on the service provider.
Secure:: If true, the connection will use TLS when connecting to the service provider. Refer to the https://nodemailer.com/smtp/#tls-options[Nodemailer TLS documentation] for more information. If not true, the connection will initially connect over TCP, then attempt to switch to TLS via the SMTP STARTTLS command.
Username:: username for 'login' type authentication.
Password:: password for 'login' type authentication.
User:: Username for login type authentication.
Password:: Password for login type authentication.

[float]
[[Preconfigured-email-configuration]]
@@ -40,11 +40,14 @@ Password:: password for 'login' type authentication.
--

[[email-connector-config-properties]]
`config` defines the action type specific to the configuration and contains the following properties:
**`config`** defines the action type specific to the configuration and contains the following properties:

[cols="2*<"]
|===

| `service`
| The name of a https://nodemailer.com/smtp/well-known/[well-known email service provider]. If `service` is provided, `host`, `port`, and `secure` properties are ignored. For more information on the `gmail` service value, see the (https://nodemailer.com/usage/using-gmail/)[Nodemailer Gmail documentation].

| `from`
| An email address that corresponds to *Sender*.

@@ -57,18 +60,21 @@ Password:: password for 'login' type authentication.
| `secure`
| A boolean that corresponds to *Secure*.

| `hasAuth`
| If `true`, this connector will require values for `user` and `password` inside the secrets configuration. Defaults to `true`.

|===

`secrets` defines sensitive information for the action type:
**`secrets`** defines sensitive information for the action type and contains the following properties:

[cols="2*<"]
|===

| `user`
| A string that corresponds to *User*.
| A string that corresponds to *User*. Required if `hasAuth` is set to `true`.

| `password`
| A string that corresponds to *Password*. Should be stored in the <<creating-keystore, {kib} keystore>>.
| A string that corresponds to *Password*. Should be stored in the <<creating-keystore, {kib} keystore>>. Required if `hasAuth` is set to `true`.

|===

4 changes: 2 additions & 2 deletions docs/user/alerting/action-types/index.asciidoc
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@ Execution time field:: This field will be automatically set to the time the ale
--

[[index-connector-config-properties]]
`config` defines the action type specific to the configuration and contains the following properties:
**`config`** defines the action type specific to the configuration and contains the following properties:

[cols="2*<"]
|===
@@ -40,7 +40,7 @@ Execution time field:: This field will be automatically set to the time the ale
| A string that corresponds to *Index*.

|`refresh`
| A boolean that corresponds to *Refresh*.
| A boolean that corresponds to *Refresh*. Defaults to `false`.

|`executionTimeField`
| A string that corresponds to *Execution time field*.
50 changes: 40 additions & 10 deletions docs/user/alerting/action-types/jira.asciidoc
Original file line number Diff line number Diff line change
@@ -34,7 +34,7 @@ API token (or password):: Jira API authentication token (or password) for HTTP
--

[[jira-connector-config-properties]]
`config` defines the action type specific to the configuration and contains the following properties:
**`config`** defines the action type specific to the configuration and contains the following properties:

[cols="2*<"]
|===
@@ -47,7 +47,7 @@ API token (or password):: Jira API authentication token (or password) for HTTP

|===

`secrets` defines sensitive information for the action type:
**`secrets`** defines sensitive information for the action type and contains the following properties:

[cols="2*<"]
|===
@@ -65,14 +65,44 @@ API token (or password):: Jira API authentication token (or password) for HTTP

Jira actions have the following configuration properties:

Issue type:: The type of the issue.
Priority:: The priority of the incident.
Labels:: The labels of the incident.
Title:: A title for the issue, used for searching the contents of the knowledge base.
Description:: The details about the incident.
Parent:: The parent issue id or key. Only for `Sub-task` issue types.
Priority:: The priority of the incident.
Additional comments:: Additional information for the client, such as how to troubleshoot the issue.
Subaction:: The subaction to perform: `pushToService`, `getIncident`, `issueTypes`, `fieldsByIssueType`, `issues`, `issue`, or `getFields`.
Subaction params:: The parameters of the subaction.

==== `pushToService` subaction configuration

Incident:: A Jira incident has the following properties:
* `summary` - The title of the issue.
* `description` - A description of the issue.
* `externalId` - The ID of the issue in Jira. If present, the issue is updated. Otherwise, a new issue is created.
* `issueType` - The ID of the issue type in Jira.
* `priority` - The priority level in Jira. Example: `Medium`.
* `labels` - An array of labels. Labels cannot contain spaces.
* `parent` - The parent issue ID or key. Only for subtask issue types.
Comments:: A comment in the form of `{ commentId: string, version: string, comment: string }`.

==== `getIncident` subaction configuration

External ID:: The ID of the issue in Jira.

==== `issueTypes` subaction configuration

The `issueTypes` subaction has no parameters. Provide an empty object `{}`.

==== `fieldsByIssueType` subaction configuration

ID:: The ID of the issue in Jira.

==== `issues` subaction configuration

Title:: The title to search for.

==== `issue` subaction configuration

ID:: The ID of the issue in Jira.

==== `getFields` subaction configuration

The `getFields` subaction has no parameters. Provide an empty object `{}`.

[[configuring-jira]]
==== Configuring and testing Jira
23 changes: 17 additions & 6 deletions docs/user/alerting/action-types/pagerduty.asciidoc
Original file line number Diff line number Diff line change
@@ -151,14 +151,25 @@ Integration Key:: A 32 character PagerDuty Integration Key for an integration
--

[[pagerduty-connector-config-properties]]
`config` defines the action type specific to the configuration.
`config` contains
`apiURL`, a string that corresponds to *API URL*.
**`config`** defines the action type specific to the configuration and contains the following properties:

`secrets` defines sensitive information for the action type.
`secrets` contains
`routingKey`, a string that corresponds to *Integration Key*.
[cols="2*<"]
|===

|`apiURL`
| A URL string that corresponds to *API URL*.

|===

**`secrets`** defines sensitive information for the action type and contains the following properties:

[cols="2*<"]
|===

|`routingKey`
| A string that corresponds to *Integration Key*.

|===

[float]
[[pagerduty-action-configuration]]
Loading

0 comments on commit 636945f

Please sign in to comment.