Skip to content

Commit aded059

Browse files
paul-tavarespaul-tavares
committed
Merge remote-tracking branch 'upstream/master' into task/ingest-57952-agent-config-datasources-list-ui
2 parents 89a2529 + 2e6c76f commit aded059

23 files changed

Lines changed: 842 additions & 741 deletions

File tree

‎.github/CODEOWNERS‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,33 +29,32 @@
2929
/src/plugins/dashboard/ @elastic/kibana-app
3030

3131
# App Architecture
32+
/examples/url_generators_examples/ @elastic/kibana-app-arch
33+
/examples/url_generators_explorer/ @elastic/kibana-app-arch
3234
/packages/kbn-interpreter/ @elastic/kibana-app-arch
33-
/src/legacy/core_plugins/data/ @elastic/kibana-app-arch
34-
/src/legacy/core_plugins/elasticsearch/lib/create_proxy.js @elastic/kibana-app-arch
3535
/src/legacy/core_plugins/embeddable_api/ @elastic/kibana-app-arch
3636
/src/legacy/core_plugins/interpreter/ @elastic/kibana-app-arch
3737
/src/legacy/core_plugins/kibana_react/ @elastic/kibana-app-arch
3838
/src/legacy/core_plugins/kibana/public/management/ @elastic/kibana-app-arch
39-
/src/legacy/core_plugins/kibana/server/field_formats/ @elastic/kibana-app-arch
4039
/src/legacy/core_plugins/kibana/server/routes/api/management/ @elastic/kibana-app-arch
41-
/src/legacy/core_plugins/kibana/server/routes/api/suggestions/ @elastic/kibana-app-arch
4240
/src/legacy/core_plugins/visualizations/ @elastic/kibana-app-arch
4341
/src/legacy/server/index_patterns/ @elastic/kibana-app-arch
42+
/src/plugins/advanced_settings/ @elastic/kibana-app-arch
4443
/src/plugins/bfetch/ @elastic/kibana-app-arch
4544
/src/plugins/data/ @elastic/kibana-app-arch
4645
/src/plugins/embeddable/ @elastic/kibana-app-arch
4746
/src/plugins/expressions/ @elastic/kibana-app-arch
4847
/src/plugins/inspector/ @elastic/kibana-app-arch
4948
/src/plugins/kibana_react/ @elastic/kibana-app-arch
49+
/src/plugins/kibana_react/public/code_editor @elastic/kibana-canvas
5050
/src/plugins/kibana_utils/ @elastic/kibana-app-arch
5151
/src/plugins/management/ @elastic/kibana-app-arch
5252
/src/plugins/navigation/ @elastic/kibana-app-arch
53+
/src/plugins/share/ @elastic/kibana-app-arch
5354
/src/plugins/ui_actions/ @elastic/kibana-app-arch
5455
/src/plugins/visualizations/ @elastic/kibana-app-arch
55-
/src/plugins/share/ @elastic/kibana-app-arch
56-
/examples/url_generators_examples/ @elastic/kibana-app-arch
57-
/examples/url_generators_explorer/ @elastic/kibana-app-arch
5856
/x-pack/plugins/advanced_ui_actions/ @elastic/kibana-app-arch
57+
/x-pack/plugins/data_enhanced/ @elastic/kibana-app-arch
5958
/x-pack/plugins/drilldowns/ @elastic/kibana-app-arch
6059

6160
# APM
@@ -75,9 +74,9 @@
7574
# Observability UIs
7675
/x-pack/legacy/plugins/infra/ @elastic/logs-metrics-ui
7776
/x-pack/plugins/infra/ @elastic/logs-metrics-ui
78-
/x-pack/plugins/ingest_manager/ @elastic/ingest
79-
/x-pack/legacy/plugins/ingest_manager/ @elastic/ingest
80-
/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
8180
/x-pack/legacy/plugins/monitoring/ @elastic/stack-monitoring-ui
8281

8382
# 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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
"@elastic/apm-rum": "^4.6.0",
120120
"@elastic/charts": "^17.1.1",
121121
"@elastic/datemath": "5.0.2",
122-
"@elastic/ems-client": "7.6.0",
122+
"@elastic/ems-client": "7.7.0",
123123
"@elastic/eui": "20.0.2",
124124
"@elastic/filesaver": "1.1.2",
125125
"@elastic/good": "8.1.1-kibana2",
@@ -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)