Skip to content

Commit 421fefb

Browse files
elasticmachineelasticmachine
authored
Merge branch '7.x' into backport/7.x/pr-65658
2 parents 4c27798 + d516c64 commit 421fefb

172 files changed

Lines changed: 2854 additions & 1088 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.

‎.eslintrc.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ module.exports = {
118118
files: ['x-pack/plugins/lens/**/*.{js,ts,tsx}'],
119119
rules: {
120120
'react-hooks/exhaustive-deps': 'off',
121-
'react-hooks/rules-of-hooks': 'off',
122121
},
123122
},
124123
{

‎docs/migration/migrate_7_2.asciidoc‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,13 @@ your application to Kibana 7.2.
99

1010
See also <<release-highlights-7.2.0, release highlights>> and <<release-notes-7.2.0, release notes>>.
1111

12+
//NOTE: The notable-breaking-changes tagged regions are re-used in the
13+
//Installation and Upgrade Guide
14+
15+
//tag::notable-breaking-changes[]
16+
17+
// end::notable-breaking-changes[]
18+
1219
[float]
1320
[[breaking_72_index_pattern_changes]]
1421

‎docs/migration/migrate_7_5.asciidoc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,4 @@ Any installs that previously enabled the Code app will now log a warning when
4545
Kibana starts up. It's safe to remove all configurations starting with
4646
`xpack.code.`. Starting in 8.0, these warnings will become errors that prevent
4747
Kibana from starting up.
48+
// end::notable-breaking-changes[]

‎docs/migration/migrate_7_6.asciidoc‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@ your application to Kibana 7.6.
1010
* <<user-facing-changes, Breaking changes for users>>
1111
* <<general-plugin-API-changes, Breaking changes for plugin developers>>
1212

13+
// The following section is re-used in the Installation and Upgrade Guide
14+
//tag::notable-breaking-changes[]
15+
16+
// end::notable-breaking-changes[]
17+
1318
[float]
1419
[[user-facing-changes]]
1520
=== Breaking changes for users

‎docs/migration/migrate_7_7.asciidoc‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,10 @@
77
This page discusses the breaking changes that you need to be aware of when migrating
88
your application to Kibana 7.7.
99

10-
//NOTE: The notable-breaking-changes tagged regions are re-used in the
11-
//Installation and Upgrade Guide
12-
13-
////
14-
The following section is re-used in the Installation and Upgrade Guide
15-
[[breaking_70_notable]]
16-
=== Notable breaking changes
17-
////
10+
// The following section is re-used in the Installation and Upgrade Guide
11+
// tag::notable-breaking-changes[]
12+
13+
// end::notable-breaking-changes[]
1814

1915
[float]
2016
=== Breaking changes for users

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,17 @@ Password:: password for 'login' type authentication.
2424

2525
[source,text]
2626
--
27-
id: 'my-email'
28-
name: preconfigured-email-action-type
29-
actionTypeId: .email
30-
config:
31-
from: testsender@test.com <1.1>
32-
host: validhostname <1.2>
33-
port: 8080 <1.3>
34-
secure: false <1.4>
35-
secrets:
36-
user: testuser <2.1>
37-
password: passwordkeystorevalue <2.2>
27+
my-email:
28+
name: preconfigured-email-action-type
29+
actionTypeId: .email
30+
config:
31+
from: testsender@test.com <1.1>
32+
host: validhostname <1.2>
33+
port: 8080 <1.3>
34+
secure: false <1.4>
35+
secrets:
36+
user: testuser <2.1>
37+
password: passwordkeystorevalue <2.2>
3838
--
3939

4040
`config` defines the action type specific to the configuration and contains the following properties:

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ Execution time field:: This field will be automatically set to the time the ale
2121

2222
[source,text]
2323
--
24-
id: 'my-index'
25-
name: action-type-index
26-
actionTypeId: .index
27-
config:
28-
index: .kibana <1>
29-
refresh: true <2>
30-
executionTimeField: somedate <3>
24+
my-index:
25+
name: action-type-index
26+
actionTypeId: .index
27+
config:
28+
index: .kibana <1>
29+
refresh: true <2>
30+
executionTimeField: somedate <3>
3131
--
3232

3333
`config` defines the action type specific to the configuration and contains the following properties:

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -141,13 +141,13 @@ Integration Key:: A 32 character PagerDuty Integration Key for an integration
141141

142142
[source,text]
143143
--
144-
id: 'my-pagerduty'
145-
name: preconfigured-pagerduty-action-type
146-
actionTypeId: .pagerduty
147-
config:
148-
apiUrl: https://test.host <1.1>
149-
secrets:
150-
routingKey: testroutingkey <2.1>
144+
my-pagerduty:
145+
name: preconfigured-pagerduty-action-type
146+
actionTypeId: .pagerduty
147+
config:
148+
apiUrl: https://test.host <1.1>
149+
secrets:
150+
routingKey: testroutingkey <2.1>
151151
--
152152

153153
`config` defines the action type specific to the configuration and contains the following properties:

‎docs/user/alerting/action-types/server-log.asciidoc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ Name:: The name of the connector. The name is used to identify a connector
1818

1919
[source,text]
2020
--
21-
id: 'my-server-log'
22-
name: test
23-
actionTypeId: .server-log
21+
my-server-log:
22+
name: test
23+
actionTypeId: .server-log
2424
--
2525

2626
[float]

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ Webhook URL:: The URL of the incoming webhook. See https://api.slack.com/messa
1919

2020
[source,text]
2121
--
22-
id: 'my-slack'
23-
name: preconfigured-slack-action-type
24-
actionTypeId: .slack
25-
config:
26-
webhookUrl: 'https://hooks.slack.com/services/abcd/efgh/ijklmnopqrstuvwxyz' <1>
22+
my-slack:
23+
name: preconfigured-slack-action-type
24+
actionTypeId: .slack
25+
config:
26+
webhookUrl: 'https://hooks.slack.com/services/abcd/efgh/ijklmnopqrstuvwxyz' <1>
2727
--
2828

2929
`config` defines the action type specific to the configuration and contains the following properties:

0 commit comments

Comments
 (0)