Skip to content

Commit d612e4d

Browse files
Merge branch 'main' into 129474/default-legend-size-to-fixed-migrations-strategy
2 parents bc69ec8 + 3c33854 commit d612e4d

356 files changed

Lines changed: 6133 additions & 2081 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.

.buildkite/ftr_configs.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,10 +162,12 @@ enabled:
162162
- x-pack/test/functional/apps/maps/group2/config.ts
163163
- x-pack/test/functional/apps/maps/group3/config.ts
164164
- x-pack/test/functional/apps/maps/group4/config.ts
165+
- x-pack/test/functional/apps/ml/anomaly_detection/config.ts
166+
- x-pack/test/functional/apps/ml/data_frame_analytics/config.ts
165167
- x-pack/test/functional/apps/ml/data_visualizer/config.ts
166-
- x-pack/test/functional/apps/ml/group1/config.ts
167-
- x-pack/test/functional/apps/ml/group2/config.ts
168-
- x-pack/test/functional/apps/ml/group3/config.ts
168+
- x-pack/test/functional/apps/ml/permissions/config.ts
169+
- x-pack/test/functional/apps/ml/short_tests/config.ts
170+
- x-pack/test/functional/apps/ml/stack_management_jobs/config.ts
169171
- x-pack/test/functional/apps/monitoring/config.ts
170172
- x-pack/test/functional/apps/remote_clusters/config.ts
171173
- x-pack/test/functional/apps/reporting_management/config.ts

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@
8383
/x-pack/plugins/ui_actions_enhanced/ @elastic/kibana-app-services
8484
/x-pack/plugins/runtime_fields @elastic/kibana-app-services
8585
/x-pack/test/search_sessions_integration/ @elastic/kibana-app-services
86+
/src/plugins/dashboard/public/application/embeddable/viewport/print_media @elastic/kibana-app-services
8687

8788
### Observability Plugins
8889

