Skip to content

Commit 91aa552

Browse files
patrykkopycinskipatrykkopycinski
committed
Merge branch 'master' of github.com:elastic/kibana into feat/siem-untitled-timeline
# Conflicts: # x-pack/plugins/siem/public/components/open_timeline/helpers.test.ts # x-pack/plugins/siem/public/components/open_timeline/index.test.tsx # x-pack/plugins/siem/public/components/open_timeline/open_timeline.tsx # x-pack/plugins/siem/public/components/open_timeline/types.ts # x-pack/plugins/siem/public/components/top_n/index.test.tsx # x-pack/plugins/siem/public/containers/timeline/api.ts # x-pack/plugins/siem/public/mock/timeline_results.ts # x-pack/plugins/siem/public/pages/timelines/index.tsx # x-pack/plugins/siem/public/store/timeline/defaults.ts # x-pack/plugins/siem/public/store/timeline/epic.ts # x-pack/plugins/siem/public/store/timeline/model.ts
2 parents 7c744fa + fd6b63e commit 91aa552

File tree

2,679 files changed

+86160
-79236
lines changed

Some content is hidden

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

2,679 files changed

+86160
-79236
lines changed

‎docs/apm/api.asciidoc‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ The following Agent configuration APIs are available:
6060
======
6161

6262
`settings`::
63-
(required) Key/value object with settings and their corresponding value.
63+
(required) Key/value object with option name and option value.
6464

6565
`agent_name`::
6666
(optional) The agent name is used by the UI to determine which settings to display.
@@ -73,14 +73,14 @@ The following Agent configuration APIs are available:
7373
--------------------------------------------------
7474
PUT /api/apm/settings/agent-configuration
7575
{
76-
"service" : {
77-
"name" : "frontend",
78-
"environment" : "production"
76+
"service": {
77+
"name": "frontend",
78+
"environment": "production"
7979
},
80-
"settings" : {
81-
"transaction_sample_rate" : 0.4,
82-
"capture_body" : "off",
83-
"transaction_max_spans" : 500
80+
"settings": {
81+
"transaction_sample_rate": "0.4",
82+
"capture_body": "off",
83+
"transaction_max_spans": "500"
8484
},
8585
"agent_name": "nodejs"
8686
}
@@ -124,7 +124,7 @@ PUT /api/apm/settings/agent-configuration
124124
DELETE /api/apm/settings/agent-configuration
125125
{
126126
"service" : {
127-
"name" : "frontend",
127+
"name": "frontend",
128128
"environment": "production"
129129
}
130130
}
@@ -157,9 +157,9 @@ DELETE /api/apm/settings/agent-configuration
157157
"environment": "production"
158158
},
159159
"settings": {
160-
"transaction_sample_rate": 1,
160+
"transaction_sample_rate": "1",
161161
"capture_body": "off",
162-
"transaction_max_spans": 200
162+
"transaction_max_spans": "200"
163163
},
164164
"@timestamp": 1581934104843,
165165
"applied_by_agent": false,
@@ -171,9 +171,9 @@ DELETE /api/apm/settings/agent-configuration
171171
"name": "opbeans-go"
172172
},
173173
"settings": {
174-
"transaction_sample_rate": 1,
174+
"transaction_sample_rate": "1",
175175
"capture_body": "off",
176-
"transaction_max_spans": 300
176+
"transaction_max_spans": "300"
177177
},
178178
"@timestamp": 1581934111727,
179179
"applied_by_agent": false,
@@ -185,7 +185,7 @@ DELETE /api/apm/settings/agent-configuration
185185
"name": "frontend"
186186
},
187187
"settings": {
188-
"transaction_sample_rate": 1,
188+
"transaction_sample_rate": "1",
189189
},
190190
"@timestamp": 1582031336265,
191191
"applied_by_agent": false,
@@ -250,7 +250,7 @@ GET /api/apm/settings/agent-configuration
250250
"name": "frontend"
251251
},
252252
"settings": {
253-
"transaction_sample_rate": 1,
253+
"transaction_sample_rate": "1",
254254
},
255255
"@timestamp": 1582031336265,
256256
"applied_by_agent": false,
@@ -266,9 +266,9 @@ GET /api/apm/settings/agent-configuration
266266
--------------------------------------------------
267267
POST /api/apm/settings/agent-configuration/search
268268
{
269-
"etag" : "1e58c178efeebae15c25c539da740d21dee422fc",
269+
"etag": "1e58c178efeebae15c25c539da740d21dee422fc",
270270
"service" : {
271-
"name" : "frontend",
271+
"name": "frontend",
272272
"environment": "production"
273273
}
274274
}

