Skip to content

Commit ee83f2e

Browse files
author
Maja Grubic
committed
Merge master and resolve conflicts
2 parents 9753c3c + 46304f0 commit ee83f2e

421 files changed

Lines changed: 7955 additions & 5029 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: 195 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,201 @@ module.exports = {
5555
extends: ['@elastic/eslint-config-kibana', 'plugin:@elastic/eui/recommended'],
5656

5757
overrides: [
58+
/**
59+
* Temporarily disable some react rules for specific plugins, remove in separate PRs
60+
*/
61+
{
62+
files: ['packages/kbn-ui-framework/**/*.{js,ts,tsx}'],
63+
rules: {
64+
'jsx-a11y/no-onchange': 'off',
65+
},
66+
},
67+
{
68+
files: ['src/core/public/application/**/*.{js,ts,tsx}'],
69+
rules: {
70+
'react/no-danger': 'off',
71+
},
72+
},
73+
{
74+
files: ['src/legacy/core_plugins/console/**/*.{js,ts,tsx}'],
75+
rules: {
76+
'react-hooks/exhaustive-deps': 'off',
77+
},
78+
},
79+
{
80+
files: ['src/legacy/core_plugins/data/**/*.{js,ts,tsx}'],
81+
rules: {
82+
'react-hooks/exhaustive-deps': 'off',
83+
},
84+
},
85+
{
86+
files: ['src/legacy/core_plugins/expressions/**/*.{js,ts,tsx}'],
87+
rules: {
88+
'react-hooks/exhaustive-deps': 'off',
89+
},
90+
},
91+
{
92+
files: ['src/legacy/core_plugins/kbn_vislib_vis_types/**/*.{js,ts,tsx}'],
93+
rules: {
94+
'react-hooks/exhaustive-deps': 'off',
95+
},
96+
},
97+
{
98+
files: ['src/legacy/core_plugins/kibana/**/*.{js,ts,tsx}'],
99+
rules: {
100+
'react-hooks/rules-of-hooks': 'off',
101+
'react-hooks/exhaustive-deps': 'off',
102+
},
103+
},
104+
{
105+
files: ['src/legacy/core_plugins/tile_map/**/*.{js,ts,tsx}'],
106+
rules: {
107+
'react-hooks/exhaustive-deps': 'off',
108+
},
109+
},
110+
{
111+
files: ['src/legacy/core_plugins/vis_type_markdown/**/*.{js,ts,tsx}'],
112+
rules: {
113+
'react-hooks/exhaustive-deps': 'off',
114+
},
115+
},
116+
{
117+
files: ['src/legacy/core_plugins/vis_type_metric/**/*.{js,ts,tsx}'],
118+
rules: {
119+
'jsx-a11y/click-events-have-key-events': 'off',
120+
},
121+
},
122+
{
123+
files: ['src/legacy/core_plugins/vis_type_table/**/*.{js,ts,tsx}'],
124+
rules: {
125+
'react-hooks/exhaustive-deps': 'off',
126+
},
127+
},
128+
{
129+
files: ['src/legacy/core_plugins/vis_type_vega/**/*.{js,ts,tsx}'],
130+
rules: {
131+
'react-hooks/exhaustive-deps': 'off',
132+
},
133+
},
134+
{
135+
files: ['src/legacy/ui/public/vis/**/*.{js,ts,tsx}'],
136+
rules: {
137+
'react-hooks/exhaustive-deps': 'off',
138+
},
139+
},
140+
{
141+
files: ['src/plugins/es_ui_shared/**/*.{js,ts,tsx}'],
142+
rules: {
143+
'react-hooks/exhaustive-deps': 'off',
144+
},
145+
},
146+
{
147+
files: ['src/plugins/eui_utils/**/*.{js,ts,tsx}'],
148+
rules: {
149+
'react-hooks/exhaustive-deps': 'off',
150+
},
151+
},
152+
{
153+
files: ['src/plugins/kibana_react/**/*.{js,ts,tsx}'],
154+
rules: {
155+
'react-hooks/rules-of-hooks': 'off',
156+
'react-hooks/exhaustive-deps': 'off',
157+
},
158+
},
159+
{
160+
files: ['src/plugins/kibana_utils/**/*.{js,ts,tsx}'],
161+
rules: {
162+
'react-hooks/exhaustive-deps': 'off',
163+
},
164+
},
165+
{
166+
files: ['x-pack/legacy/plugins/canvas/**/*.{js,ts,tsx}'],
167+
rules: {
168+
'react-hooks/exhaustive-deps': 'off',
169+
'jsx-a11y/click-events-have-key-events': 'off',
170+
},
171+
},
172+
{
173+
files: ['x-pack/legacy/plugins/cross_cluster_replication/**/*.{js,ts,tsx}'],
174+
rules: {
175+
'jsx-a11y/click-events-have-key-events': 'off',
176+
},
177+
},
178+
{
179+
files: ['x-pack/legacy/plugins/graph/**/*.{js,ts,tsx}'],
180+
rules: {
181+
'react-hooks/exhaustive-deps': 'off',
182+
},
183+
},
184+
{
185+
files: ['x-pack/legacy/plugins/index_management/**/*.{js,ts,tsx}'],
186+
rules: {
187+
'react-hooks/exhaustive-deps': 'off',
188+
'react-hooks/rules-of-hooks': 'off',
189+
},
190+
},
191+
{
192+
files: ['x-pack/legacy/plugins/infra/**/*.{js,ts,tsx}'],
193+
rules: {
194+
'react-hooks/exhaustive-deps': 'off',
195+
'react-hooks/rules-of-hooks': 'off',
196+
},
197+
},
198+
{
199+
files: ['x-pack/legacy/plugins/lens/**/*.{js,ts,tsx}'],
200+
rules: {
201+
'react-hooks/exhaustive-deps': 'off',
202+
'react-hooks/rules-of-hooks': 'off',
203+
},
204+
},
205+
{
206+
files: ['x-pack/legacy/plugins/ml/**/*.{js,ts,tsx}'],
207+
rules: {
208+
'react-hooks/exhaustive-deps': 'off',
209+
'react-hooks/rules-of-hooks': 'off',
210+
'jsx-a11y/click-events-have-key-events': 'off',
211+
},
212+
},
213+
{
214+
files: ['x-pack/legacy/plugins/monitoring/**/*.{js,ts,tsx}'],
215+
rules: {
216+
'jsx-a11y/click-events-have-key-events': 'off',
217+
},
218+
},
219+
{
220+
files: ['x-pack/legacy/plugins/siem/**/*.{js,ts,tsx}'],
221+
rules: {
222+
'react-hooks/exhaustive-deps': 'off',
223+
'react-hooks/rules-of-hooks': 'off',
224+
},
225+
},
226+
{
227+
files: ['x-pack/legacy/plugins/snapshot_restore/**/*.{js,ts,tsx}'],
228+
rules: {
229+
'react-hooks/exhaustive-deps': 'off',
230+
},
231+
},
232+
{
233+
files: ['x-pack/legacy/plugins/transform/**/*.{js,ts,tsx}'],
234+
rules: {
235+
'react-hooks/exhaustive-deps': 'off',
236+
},
237+
},
238+
{
239+
files: ['x-pack/legacy/plugins/uptime/**/*.{js,ts,tsx}'],
240+
rules: {
241+
'react-hooks/exhaustive-deps': 'off',
242+
'react-hooks/rules-of-hooks': 'off',
243+
},
244+
},
245+
{
246+
files: ['x-pack/legacy/plugins/watcher/**/*.{js,ts,tsx}'],
247+
rules: {
248+
'react-hooks/rules-of-hooks': 'off',
249+
'react-hooks/exhaustive-deps': 'off',
250+
},
251+
},
252+
58253
/**
59254
* Prettier
60255
*/

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ _Note: The version numbers below are only examples, meant to illustrate the rela
6060

6161
## Questions? Problems? Suggestions?
6262

63-
- If you've found a bug or want to request a feature, please create a [GitHub Issue](https://github.com/elastic/kibana/issues/new).
64-
Please check to make sure someone else hasn't already created an issue for the same topic.
63+
- If you've found a bug or want to request a feature, please create a [GitHub Issue](https://github.com/elastic/kibana/issues/new/choose).
64+
Please check to make sure someone else hasn't already created an issue for the same topic.
6565
- Need help using Kibana? Ask away on our [Kibana Discuss Forum](https://discuss.elastic.co/c/kibana) and a fellow community member or
6666
Elastic engineer will be glad to help you out.

‎docs/infrastructure/getting-started.asciidoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
[role="xpack"]
22
[[xpack-metrics-getting-started]]
3-
== Getting started with infrastructure monitoring
3+
== Getting started with metrics
44

55
To get started with the Metrics app in Kibana, you need to start collecting metrics data for your infrastructure.
66

77
Kibana provides step-by-step instructions to help you add metrics data.
88
The {metrics-guide}[Metrics Monitoring Guide] is a good source for more detailed information and instructions.
99

1010
[role="screenshot"]
11-
image::infrastructure/images/metrics-add-data.png[Screenshot showing Add metric data to Kibana UI]
11+
image::infrastructure/images/metrics-add-data.png[Screenshot showing Add metric data to Kibana]

‎docs/infrastructure/index.asciidoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44

55
[partintro]
66
--
7-
The Metrics app enables you to monitor your infrastructure and identify problems in real time.
7+
The Metrics app enables you to monitor your infrastructure metrics and identify problems in real time.
88
You start with a visual summary of your infrastructure where you can view basic metrics for common servers, containers, and services.
99
Then you can drill down to view more detailed metrics or other information for that component.
1010

1111
You can:
1212

13-
* View an inventory of your infrastructure by hosts, Kubernetes pod or Docker containers.
13+
* View your infrastructure metrics by hosts, Kubernetes pods or Docker containers.
1414
You can group and filter the data in various ways to help you identify the items that interest you.
1515

1616
* View current and historic values for metrics such as CPU usage, memory usage, and network traffic for each component.

‎docs/infrastructure/infra-ui.asciidoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
[[infra-ui]]
33
== Using the Metrics app
44

5-
Use the Metrics app in {kib} to monitor your infrastructure and identify problems in real time.
5+
Use the Metrics app in {kib} to monitor your infrastructure metrics and identify problems in real time.
66
You can explore metrics for hosts, containers, and services.
77
You can also drill down to view more detailed metrics, or seamlessly switch to view the corresponding logs, application traces, and uptime information.
88

99
Initially, the *Inventory* tab shows an overview of the hosts in of your infrastructure and the current CPU usage for each host.
10-
From here, you can drill down into areas of interest.
10+
From here, you can view other metrics or drill down into areas of interest.
1111

1212
[role="screenshot"]
1313
image::infrastructure/images/infra-sysmon.png[Infrastructure Overview in Kibana]

‎docs/infrastructure/metrics-explorer.asciidoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ image::infrastructure/images/metrics-explorer-screen.png[Metrics Explorer in Kib
1515

1616
* Metrics Explorer uses data collected from {metricbeat-ref}/metricbeat-overview.html[Metricbeat].
1717
* You need read permissions on `metricbeat-*` or the metric index specified in the Metrics configuration.
18-
* Metrics Explorer uses the timestamp field set in the Infrastructure configuration.
18+
* Metrics Explorer uses the timestamp field from the *Settings* tab.
1919
By default that is set to `@timestamp`.
2020
* The interval for the X Axis is set to `auto`.
2121
The bucket size is determined by the time range.

‎docs/logs/using.asciidoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ image::logs/images/logs-console.png[Logs Console in Kibana]
1717
Use the search bar to perform ad hoc searches for specific text.
1818
You can also create structured queries using {kibana-ref}/kuery-query.html[Kibana Query Language].
1919
For example, enter `host.hostname : "host1"` to see only the information for `host1`.
20-
// ++ this isn't quite the same as the corresponding infrastructure description now.
20+
// ++ this isn't quite the same as the corresponding metrics description now.
2121

2222
[float]
2323
[[logs-configure-source]]

‎docs/settings/general-infra-logs-ui-settings.asciidoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
`xpack.infra.enabled`:: Set to `false` to disable the Logs and Metrics UI plugin {kib}. Defaults to `true`.
1+
`xpack.infra.enabled`:: Set to `false` to disable the Logs and Metrics app plugin {kib}. Defaults to `true`.
22

33
`xpack.infra.sources.default.logAlias`:: Index pattern for matching indices that contain log data. Defaults to `filebeat-*,kibana_sample_data_logs*`. To match multiple wildcard patterns, use a comma to separate the names, with no space after the comma. For example, `logstash-app1-*,default-logs-*`.
44

55
`xpack.infra.sources.default.metricAlias`:: Index pattern for matching indices that contain Metricbeat data. Defaults to `metricbeat-*`. To match multiple wildcard patterns, use a comma to separate the names, with no space after the comma. For example, `logstash-app1-*,default-logs-*`.
66

77
`xpack.infra.sources.default.fields.timestamp`:: Timestamp used to sort log entries. Defaults to `@timestamp`.
88

9-
`xpack.infra.sources.default.fields.message`:: Fields used to display messages in the Logs UI. Defaults to `['message', '@message']`.
9+
`xpack.infra.sources.default.fields.message`:: Fields used to display messages in the Logs app. Defaults to `['message', '@message']`.
1010

1111
`xpack.infra.sources.default.fields.tiebreaker`:: Field used to break ties between two entries with the same timestamp. Defaults to `_doc`.
1212

‎docs/settings/infrastructure-ui-settings.asciidoc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
[role="xpack"]
22
[[infrastructure-ui-settings-kb]]
3-
=== Metrics UI settings in Kibana
3+
=== Metrics settings in Kibana
44
++++
5-
<titleabbrev>Metrics UI settings</titleabbrev>
5+
<titleabbrev>Metrics settings</titleabbrev>
66
++++
77

8-
You do not need to configure any settings to use the Metrics UI. It is enabled by default.
8+
You do not need to configure any settings to use the Metrics app in {kib}. It is enabled by default.
99

1010
[float]
1111
[[general-infra-ui-settings-kb]]
12-
==== General Metrics UI settings
12+
==== General Metrics settings
1313

1414
include::general-infra-logs-ui-settings.asciidoc[]

‎docs/settings/logs-ui-settings.asciidoc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
[role="xpack"]
22
[[logs-ui-settings-kb]]
3-
=== Logs UI settings in Kibana
3+
=== Logs app settings in Kibana
44
++++
5-
<titleabbrev>Logs UI settings</titleabbrev>
5+
<titleabbrev>Logs settings</titleabbrev>
66
++++
77

8-
You do not need to configure any settings to use the Logs UI. It is enabled by default.
8+
You do not need to configure any settings to use the Logs app in {kib}. It is enabled by default.
99

1010
[float]
1111
[[general-logs-ui-settings-kb]]
12-
==== General Logs UI settings
12+
==== General Logs settings
1313

1414
include::general-infra-logs-ui-settings.asciidoc[]

0 commit comments

Comments
 (0)