docs/developer/plugin-list.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ It also provides a stateful version of it on the start contract.
222222
223223
|{kib-repo}blob/{branch}/src/plugins/newsfeed/README.md[newsfeed]
224224
|The newsfeed plugin adds a NewsfeedNavButton to the top navigation bar and renders the content in the flyout.
225-
Content is fetched from the remote (https://feeds.elastic.co and https://feeds-staging.elastic.co in dev mode) once a day, with periodic checks if the content needs to be refreshed. All newsfeed content is hosted remotely.
225+
Content is fetched from the remote (https://feeds.elastic.co) once a day, with periodic checks if the content needs to be refreshed. All newsfeed content is hosted remotely.
226226
227227
228228
|{kib-repo}blob/{branch}/src/plugins/presentation_util/README.mdx[presentationUtil]

docs/settings/apm-settings.asciidoc

Lines changed: 44 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -38,71 +38,69 @@ If you'd like to change any of the default values,
3838
copy and paste the relevant settings into your `kibana.yml` configuration file.
3939
Changing these settings may disable features of the APM App.
4040

41-
[cols="2*<"]
42-
|===
43-
| `xpack.apm.maxServiceEnvironments` {ess-icon}
44-
| Maximum number of unique service environments recognized by the UI. Defaults to `100`.
41+
`xpack.apm.maxServiceEnvironments` {ess-icon}::
42+
Maximum number of unique service environments recognized by the UI. Defaults to `100`.
4543

46-
| `xpack.apm.serviceMapFingerprintBucketSize` {ess-icon}
47-
| Maximum number of unique transaction combinations sampled for generating service map focused on a specific service. Defaults to `100`.
44+
`xpack.apm.serviceMapFingerprintBucketSize` {ess-icon}::
45+
Maximum number of unique transaction combinations sampled for generating service map focused on a specific service. Defaults to `100`.
4846

49-
| `xpack.apm.serviceMapFingerprintGlobalBucketSize` {ess-icon}
50-
| Maximum number of unique transaction combinations sampled for generating the global service map. Defaults to `100`.
47+
`xpack.apm.serviceMapFingerprintGlobalBucketSize` {ess-icon}::
48+
Maximum number of unique transaction combinations sampled for generating the global service map. Defaults to `100`.
5149

52-
| `xpack.apm.serviceMapEnabled` {ess-icon}
53-
| Set to `false` to disable service maps. Defaults to `true`.
50+
`xpack.apm.serviceMapEnabled` {ess-icon}::
51+
Set to `false` to disable service maps. Defaults to `true`.
5452

55-
| `xpack.apm.serviceMapTraceIdBucketSize` {ess-icon}
56-
| Maximum number of trace IDs sampled for generating service map focused on a specific service. Defaults to `65`.
53+
`xpack.apm.serviceMapTraceIdBucketSize` {ess-icon}::
54+
Maximum number of trace IDs sampled for generating service map focused on a specific service. Defaults to `65`.
5755

58-
| `xpack.apm.serviceMapTraceIdGlobalBucketSize` {ess-icon}
59-
| Maximum number of trace IDs sampled for generating the global service map. Defaults to `6`.
56+
`xpack.apm.serviceMapTraceIdGlobalBucketSize` {ess-icon}::
57+
Maximum number of trace IDs sampled for generating the global service map. Defaults to `6`.
6058

61-
| `xpack.apm.serviceMapMaxTracesPerRequest` {ess-icon}
62-
| Maximum number of traces per request for generating the global service map. Defaults to `50`.
59+
`xpack.apm.serviceMapMaxTracesPerRequest` {ess-icon}::
60+
Maximum number of traces per request for generating the global service map. Defaults to `50`.
6361

64-
| `xpack.apm.ui.enabled` {ess-icon}
65-
| Set to `false` to hide the APM app from the main menu. Defaults to `true`.
62+
`xpack.apm.ui.enabled` {ess-icon}::
63+
Set to `false` to hide the APM app from the main menu. Defaults to `true`.
6664

67-
| `xpack.apm.ui.transactionGroupBucketSize` {ess-icon}
68-
| Number of top transaction groups displayed in the APM app. Defaults to `1000`.
65+
`xpack.apm.ui.transactionGroupBucketSize` {ess-icon}::
66+
Number of top transaction groups displayed in the APM app. Defaults to `1000`.
6967

70-
| `xpack.apm.ui.maxTraceItems` {ess-icon}
71-
| Maximum number of child items displayed when viewing trace details. Defaults to `1000`.
68+
`xpack.apm.ui.maxTraceItems` {ess-icon}::
69+
Maximum number of child items displayed when viewing trace details. Defaults to `1000`.
7270

73-
| `xpack.observability.annotations.index` {ess-icon}
74-
| Index name where Observability annotations are stored. Defaults to `observability-annotations`.
71+
`xpack.observability.annotations.index` {ess-icon}::
72+
Index name where Observability annotations are stored. Defaults to `observability-annotations`.
7573

76-
| `xpack.apm.searchAggregatedTransactions` {ess-icon}
77-
| Enables Transaction histogram metrics. Defaults to `auto` so the UI will use metric indices over transaction indices for transactions if aggregated transactions are found. When set to `always`, additional configuration in APM Server is required. When set to `never` and aggregated transactions are not used.
78-
See {apm-guide-ref}/transaction-metrics.html[Configure transaction metrics] for more information.
74+
`xpack.apm.searchAggregatedTransactions` {ess-icon}::
75+
Enables Transaction histogram metrics. Defaults to `auto` so the UI will use metric indices over transaction indices for transactions if aggregated transactions are found. When set to `always`, additional configuration in APM Server is required. When set to `never` and aggregated transactions are not used.
76+
+
77+
See {apm-guide-ref}/transaction-metrics.html[Configure transaction metrics] for more information.
7978

80-
| `xpack.apm.metricsInterval` {ess-icon}
81-
| Sets a `fixed_interval` for date histograms in metrics aggregations. Defaults to `30`.
79+
`xpack.apm.metricsInterval` {ess-icon}::
80+
Sets a `fixed_interval` for date histograms in metrics aggregations. Defaults to `30`.
8281

83-
| `xpack.apm.agent.migrations.enabled` {ess-icon}
84-
| Set to `false` to disable cloud APM migrations. Defaults to `true`.
82+
`xpack.apm.agent.migrations.enabled` {ess-icon}::
83+
Set to `false` to disable cloud APM migrations. Defaults to `true`.
8584

86-
| `xpack.apm.indices.error` {ess-icon}
87-
| Matcher for all error indices. Defaults to `logs-apm*,apm-*`.
85+
`xpack.apm.indices.error` {ess-icon}::
86+
Matcher for all error indices. Defaults to `logs-apm*,apm-*`.
8887

89-
| `xpack.apm.indices.onboarding` {ess-icon}
90-
| Matcher for all onboarding indices. Defaults to `apm-*`.
88+
`xpack.apm.indices.onboarding` {ess-icon}::
89+
Matcher for all onboarding indices. Defaults to `apm-*`.
9190

92-
| `xpack.apm.indices.span` {ess-icon}
93-
| Matcher for all span indices. Defaults to `traces-apm*,apm-*`.
91+
`xpack.apm.indices.span` {ess-icon}::
92+
Matcher for all span indices. Defaults to `traces-apm*,apm-*`.
9493

95-
| `xpack.apm.indices.transaction` {ess-icon}
96-
| Matcher for all transaction indices. Defaults to `traces-apm*,apm-*`.
94+
`xpack.apm.indices.transaction` {ess-icon}::
95+
Matcher for all transaction indices. Defaults to `traces-apm*,apm-*`.
9796

98-
| `xpack.apm.indices.metric` {ess-icon}
99-
| Matcher for all metrics indices. Defaults to `metrics-apm*,apm-*`.
97+
`xpack.apm.indices.metric` {ess-icon}::
98+
Matcher for all metrics indices. Defaults to `metrics-apm*,apm-*`.
10099

101-
| `xpack.apm.indices.sourcemap` {ess-icon}
102-
| Matcher for all source map indices. Defaults to `apm-*`.
100+
`xpack.apm.indices.sourcemap` {ess-icon}::
101+
Matcher for all source map indices. Defaults to `apm-*`.
103102

104-
| `xpack.apm.autoCreateApmDataView` {ess-icon}
105-
| Set to `false` to disable the automatic creation of the APM data view when the APM app is opened. Defaults to `true`.
106-
|===
103+
`xpack.apm.autoCreateApmDataView` {ess-icon}::
104+
Set to `false` to disable the automatic creation of the APM data view when the APM app is opened. Defaults to `true`.
107105

108106
// end::general-apm-settings[]

docs/settings/fleet-settings.asciidoc

Lines changed: 117 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -18,104 +18,140 @@ See the {fleet-guide}/index.html[{fleet}] docs for more information.
1818
[[general-fleet-settings-kb]]
1919
==== General {fleet} settings
2020

21-
[cols="2*<"]
22-
|===
23-
| `xpack.fleet.agents.enabled` {ess-icon}
24-
| Set to `true` (default) to enable {fleet}.
25-
|===
21+
`xpack.fleet.agents.enabled` {ess-icon}::
22+
Set to `true` (default) to enable {fleet}.
23+
2624

2725
[[fleet-data-visualizer-settings]]
2826

2927
==== {package-manager} settings
3028

31-
[cols="2*<"]
32-
|===
33-
| `xpack.fleet.registryUrl`
34-
| The address to use to reach the {package-manager} registry.
35-
| `xpack.fleet.registryProxyUrl`
36-
| The proxy address to use to reach the {package-manager} registry if an internet connection is not directly available.
37-
Refer to {fleet-guide}/air-gapped.html[Air-gapped environments] for details.
29+
`xpack.fleet.registryUrl`::
30+
The address to use to reach the {package-manager} registry.
31+
32+
`xpack.fleet.registryProxyUrl`::
33+
The proxy address to use to reach the {package-manager} registry if an internet connection is not directly available.
34+
Refer to {fleet-guide}/air-gapped.html[Air-gapped environments] for details.
3835

39-
|===
4036

4137
==== {fleet} settings
4238

43-
[cols="2*<"]
44-
|===
45-
| `xpack.fleet.agents.fleet_server.hosts`
46-
| Hostnames used by {agent} for accessing {fleet-server}.
47-
| `xpack.fleet.agents.elasticsearch.hosts`
48-
| Hostnames used by {agent} for accessing {es}.
49-
| `xpack.fleet.agents.elasticsearch.ca_sha256`
50-
| Hash pin used for certificate verification. The pin is a base64-encoded
51-
string of the SHA-256 fingerprint.
52-
|===
39+
`xpack.fleet.agents.fleet_server.hosts`::
40+
Hostnames used by {agent} for accessing {fleet-server}.
41+
42+
`xpack.fleet.agents.elasticsearch.hosts`::
43+
Hostnames used by {agent} for accessing {es}.
5344

45+
`xpack.fleet.agents.elasticsearch.ca_sha256`::
46+
Hash pin used for certificate verification. The pin is a base64-encoded string of the SHA-256 fingerprint.
5447

48+
49+
[role="child_attributes"]
5550
==== Preconfiguration settings (for advanced use cases)
5651

5752
Use these settings to pre-define integrations and agent policies that you
5853
want {fleet} to load up by default.
5954

60-
[cols="2*<a"]
61-
|===
62-
63-
| `xpack.fleet.packages`
64-
| List of integrations that are installed when the {fleet} app starts
65-
up for the first time. Required properties are:
66-
67-
`name`:: Name of the integration from the package registry.
68-
`version`:: Either an exact semantic version, or the keyword `latest` to fetch
69-
the latest integration version.
70-
71-
| `xpack.fleet.agentPolicies`
72-
| List of agent policies that are configured when the {fleet} app starts.
73-
Required properties are:
74-
75-
`id`:: Unique ID for this policy. The ID may be a number or string.
76-
`name`:: Policy name.
77-
78-
Optional properties are:
79-
80-
`description`:: Text description of this policy.
81-
`namespace`:: String identifying this policy's namespace.
82-
`monitoring_enabled`:: List of keywords that specify the monitoring data to collect.
83-
Valid values include `['logs']`, `['metrics']`, and `['logs', 'metrics']`.
84-
`is_managed`:: If `true`, this policy is not editable by the user and can only
85-
be changed by updating the {kib} config.
86-
`is_default`:: If `true`, this policy is the default agent policy.
87-
`is_default_fleet_server`:: If `true`, this policy is the default {fleet-server} agent policy.
88-
`data_output_id`:: ID of the output to send data (Need to be identical to `monitoring_output_id`)
89-
`monitoring_output_id`:: ID of the output to send monitoring data. (Need to be identical to `data_output_id`)
90-
`package_policies`:: List of integration policies to add to this policy.
91-
`id`::: Unique ID of the integration policy. The ID may be a number or string.
92-
`name`::: (required) Name of the integration policy.
93-
`package`::: (required) Integration that this policy configures
94-
`name`:::: Name of the integration associated with this policy.
95-
`description`::: Text string describing this integration policy.
96-
`namespace`::: String identifying this policy's namespace.
97-
`inputs`::: Array that overrides any default input settings for this
98-
integration. Follows the same schema as integration inputs, with the
99-
exception that any object in `vars` can be passed `frozen: true` in order to
100-
prevent that specific `var` from being edited by the user.
101-
102-
| `xpack.fleet.outputs`
103-
| List of outputs that are configured when the {fleet} app starts.
104-
Required properties are:
105-
106-
`id`:: Unique ID for this output. The ID should be a string.
107-
`name`:: Output name.
108-
`type`:: Type of Output. Currently we only support "elasticsearch".
109-
`hosts`:: Array that contains the list of host for that output.
110-
`config`:: Extra config for that output.
111-
112-
Optional properties are:
113-
114-
`is_default`:: If `true`, this output is the default output.
115-
|===
116-
55+
`xpack.fleet.packages`::
56+
List of integrations that are installed when the {fleet} app starts up for the first time.
57+
+
58+
.Required properties of `xpack.fleet.packages`
59+
[%collapsible%open]
60+
=====
61+
`name`:::
62+
Name of the integration from the package registry.
63+
64+
`version`:::
65+
Either an exact semantic version, or the keyword `latest` to fetch the latest integration version.
66+
=====
67+
68+
`xpack.fleet.agentPolicies`::
69+
List of agent policies that are configured when the {fleet} app starts.
70+
+
71+
.Required properties of `xpack.fleet.agentPolicies`
72+
[%collapsible%open]
73+
=====
74+
`id`:::
75+
Unique ID for this policy. The ID may be a number or string.
76+
`name`:::
77+
Policy name.
78+
=====
79+
+
80+
.Optional properties of `xpack.fleet.agentPolicies`
81+
[%collapsible%open]
82+
=====
83+
`description`:::
84+
Text description of this policy.
85+
`namespace`:::
86+
String identifying this policy's namespace.
87+
`monitoring_enabled`:::
88+
List of keywords that specify the monitoring data to collect. Valid values include `['logs']`, `['metrics']`, and `['logs', 'metrics']`.
89+
`is_managed`:::
90+
If `true`, this policy is not editable by the user and can only be changed by updating the {kib} config.
91+
`is_default`:::
92+
If `true`, this policy is the default agent policy.
93+
`is_default_fleet_server`:::
94+
If `true`, this policy is the default {fleet-server} agent policy.
95+
`data_output_id`:::
96+
ID of the output to send data. (Need to be identical to `monitoring_output_id`)
97+
`monitoring_output_id`:::
98+
ID of the output to send monitoring data. (Need to be identical to `data_output_id`)
99+
`package_policies`:::
100+
List of integration policies to add to this policy.
101+
+
102+
.Properties of `package_policies`
103+
[%collapsible%open]
104+
=======
105+
`id`::::
106+
Unique ID of the integration policy. The ID may be a number or string.
107+
`name`::::
108+
(required) Name of the integration policy.
109+
`package`::::
110+
(required) Integration that this policy configures.
111+
+
112+
.Properties of `package`
113+
[%collapsible%open]
114+
========
115+
`name`::::
116+
Name of the integration associated with this policy.
117+
========
118+
119+
`description`::::
120+
Text string describing this integration policy.
121+
`namespace`::::
122+
String identifying this policy's namespace.
123+
`inputs`::::
124+
Array that overrides any default input settings for this integration. Follows the same schema as integration inputs, with the exception that any object in `vars` can be passed `frozen: true` in order to prevent that specific `var` from being edited by the user.
125+
=======
126+
=====
127+
128+
`xpack.fleet.outputs`::
129+
List of outputs that are configured when the {fleet} app starts.
130+
+
131+
.Required properties of `xpack.fleet.outputs`
132+
[%collapsible%open]
133+
=====
134+
`id`:::
135+
Unique ID for this output. The ID should be a string.
136+
`name`:::
137+
Output name.
138+
`type`:::
139+
Type of Output. Currently we only support "elasticsearch".
140+
`hosts`:::
141+
Array that contains the list of host for that output.
142+
`config`:::
143+
Extra config for that output.
144+
=====
145+
+
146+
.Optional properties of `xpack.fleet.outputs`
147+
[%collapsible%open]
148+
=====
149+
`is_default`:::
150+
If `true`, this output is the default output.
151+
=====
152+
+
117153
Example configuration:
118-
154+
+
119155
[source,yaml]
120156
----
121157
xpack.fleet.packages:

0 commit comments

Comments
 (0)