Skip to content

Commit fd78257

Browse files
elasticmachineelasticmachine
authored
Merge branch '7.x' into backport/7.x/pr-64628
2 parents 479ebc3 + b96e57d commit fd78257

198 files changed

Lines changed: 4810 additions & 1413 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.

‎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/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.fields.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
fields?: {
1111
[subfield: string]: {
1212
type: string;
13+
ignore_above?: number;
1314
};
1415
};
1516
```

‎docs/development/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export interface SavedObjectsCoreFieldMapping
1717
| Property | Type | Description |
1818
| --- | --- | --- |
1919
| [enabled](./kibana-plugin-core-server.savedobjectscorefieldmapping.enabled.md) | <code>boolean</code> | |
20-
| [fields](./kibana-plugin-core-server.savedobjectscorefieldmapping.fields.md) | <code>{</code><br/><code> [subfield: string]: {</code><br/><code> type: string;</code><br/><code> };</code><br/><code> }</code> | |
20+
| [fields](./kibana-plugin-core-server.savedobjectscorefieldmapping.fields.md) | <code>{</code><br/><code> [subfield: string]: {</code><br/><code> type: string;</code><br/><code> ignore_above?: number;</code><br/><code> };</code><br/><code> }</code> | |
2121
| [index](./kibana-plugin-core-server.savedobjectscorefieldmapping.index.md) | <code>boolean</code> | |
2222
| [null\_value](./kibana-plugin-core-server.savedobjectscorefieldmapping.null_value.md) | <code>number &#124; boolean &#124; string</code> | |
2323
| [type](./kibana-plugin-core-server.savedobjectscorefieldmapping.type.md) | <code>string</code> | |

‎docs/development/core/server/kibana-plugin-core-server.savedobjectsmigrationlogger.error.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-core-server](./kibana-plugin-core-server.md) &gt; [SavedObjectsMigrationLogger](./kibana-plugin-core-server.savedobjectsmigrationlogger.md) &gt; [error](./kibana-plugin-core-server.savedobjectsmigrationlogger.error.md)
4+
5+
## SavedObjectsMigrationLogger.error property
6+
7+
<b>Signature:</b>
8+
9+
```typescript
10+
error: (msg: string, meta: LogMeta) => void;
11+
```

‎docs/development/core/server/kibana-plugin-core-server.savedobjectsmigrationlogger.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ export interface SavedObjectsMigrationLogger
1616
| Property | Type | Description |
1717
| --- | --- | --- |
1818
| [debug](./kibana-plugin-core-server.savedobjectsmigrationlogger.debug.md) | <code>(msg: string) =&gt; void</code> | |
19+
| [error](./kibana-plugin-core-server.savedobjectsmigrationlogger.error.md) | <code>(msg: string, meta: LogMeta) =&gt; void</code> | |
1920
| [info](./kibana-plugin-core-server.savedobjectsmigrationlogger.info.md) | <code>(msg: string) =&gt; void</code> | |
2021
| [warn](./kibana-plugin-core-server.savedobjectsmigrationlogger.warn.md) | <code>(msg: string) =&gt; void</code> | |
2122
| [warning](./kibana-plugin-core-server.savedobjectsmigrationlogger.warning.md) | <code>(msg: string) =&gt; void</code> | |

‎docs/development/plugins/data/server/kibana-plugin-plugins-data-server.iindexpattern.gettimefield.md‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<!-- Do not edit this file. It is automatically generated by API Documenter. -->
2+
3+
[Home](./index.md) &gt; [kibana-plugin-plugins-data-server](./kibana-plugin-plugins-data-server.md) &gt; [IIndexPattern](./kibana-plugin-plugins-data-server.iindexpattern.md) &gt; [getTimeField](./kibana-plugin-plugins-data-server.iindexpattern.gettimefield.md)
4+
5+
## IIndexPattern.getTimeField() method
6+
7+
<b>Signature:</b>
8+
9+
```typescript
10+
getTimeField?(): IFieldType | undefined;
11+
```
12+
<b>Returns:</b>
13+
14+
`IFieldType | undefined`
15+

‎docs/user/plugins.asciidoc‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,17 @@ $ bin/kibana-plugin install x-pack
3333
=== Install plugins from an arbitrary URL
3434

3535
You can download official Elastic plugins simply by specifying their name. You
36-
can alternatively specify a URL to a specific plugin, as in the following
37-
example:
36+
can alternatively specify a URL or file path to a specific plugin, as in the following
37+
examples:
3838

3939
["source","shell",subs="attributes"]
4040
$ bin/kibana-plugin install https://artifacts.elastic.co/downloads/packs/x-pack/x-pack-{version}.zip
4141

42+
or
43+
44+
["source","shell",subs="attributes"]
45+
$ bin/kibana-plugin install file:///local/path/to/custom_plugin.zip
46+
4247
You can specify URLs that use the HTTP, HTTPS, or `file` protocols.
4348

4449
[float]

‎src/core/server/saved_objects/mappings/types.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ export interface SavedObjectsCoreFieldMapping {
137137
fields?: {
138138
[subfield: string]: {
139139
type: string;
140+
ignore_above?: number;
140141
};
141142
};
142143
}

‎src/core/server/saved_objects/migrations/core/document_migrator.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ describe('DocumentMigrator', () => {
293293
migrationVersion: { dog: '10.2.0' },
294294
})
295295
).toThrow(
296-
/Document "smelly" has property "dog" which belongs to a more recent version of Kibana \(10\.2\.0\)/i
296+
/Document "smelly" has property "dog" which belongs to a more recent version of Kibana \[10\.2\.0\]\. The last known version is \[undefined\]/i
297297
);
298298
});
299299

@@ -315,7 +315,7 @@ describe('DocumentMigrator', () => {
315315
migrationVersion: { dawg: '1.2.4' },
316316
})
317317
).toThrow(
318-
/Document "fleabag" has property "dawg" which belongs to a more recent version of Kibana \(1\.2\.4\)/i
318+
/Document "fleabag" has property "dawg" which belongs to a more recent version of Kibana \[1\.2\.4\]\. The last known version is \[1\.2\.3\]/i
319319
);
320320
});
321321

0 commit comments

Comments
 (0)