Skip to content

Commit

Permalink
Merge branch 'master' into apm-109104-hardcoded-data-streams
Browse files Browse the repository at this point in the history
  • Loading branch information
ogupte committed Oct 12, 2021
2 parents 72c4e18 + 7c087fe commit 45814dc
Show file tree
Hide file tree
Showing 829 changed files with 17,361 additions and 6,466 deletions.
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions .i18nrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
290 changes: 145 additions & 145 deletions api_docs/apm.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion api_docs/apm.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
Loading

0 comments on commit 45814dc

Please sign in to comment.