Skip to content

Commit 16bbeef

Browse files
Merge branch 'master' into enhancedEsSearch
2 parents 2b3864f + 2e6c76f commit 16bbeef

14 files changed

Lines changed: 736 additions & 653 deletions

File tree

.github/CODEOWNERS

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,9 @@
7474
# Observability UIs
7575
/x-pack/legacy/plugins/infra/ @elastic/logs-metrics-ui
7676
/x-pack/plugins/infra/ @elastic/logs-metrics-ui
77-
/x-pack/plugins/ingest_manager/ @elastic/ingest
78-
/x-pack/legacy/plugins/ingest_manager/ @elastic/ingest
79-
/x-pack/plugins/observability/ @elastic/logs-metrics-ui @elastic/apm-ui @elastic/uptime @elastic/ingest
77+
/x-pack/plugins/ingest_manager/ @elastic/ingest-management
78+
/x-pack/legacy/plugins/ingest_manager/ @elastic/ingest-management
79+
/x-pack/plugins/observability/ @elastic/logs-metrics-ui @elastic/apm-ui @elastic/uptime @elastic/ingest-management
8080
/x-pack/legacy/plugins/monitoring/ @elastic/stack-monitoring-ui
8181

8282
# Machine Learning

docs/settings/monitoring-settings.asciidoc

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@ which support the same values as <<settings,{kib} configuration settings>>.
2020
To control how data is collected from your {es} nodes, you configure
2121
{ref}/monitoring-settings.html[`xpack.monitoring.collection`
2222
settings] in `elasticsearch.yml`. To control how monitoring data is collected
23-
from Logstash, you configure
24-
{logstash-ref}/monitoring-internal-collection.html#monitoring-settings[`xpack.monitoring` settings]
25-
in `logstash.yml`.
23+
from Logstash, configure monitoring settings in `logstash.yml`.
2624

2725
For more information, see
2826
{ref}/monitor-elasticsearch-cluster.html[Monitor a cluster].

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@
239239
"react-resize-detector": "^4.2.0",
240240
"react-router-dom": "^5.1.2",
241241
"react-sizeme": "^2.3.6",
242-
"react-use": "^13.13.0",
242+
"react-use": "^13.27.0",
243243
"reactcss": "1.2.3",
244244
"redux": "^4.0.5",
245245
"redux-actions": "^2.6.5",

0 commit comments

Comments
 (0)