Skip to content

Commit 801bd16

Browse files
elasticmachineelasticmachine
authored
Merge branch 'master' into alerting/np-tests-migration
2 parents 54a7597 + f8349f6 commit 801bd16

428 files changed

Lines changed: 9830 additions & 2077 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.

‎.backportrc.json‎

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,30 @@
11
{
22
"upstream": "elastic/kibana",
3-
"branches": [{ "name": "7.x", "checked": true }, "7.7", "7.6", "7.5", "7.4", "7.3", "7.2", "7.1", "7.0", "6.8", "6.7", "6.6", "6.5", "6.4", "6.3", "6.2", "6.1", "6.0", "5.6"],
4-
"labels": ["backport"]
3+
"targetBranchChoices": [
4+
{ "name": "master", "checked": true },
5+
{ "name": "7.x", "checked": true },
6+
"7.7",
7+
"7.6",
8+
"7.5",
9+
"7.4",
10+
"7.3",
11+
"7.2",
12+
"7.1",
13+
"7.0",
14+
"6.8",
15+
"6.7",
16+
"6.6",
17+
"6.5",
18+
"6.4",
19+
"6.3",
20+
"6.2",
21+
"6.1",
22+
"6.0",
23+
"5.6"
24+
],
25+
"targetPRLabels": ["backport"],
26+
"branchLabelMapping": {
27+
"^v7.8.0$": "7.x",
28+
"^v(\\d+).(\\d+).\\d+$": "$1.$2"
29+
}
530
}

‎.github/CODEOWNERS‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
# For more info, see https://help.github.com/articles/about-codeowners/
44

55
# App
6+
/x-pack/plugins/dashboard_enhanced/ @elastic/kibana-app
67
/x-pack/plugins/lens/ @elastic/kibana-app
78
/x-pack/plugins/graph/ @elastic/kibana-app
89
/src/legacy/server/url_shortening/ @elastic/kibana-app
@@ -11,18 +12,21 @@
1112
/src/legacy/core_plugins/kibana/public/discover/ @elastic/kibana-app
1213
/src/legacy/core_plugins/kibana/public/local_application_service/ @elastic/kibana-app
1314
/src/legacy/core_plugins/kibana/public/dev_tools/ @elastic/kibana-app
14-
/src/plugins/vis_type_vislib/ @elastic/kibana-app
15-
/src/plugins/vis_type_xy/ @elastic/kibana-app
16-
/src/plugins/vis_type_table/ @elastic/kibana-app
17-
/src/plugins/kibana_legacy/ @elastic/kibana-app
18-
/src/plugins/vis_type_timelion/ @elastic/kibana-app
1915
/src/plugins/dashboard/ @elastic/kibana-app
2016
/src/plugins/discover/ @elastic/kibana-app
2117
/src/plugins/input_control_vis/ @elastic/kibana-app
22-
/src/plugins/visualize/ @elastic/kibana-app
23-
/src/plugins/vis_type_timeseries/ @elastic/kibana-app
24-
/src/plugins/vis_type_metric/ @elastic/kibana-app
18+
/src/plugins/kibana_legacy/ @elastic/kibana-app
19+
/src/plugins/vis_default_editor/ @elastic/kibana-app
2520
/src/plugins/vis_type_markdown/ @elastic/kibana-app
21+
/src/plugins/vis_type_metric/ @elastic/kibana-app
22+
/src/plugins/vis_type_table/ @elastic/kibana-app
23+
/src/plugins/vis_type_tagcloud/ @elastic/kibana-app
24+
/src/plugins/vis_type_timelion/ @elastic/kibana-app
25+
/src/plugins/vis_type_timeseries/ @elastic/kibana-app
26+
/src/plugins/vis_type_vega/ @elastic/kibana-app
27+
/src/plugins/vis_type_vislib/ @elastic/kibana-app
28+
/src/plugins/vis_type_xy/ @elastic/kibana-app
29+
/src/plugins/visualize/ @elastic/kibana-app
2630

2731
# Core UI
2832
# Exclude tutorials folder for now because they are not owned by Kibana app and most will move out soon

‎.i18nrc.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"data": "src/plugins/data",
99
"embeddableApi": "src/plugins/embeddable",
1010
"embeddableExamples": "examples/embeddable_examples",
11+
"uiActionsExamples": "examples/ui_action_examples",
1112
"share": "src/plugins/share",
1213
"home": "src/plugins/home",
1314
"charts": "src/plugins/charts",

