Merge branch 'master' into np-migration/watcher

Author: elasticmachine

.eslintrc.js

@@ -64,12 +64,6 @@ module.exports = {
         'jsx-a11y/no-onchange': 'off',
       },
     },
-    {
-      files: ['src/core/public/application/**/*.{js,ts,tsx}'],
-      rules: {
-        'react/no-danger': 'off',
-      },
-    },
     {
       files: ['src/legacy/core_plugins/console/**/*.{js,ts,tsx}'],
       rules: {

.i18nrc.json

@@ -6,9 +6,9 @@
     "dashboardEmbeddableContainer": "src/plugins/dashboard_embeddable_container",
     "data": ["src/legacy/core_plugins/data", "src/plugins/data"],
     "embeddableApi": "src/plugins/embeddable",
+    "share": "src/plugins/share",
     "esUi": "src/plugins/es_ui_shared",
-    "expressions_np": "src/plugins/expressions",
-    "expressions": "src/legacy/core_plugins/expressions",
+    "expressions": "src/plugins/expressions",
     "inputControl": "src/legacy/core_plugins/input_control_vis",
     "inspector": "src/plugins/inspector",
     "inspectorViews": "src/legacy/core_plugins/inspector_views",
@@ -34,7 +34,7 @@
     "visTypeTagCloud": "src/legacy/core_plugins/vis_type_tagcloud",
     "visTypeTimeseries": "src/legacy/core_plugins/vis_type_timeseries",
     "visTypeVega": "src/legacy/core_plugins/vis_type_vega",
-    "visualizations": "src/plugins/visualizations"
+    "visualizations": ["src/plugins/visualizations", "src/legacy/core_plugins/visualizations"]
   },
   "exclude": ["src/legacy/ui/ui_render/ui_render_mixin.js"],
   "translations": []

CONTRIBUTING.md

@@ -325,7 +325,7 @@ Note that for VSCode, to enable "live" linting of TypeScript (and other) file ty
   "eslint.autoFixOnSave": true,
 ```
 
-It is **not** recommended to use `prettier` plugin on Kibana project. Because settings are in `eslintrc.js` file and it is applied to too many files that shouldn't be prettier-ized. 
+:warning: It is **not** recommended to use the [`Prettier` extension/IDE plugin](https://prettier.io/) while maintaining the Kibana project. Formatting and styling roles are set in the multiple `.eslintrc.js` files across the project and some of them use the [NPM version of Prettier](https://www.npmjs.com/package/prettier). Using the IDE extension might cause conflicts, applying the formatting to too many files that shouldn't be prettier-ized and/or highlighting errors that are actually OK.
 
 ### Internationalization
 

Jenkinsfile

@@ -4,7 +4,7 @@ library 'kibana-pipeline-library'
 kibanaLibrary.load()
 
 stage("Kibana Pipeline") { // This stage is just here to help the BlueOcean UI a little bit
-  timeout(time: 180, unit: 'MINUTES') {
+  timeout(time: 120, unit: 'MINUTES') {
     timestamps {
       ansiColor('xterm') {
         catchError {

docs/apm/advanced-queries.asciidoc

@@ -10,7 +10,7 @@ so it's easy to share a specific query or view with others.
 In the screenshot below, you can begin to see some of the transaction fields available for filtering on:  
 
 [role="screenshot"]
-image::apm/images/apm-query-bar.png[Example of the Kibana Query bar in APM UI in Kibana]
+image::apm/images/apm-query-bar.png[Example of the Kibana Query bar in APM app in Kibana]
 
 [float]
 ==== Example queries

docs/apm/agent-configuration.asciidoc

@@ -2,18 +2,15 @@
 [[agent-configuration]]
 === APM Agent configuration
 
-beta[] APM Agent configuration allows you to fine-tune your agent configuration directly in Kibana.
+APM Agent configuration allows you to fine-tune your agent configuration directly in Kibana.
 Best of all, changes are automatically propagated to your APM agents so there's no need to redeploy.
 
-To get started, simply choose the service and environment you wish to configure.
+To get started, simply choose the services and environments you wish to configure.
+The APM app will let you know when your configurations have been applied by your agents.
 
 [role="screenshot"]
 image::apm/images/apm-agent-configuration.png[APM Agent configuration in Kibana]
 
-IMPORTANT: As this feature is in Beta, a limited number of configuration settings are supported.
-We recommend you watch your agent logs to confirm that configuration has been applied.
-If you have feedback, please reach out in our https://discuss.elastic.co/c/apm[Discuss forum].
-
 [float]
 ==== Precedence
 
@@ -34,6 +31,26 @@ Kibana communicates any changed settings to APM Server so that your agents only
 [float]
 ==== Supported configurations
 
+[float]
+===== `CAPTURE_BODY`
+
+added[7.5.0] Can be `"off"`, `"errors"`, `"transactions"`, or `"all"`. Defaults to `"off"`.
+
+For transactions that are HTTP requests, the Agent can optionally capture the request body, e.g., POST variables.
+Remember, request bodies often contain sensitive values like passwords, credit card numbers, etc.
+If your service handles sensitive data, enable this feature with care.
+Turning on body capturing can also significantly increase the overhead the overhead of the Agent,
+and the Elasticsearch index size.
+
+[float]
+===== `TRANSACTION_MAX_SPANS`
+
+added[7.5.0] A number between `0` and `32000`. Defaults to `500`.
+
+Limit the number of spans that are recorded per transaction.
+This is helpful in cases where a transaction creates a very high amount of spans, e.g., thousands of SQL queries.
+Setting an upper limit will help prevent the Agent and the APM Server from being overloaded.
+
 [float]
 ===== `TRANSACTION_SAMPLE_RATE`
 

docs/apm/errors.asciidoc

@@ -10,12 +10,12 @@ This makes it very easy to quickly see which errors are affecting your services,
 and to take actions to rectify them.
 
 [role="screenshot"]
-image::apm/images/apm-errors-overview.png[Example view of the errors overview in the APM UI in Kibana]
+image::apm/images/apm-errors-overview.png[Example view of the errors overview in the APM app in Kibana]
 
 Selecting an error group ID or error message brings you to the *Error group*.
 
 [role="screenshot"]
-image::apm/images/apm-error-group.png[Example view of the error group page in the APM UI in Kibana]
+image::apm/images/apm-error-group.png[Example view of the error group page in the APM app in Kibana]
 
 Here, you'll see the error message, culprit, and the number of occurrences over time.
 
@@ -43,4 +43,4 @@ With Watcher, your team can set up reports within minutes.
 Watches are managed separately in the dedicated Watcher UI available in Advanced Settings.
 
 [role="screenshot"]
-image::apm/images/apm-errors-watcher-assistant.png[Example view of the Watcher assistant for errors in APM UI in Kibana]
+image::apm/images/apm-errors-watcher-assistant.png[Example view of the Watcher assistant for errors in APM app in Kibana]

docs/apm/getting-started.asciidoc

@@ -10,7 +10,7 @@ image::apm/images/apm-setup.png[Installation instructions on the APM page in Kib
 
 
 Index patterns tell Kibana which Elasticsearch indices you want to explore.
-An APM index pattern is necessary for certain features in the APM UI, like the query bar. 
+An APM index pattern is necessary for certain features in the APM app, like the query bar. 
 To set up the correct index pattern,
 simply click *Load Kibana objects* at the bottom of the Setup Instructions.