Merge branch 'master' into apm-109104-hardcoded-data-streams

elastic · Oct 12, 2021 · 45814dc · 45814dc
2 parents 72c4e18 + 7c087fe
commit 45814dc
Show file tree

Hide file tree

Showing 829 changed files with 17,361 additions and 6,466 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -39,6 +39,7 @@
 /src/plugins/visualize/ @elastic/kibana-vis-editors
 /src/plugins/visualizations/ @elastic/kibana-vis-editors
 /src/plugins/chart_expressions/expression_tagcloud/ @elastic/kibana-vis-editors
+/src/plugins/chart_expressions/expression_metric/ @elastic/kibana-vis-editors
 /src/plugins/url_forwarding/ @elastic/kibana-vis-editors
 /packages/kbn-tinymath/ @elastic/kibana-vis-editors
 /x-pack/test/functional/apps/lens @elastic/kibana-vis-editors

diff --git a/.i18nrc.json b/.i18nrc.json
@@ -30,6 +30,7 @@
     "expressionRevealImage": "src/plugins/expression_reveal_image",
     "expressionShape": "src/plugins/expression_shape",
     "expressionTagcloud": "src/plugins/chart_expressions/expression_tagcloud",
+    "expressionMetricVis": "src/plugins/chart_expressions/expression_metric",
     "inputControl": "src/plugins/input_control_vis",
     "inspector": "src/plugins/inspector",
     "inspectorViews": "src/legacy/core_plugins/inspector_views",

diff --git a/api_docs/apm.json b/api_docs/apm.json
diff --git a/api_docs/apm.mdx b/api_docs/apm.mdx
@@ -10,7 +10,7 @@ warning: This document is auto-generated and is meant to be viewed inside our ex
 ---
 import apmObj from './apm.json';
 
-
+The user interface for Elastic APM
 
 Contact [APM UI](https://github.com/orgs/elastic/teams/apm-ui) for questions regarding this plugin.
-Original file line number
+Diff line change
@@ Expand Up @@
     ---
     import apmObj from './apm.json';
+    The user interface for Elastic APM
     Contact [APM UI](https://github.com/orgs/elastic/teams/apm-ui) for questions regarding this plugin.
@@ Expand Down @@