‎docs/development/plugins/data/public/kibana-plugin-plugins-data-public.esfilters.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ esFilters: {
4949
generateFilters: typeof generateFilters;
5050
onlyDisabledFiltersChanged: (newFilters?: import("../common").Filter[] | undefined, oldFilters?: import("../common").Filter[] | undefined) => boolean;
5151
changeTimeFilter: typeof changeTimeFilter;
52+
convertRangeFilterToTimeRangeString: typeof convertRangeFilterToTimeRangeString;
5253
mapAndFlattenFilters: (filters: import("../common").Filter[]) => import("../common").Filter[];
5354
extractTimeFilter: typeof extractTimeFilter;
5455
}

‎docs/logs/images/alert-actions-menu.png‎

31.8 KB
Loading

‎docs/logs/images/alert-flyout.png‎

167 KB
Loading

‎docs/logs/index.asciidoc‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ In this case, you will only see the logs for the selected component.
1717
* <<xpack-logs-using>>
1818
* <<xpack-logs-configuring>>
1919
* <<xpack-logs-analysis>>
20+
* <<xpack-logs-alerting>>
2021

2122
[role="screenshot"]
2223
image::logs/images/logs-console.png[Log Console in Kibana]
@@ -30,3 +31,5 @@ include::using.asciidoc[]
3031
include::configuring.asciidoc[]
3132

3233
include::log-rate.asciidoc[]
34+
35+
include::logs-alerting.asciidoc[]

‎docs/logs/logs-alerting.asciidoc‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
[role="xpack"]
2+
[[xpack-logs-alerting]]
3+
== Logs alerting
4+
5+
[float]
6+
=== Overview
7+
8+
To use the alerting functionality you need to {kibana-ref}/alerting-getting-started.html#alerting-setup-prerequisites[set up alerting].
9+
10+
You can then select the *Create alert* option, from the *Alerts* actions dropdown.
11+
12+
[role="screenshot"]
13+
image::logs/images/alert-actions-menu.png[Screenshot showing alerts menu]
14+
15+
Within the alert flyout you can configure your logs alert:
16+
17+
[role="screenshot"]
18+
image::logs/images/alert-flyout.png[Screenshot showing alerts flyout]
19+
20+
[float]
21+
=== Fields and comparators
22+
23+
The comparators available for conditions depend on the chosen field. The combinations available are:
24+
25+
- Numeric fields: *more than*, *more than or equals*, *less than*, *less than or equals*, *equals*, and *does not equal*.
26+
- Aggregatable fields: *is* and *is not*.
27+
- Non-aggregatable fields: *matches*, *does not match*, *matches phrase*, *does not match phrase*.

‎docs/user/alerting/action-types/pagerduty.asciidoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ section of the alert configuration and selecting *Add new*.
9292
* Alternatively, create a connector by navigating to *Management* from the {kib} navbar and selecting
9393
*Alerts and Actions*. Then, select the *Connectors* tab, click the *Create connector* button, and select the PagerDuty option.
9494

95-
. Configure the connector by giving it a name and optionally entering the API URL and Routing Key, or using the defaults.
95+
. Configure the connector by giving it a name and entering the Integration Key, optionally entering a custom API URL.
9696
+
9797
See <<pagerduty-in-pagerduty, In PagerDuty>> for how to obtain the endpoint and key information from PagerDuty and
9898
<<pagerduty-connector-configuration, Connector configuration>> for more details.
@@ -133,7 +133,7 @@ PagerDuty connectors have the following configuration properties:
133133

134134
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.
135135
API URL:: An optional PagerDuty event URL. Defaults to `https://events.pagerduty.com/v2/enqueue`. If you are using the <<action-settings, `xpack.actions.whitelistedHosts`>> setting, make sure the hostname is whitelisted.
136-
Routing Key:: A 32 character PagerDuty Integration Key for an integration on a service or on a global ruleset.
136+
Integration Key:: A 32 character PagerDuty Integration Key for an integration on a service, also referred to as the routing key.
137137

138138
[float]
139139
[[pagerduty-action-configuration]]

‎examples/ui_action_examples/public/index.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,8 @@
1818
*/
1919

2020
import { UiActionExamplesPlugin } from './plugin';
21-
import { PluginInitializer } from '../../../src/core/public';
2221

23-
export const plugin: PluginInitializer<void, void> = () => new UiActionExamplesPlugin();
22+
export const plugin = () => new UiActionExamplesPlugin();
2423

2524
export { HELLO_WORLD_TRIGGER_ID } from './hello_world_trigger';
2625
export { ACTION_HELLO_WORLD } from './hello_world_action';

0 commit comments

Comments
 (0)