Skip to content

Commit e47cfec

Browse files
kertalkertal
committed
Merge master / fix conflicts
2 parents 583781c + b058f78 commit e47cfec

366 files changed

Lines changed: 7496 additions & 3586 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/development/core/public/kibana-plugin-core-public.doclinksstart.links.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ readonly links: {
2121
readonly installation: string;
2222
readonly configuration: string;
2323
readonly elasticsearchOutput: string;
24+
readonly elasticsearchModule: string;
2425
readonly startup: string;
2526
readonly exportedFields: string;
2627
};
@@ -29,6 +30,10 @@ readonly links: {
2930
};
3031
readonly metricbeat: {
3132
readonly base: string;
33+
readonly configure: string;
34+
readonly httpEndpoint: string;
35+
readonly install: string;
36+
readonly start: string;
3237
};
3338
readonly enterpriseSearch: {
3439
readonly base: string;

‎docs/maps/connect-to-ems.asciidoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ endif::[]
8686

8787
[cols="2*<"]
8888
|===
89-
| [[ems-hostname]]`hostname`
89+
| [[ems-host]]`host`
9090
| Specifies the host of the backend server. To allow remote users to connect, set the value to the IP address or DNS name of the {hosted-ems} container. *Default: _your-hostname_*. <<server-host,Equivalent {kib} setting>>.
9191

9292
| `port`
@@ -199,7 +199,7 @@ TIP: The available basemaps and boundaries can be explored from the `/maps` endp
199199
[[elastic-maps-server-kibana]]
200200
==== Kibana configuration
201201

202-
With {hosted-ems} running, add the `map.emsUrl` configuration key in your <<settings, kibana.yml>> file pointing to the root of the service. This setting will point {kib} to request EMS basemaps and boundaries from {hosted-ems}. Typically this will be the URL to the <<ems-hostname,hostname and port>> of {hosted-ems}. For example, `map.emsUrl: https://my-ems-server:8080`.
202+
With {hosted-ems} running, add the `map.emsUrl` configuration key in your <<settings, kibana.yml>> file pointing to the root of the service. This setting will point {kib} to request EMS basemaps and boundaries from {hosted-ems}. Typically this will be the URL to the <<ems-host,host and port>> of {hosted-ems}. For example, `map.emsUrl: https://my-ems-server:8080`.
203203

204204

205205
[float]

‎docs/maps/maps-aggregations.asciidoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@ To enable a blended layer that dynamically shows clusters or documents:
6868

6969
[role="xpack"]
7070
[[maps-top-hits-aggregation]]
71-
=== Top hits per entity
71+
=== Display the most relevant documents per entity
7272

73-
You can display the most relevant documents per entity, for example, the most recent GPS tracks per flight.
73+
Use *Top hits per entity* to display the most relevant documents per entity, for example, the most recent GPS tracks per flight route.
7474
To get this data, {es} first groups your data using a {ref}/search-aggregations-bucket-terms-aggregation.html[terms aggregation],
7575
then accumulates the most relevant documents based on sort order for each entry using a {ref}/search-aggregations-metrics-top-hits-aggregation.html[top hits metric aggregation].
7676

‎docs/migration/migrate_8_0.asciidoc‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,16 @@ for example, `logstash-*`.
5858
==== Responses are never logged by default
5959
*Details:* Previously responses would be logged if either `logging.json` was true, `logging.dest` was specified, or a `TTY` was detected.
6060

61-
*Impact:* To restore the previous behavior, in kibana.yml set `logging.events.response=*`.
61+
*Impact:* To restore the previous behavior, in kibana.yml enable `debug` logs for the `http.server.response` context under `logging.loggers`:
62+
[source,yaml]
63+
-------------------
64+
logging:
65+
loggers:
66+
- context: http.server.response
67+
appenders: [console]
68+
level: debug
69+
-------------------
70+
See https://github.com/elastic/kibana/pull/87939 for more details.
6271

6372
[float]
6473
==== `xpack.security.authProviders` is no longer valid

‎docs/setup/install/deb.asciidoc‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,8 @@ The Debian package for Kibana can be <<install-deb,downloaded from our website>>
88
or from our <<deb-repo,APT repository>>. It can be used to install
99
Kibana on any Debian-based system such as Debian and Ubuntu.
1010

11-
This package is free to use under the Elastic license. It contains open source
12-
and free commercial features and access to paid commercial features.
13-
<<managing-licenses,Start a 30-day trial>> to try out all of the
14-
paid commercial features. See the
15-
https://www.elastic.co/subscriptions[Subscriptions] page for information about
16-
Elastic license levels.
11+
This package contains both free and subscription features.
12+
<<managing-licenses,Start a 30-day trial>> to try out all of the features.
1713

1814
The latest stable version of Kibana can be found on the
1915
link:/downloads/kibana[Download Kibana] page. Other versions can

‎docs/setup/install/rpm.asciidoc‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,8 @@ and Oracle Enterprise.
1313
NOTE: RPM install is not supported on distributions with old versions of RPM,
1414
such as SLES 11 and CentOS 5. Please see <<targz>> instead.
1515

16-
This package is free to use under the Elastic license. It contains open source
17-
and free commercial features and access to paid commercial features.
18-
<<managing-licenses,Start a 30-day trial>> to try out all of the
19-
paid commercial features. See the
20-
https://www.elastic.co/subscriptions[Subscriptions] page for information about
21-
Elastic license levels.
16+
This package contains both free and subscription features.
17+
<<managing-licenses,Start a 30-day trial>> to try out all of the features.
2218

2319
The latest stable version of Kibana can be found on the
2420
link:/downloads/kibana[Download Kibana] page. Other versions can

‎docs/setup/install/targz.asciidoc‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,8 @@
77
Kibana is provided for Linux and Darwin as a `.tar.gz` package. These packages
88
are the easiest formats to use when trying out Kibana.
99

10-
These packages are free to use under the Elastic license. They contain open
11-
source and free commercial features and access to paid commercial features.
12-
<<managing-licenses,Start a 30-day trial>> to try out all of the
13-
paid commercial features. See the
14-
https://www.elastic.co/subscriptions[Subscriptions] page for information about
15-
Elastic license levels.
10+
This package contains both free and subscription features.
11+
<<managing-licenses,Start a 30-day trial>> to try out all of the features.
1612

1713
The latest stable version of Kibana can be found on the
1814
link:/downloads/kibana[Download Kibana] page.

‎docs/setup/install/windows.asciidoc‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,8 @@
66

77
Kibana can be installed on Windows using the `.zip` package.
88

9-
This package is free to use under the Elastic license. It contains open source
10-
and free commercial features and access to paid commercial features.
11-
<<managing-licenses,Start a 30-day trial>> to try out all of the
12-
paid commercial features. See the
13-
https://www.elastic.co/subscriptions[Subscriptions] page for information about
14-
Elastic license levels.
9+
This package contains both free and subscription features.
10+
<<managing-licenses,Start a 30-day trial>> to try out all of the features.
1511

1612
The latest stable version of Kibana can be found on the
1713
link:/downloads/kibana[Download Kibana] page.

‎packages/kbn-legacy-logging/src/get_logging_config.ts‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ export function getLoggingConfiguration(config: LegacyLoggingConfig, opsInterval
2727
});
2828
} else if (config.verbose) {
2929
_.defaults(events, {
30+
error: '*',
3031
log: '*',
31-
// To avoid duplicate logs, we explicitly disable this in verbose
32-
// mode as it is already provided by the new logging config under
33-
// the `metrics.ops` context.
32+
// To avoid duplicate logs, we explicitly disable these in verbose
33+
// mode as they are already provided by the new logging config under
34+
// the `http.server.response` and `metrics.ops` contexts.
3435
ops: '!',
35-
request: '*',
36-
response: '*',
37-
error: '*',
36+
request: '!',
37+
response: '!',
3838
});
3939
} else {
4040
_.defaults(events, {
@@ -75,6 +75,7 @@ export function getLoggingConfiguration(config: LegacyLoggingConfig, opsInterval
7575
},
7676
includes: {
7777
request: ['headers', 'payload'],
78+
response: ['headers', 'payload'],
7879
},
7980
reporters: {
8081
logReporter: [loggerStream],

‎packages/kbn-legacy-logging/src/log_events.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
* Side Public License, v 1.
77
*/
88

9+
import type { ResponseObject } from '@hapi/hapi';
910
import { EventData, isEventData } from './metadata';
1011

1112
export interface BaseEvent {
@@ -21,7 +22,8 @@ export interface ResponseEvent extends BaseEvent {
2122
statusCode: number;
2223
path: string;
2324
headers: Record<string, string | string[]>;
24-
responsePayload: string;
25+
responseHeaders: Record<string, string | string[]>;
26+
responsePayload: ResponseObject['source'];
2527
responseTime: string;
2628
query: Record<string, any>;
2729
}

0 commit comments

Comments
 (0)