‎docs/canvas/canvas-elements.asciidoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ By default, most of the elements you create use demo data until you change the d
3131
[[canvas-add-object]]
3232
==== Add a saved object
3333

34-
Add a <<managing-saved-objects,saved object>>, such as a map or Lens visualization, then customize it to fit your display needs.
34+
Add a <<managing-saved-objects,saved object>>, then customize it to fit your display needs.
3535

3636
. Click *Embed object*.
3737

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<!-- Do not edit this file. It is automatically generated by API Documenter. -->
2+
3+
[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [extractSearchSourceReferences](./kibana-plugin-plugins-data-public.extractsearchsourcereferences.md)
4+
5+
## extractSearchSourceReferences variable
6+
7+
<b>Signature:</b>
8+
9+
```typescript
10+
extractReferences: (state: SearchSourceFields) => [SearchSourceFields & {
11+
indexRefName?: string | undefined;
12+
}, SavedObjectReference[]]
13+
```

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<!-- Do not edit this file. It is automatically generated by API Documenter. -->
2+
3+
[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [injectSearchSourceReferences](./kibana-plugin-plugins-data-public.injectsearchsourcereferences.md)
4+
5+
## injectSearchSourceReferences variable
6+
7+
<b>Signature:</b>
8+
9+
```typescript
10+
injectReferences: (searchSourceFields: SearchSourceFields & {
11+
indexRefName: string;
12+
}, references: SavedObjectReference[]) => SearchSourceFields
13+
```

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,14 @@
101101
| [esFilters](./kibana-plugin-plugins-data-public.esfilters.md) | |
102102
| [esKuery](./kibana-plugin-plugins-data-public.eskuery.md) | |
103103
| [esQuery](./kibana-plugin-plugins-data-public.esquery.md) | |
104+
| [extractSearchSourceReferences](./kibana-plugin-plugins-data-public.extractsearchsourcereferences.md) | |
104105
| [fieldFormats](./kibana-plugin-plugins-data-public.fieldformats.md) | |
105106
| [FilterBar](./kibana-plugin-plugins-data-public.filterbar.md) | |
106107
| [getIndexPatternFieldListCreator](./kibana-plugin-plugins-data-public.getindexpatternfieldlistcreator.md) | |
107108
| [getKbnTypeNames](./kibana-plugin-plugins-data-public.getkbntypenames.md) | Get the esTypes known by all kbnFieldTypes {<!-- -->Array<string>} |
108109
| [indexPatterns](./kibana-plugin-plugins-data-public.indexpatterns.md) | |
110+
| [injectSearchSourceReferences](./kibana-plugin-plugins-data-public.injectsearchsourcereferences.md) | |
111+
| [parseSearchSourceJSON](./kibana-plugin-plugins-data-public.parsesearchsourcejson.md) | |
109112
| [QueryStringInput](./kibana-plugin-plugins-data-public.querystringinput.md) | |
110113
| [search](./kibana-plugin-plugins-data-public.search.md) | |
111114
| [SearchBar](./kibana-plugin-plugins-data-public.searchbar.md) | |

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<!-- Do not edit this file. It is automatically generated by API Documenter. -->
2+
3+
[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [parseSearchSourceJSON](./kibana-plugin-plugins-data-public.parsesearchsourcejson.md)
4+
5+
## parseSearchSourceJSON variable
6+
7+
<b>Signature:</b>
8+
9+
```typescript
10+
parseSearchSourceJSON: (searchSourceJSON: string) => SearchSourceFields
11+
```

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ see https://www.elastic.co/subscriptions[the subscription page].
4141

4242
[float]
4343
[[create-connectors]]
44-
=== Preconfigured connectors and action types
44+
=== Preconfigured actions and connectors
4545

46-
For out-of-the-box and standardized connectors, you can <<preconfigured-connector-example, preconfigure connectors>>
46+
For out-of-the-box and standardized connectors, you can <<preconfigured-connector-example, preconfigure the connector>>
4747
before {kib} starts.
4848

4949
If you preconfigure a connector, you can also <<preconfigured-action-type-example, preconfigure its action type>>.
@@ -54,4 +54,4 @@ include::action-types/pagerduty.asciidoc[]
5454
include::action-types/server-log.asciidoc[]
5555
include::action-types/slack.asciidoc[]
5656
include::action-types/webhook.asciidoc[]
57-
include::pre-configured-connectors.asciidoc[]
57+
include::action-types/pre-configured-connectors.asciidoc[]

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

Lines changed: 32 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,27 +28,46 @@ Password:: password for 'login' type authentication.
2828
name: preconfigured-email-action-type
2929
actionTypeId: .email
3030
config:
31-
from: [email protected] <1.1>
32-
host: validhostname <1.2>
33-
port: 8080 <1.3>
34-
secure: false <1.4>
31+
from: [email protected]
32+
host: validhostname
33+
port: 8080
34+
secure: false
3535
secrets:
36-
user: testuser <2.1>
37-
password: passwordkeystorevalue <2.2>
36+
user: testuser
37+
password: passwordkeystorevalue
3838
--
3939

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

42-
<1.1> `from:` is an email address and correspond to *Sender*.
43-
<1.2> `host:` is a string and correspond to *Host*.
44-
<1.3> `port:` is a number and correspond to *Port*.
45-
<1.4> `secure:` is a boolean and correspond to *Secure*.
42+
[cols="2*<"]
43+
|===
4644

47-
`secrets` defines action type sensitive configuration:
45+
| `from`
46+
| An email address that corresponds to *Sender*.
4847

49-
<2.1> `user:` is a string and correspond to *User*.
50-
<2.2> `password:` is a string and correspond to *Password*. Should be stored in the <<creating-keystore, {kib} keystore>>.
48+
| `host`
49+
| A string that corresponds to *Host*.
5150

51+
| `port`
52+
| A number that corresponds to *Port*.
53+
54+
| `secure`
55+
| A boolean that corresponds to *Secure*.
56+
57+
|===
58+
59+
`secrets` defines sensitive information for the action type:
60+
61+
[cols="2*<"]
62+
|===
63+
64+
| `user`
65+
| A string that corresponds to *User*.
66+
67+
| `password`
68+
| A string that corresponds to *Password*. Should be stored in the <<creating-keystore, {kib} keystore>>.
69+
70+
|===
5271

5372
[[email-action-configuration]]
5473
==== Action configuration

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

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,26 @@ Execution time field:: This field will be automatically set to the time the ale
2525
name: action-type-index
2626
actionTypeId: .index
2727
config:
28-
index: .kibana <1>
29-
refresh: true <2>
30-
executionTimeField: somedate <3>
28+
index: .kibana
29+
refresh: true
30+
executionTimeField: somedate
3131
--
3232

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

35-
<1> `index:` is a string and correspond to *Index*.
36-
<2> `refresh:` is a boolean and correspond to *Refresh*.
37-
<3> `executionTimeField:` is a string and correspond to *Execution time field*.
35+
[cols="2*<"]
36+
|===
37+
38+
|`index`
39+
| A string that corresponds to *Index*.
40+
41+
|`refresh`
42+
| A boolean that corresponds to *Refresh*.
43+
44+
|`executionTimeField`
45+
| A string that corresponds to *Execution time field*.
46+
47+
|===
3848

3949

4050
[float]

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -145,18 +145,19 @@ Integration Key:: A 32 character PagerDuty Integration Key for an integration
145145
name: preconfigured-pagerduty-action-type
146146
actionTypeId: .pagerduty
147147
config:
148-
apiUrl: https://test.host <1.1>
148+
apiUrl: https://test.host
149149
secrets:
150-
routingKey: testroutingkey <2.1>
150+
routingKey: testroutingkey
151151
--
152152

153-
`config` defines the action type specific to the configuration and contains the following properties:
153+
`config` defines the action type specific to the configuration.
154+
`config` contains
155+
`apiURL`, a string that corresponds to *API URL*.
154156

155-
<1.1> `apiUrl:` is URL string and correspond to *API URL*.
157+
`secrets` defines sensitive information for the action type.
158+
`secrets` contains
159+
`routingKey`, a string that corresponds to *Integration Key*.
156160

157-
`secrets` defines action type sensitive configuration:
158-
159-
<2.1> `routingKey:` is a string and correspond to *Integration Key*.
160161

161162
[float]
162163
[[pagerduty-action-configuration]]

0 commit comments

Comments
 (0)