Merge remote-tracking branch 'upstream/master' into shim-oss-telemetry

.ci/Jenkinsfile_flaky

@@ -3,10 +3,13 @@
 library 'kibana-pipeline-library'
 kibanaLibrary.load()
 
-// Looks like 'oss:ciGroup:1' or 'oss:firefoxSmoke'
-def JOB_PARTS = params.CI_GROUP.split(':')
+def CI_GROUP_PARAM = params.CI_GROUP
+
+// Looks like 'oss:ciGroup:1', 'oss:firefoxSmoke', or 'all:serverMocha'
+def JOB_PARTS = CI_GROUP_PARAM.split(':')
 def IS_XPACK = JOB_PARTS[0] == 'xpack'
 def JOB = JOB_PARTS[1]
+def NEED_BUILD = JOB != 'serverMocha'
 def CI_GROUP = JOB_PARTS.size() > 2 ? JOB_PARTS[2] : ''
 def EXECUTIONS = params.NUMBER_EXECUTIONS.toInteger()
 def AGENT_COUNT = getAgentCount(EXECUTIONS)
@@ -31,13 +34,15 @@ stage("Kibana Pipeline") {
               print "Agent ${agentNumberInside} - ${agentExecutions} executions"
 
               kibanaPipeline.withWorkers('flaky-test-runner', {
-                if (!IS_XPACK) {
-                  kibanaPipeline.buildOss()
-                  if (CI_GROUP == '1') {
-                    runbld("./test/scripts/jenkins_build_kbn_tp_sample_panel_action.sh", "Build kbn tp sample panel action for ciGroup1")
+                if (NEED_BUILD) {
+                  if (!IS_XPACK) {
+                    kibanaPipeline.buildOss()
+                    if (CI_GROUP == '1') {
+                      runbld("./test/scripts/jenkins_build_kbn_tp_sample_panel_action.sh", "Build kbn tp sample panel action for ciGroup1")
+                    }
+                  } else {
+                    kibanaPipeline.buildXpack()
                   }
-                } else {
-                  kibanaPipeline.buildXpack()
                 }
               }, getWorkerMap(agentNumberInside, agentExecutions, worker, workerFailures))()
             }
@@ -61,7 +66,17 @@ stage("Kibana Pipeline") {
 
 def getWorkerFromParams(isXpack, job, ciGroup) {
   if (!isXpack) {
-    if (job == 'firefoxSmoke') {
+    if (job == 'serverMocha') {
+      return kibanaPipeline.getPostBuildWorker('serverMocha', {
+        kibanaPipeline.bash(
+          """
+            source src/dev/ci_setup/setup_env.sh
+            node scripts/mocha
+          """,
+          "run `node scripts/mocha`"
+        )
+      })
+    } else if (job == 'firefoxSmoke') {
       return kibanaPipeline.getPostBuildWorker('firefoxSmoke', { runbld('./test/scripts/jenkins_firefox_smoke.sh', 'Execute kibana-firefoxSmoke') })
     } else if(job == 'visualRegression') {
       return kibanaPipeline.getPostBuildWorker('visualRegression', { runbld('./test/scripts/jenkins_visual_regression.sh', 'Execute kibana-visualRegression') })

.eslintignore

@@ -8,6 +8,7 @@ bower_components
 /plugins
 /built_assets
 /html_docs
+/src/plugins/data/common/es_query/kuery/ast/_generated_/**
 /src/fixtures/vislib/mock_data
 /src/legacy/ui/public/angular-bootstrap
 /src/legacy/ui/public/flot-charts
@@ -19,7 +20,6 @@ bower_components
 /src/core/lib/kbn_internal_native_observable
 /packages/*/target
 /packages/eslint-config-kibana
-/packages/kbn-es-query/src/kuery/ast/kuery.js
 /packages/kbn-pm/dist
 /packages/kbn-plugin-generator/sao_template/template
 /packages/kbn-ui-framework/dist

.eslintrc.js

@@ -64,18 +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: {
-        'react-hooks/exhaustive-deps': 'off',
-      },
-    },
     {
       files: ['src/legacy/core_plugins/data/**/*.{js,ts,tsx}'],
       rules: {
@@ -349,6 +337,7 @@ module.exports = {
                   '!src/core/server/index.ts',
                   '!src/core/server/mocks.ts',
                   '!src/core/server/types.ts',
+                  '!src/core/server/test_utils.ts',
                   // for absolute imports until fixed in
                   // https://github.com/elastic/kibana/issues/36096
                   '!src/core/server/types',
@@ -362,6 +351,21 @@ module.exports = {
                 ],
                 allowSameFolder: true,
               },
+              {
+                target: ['src/core/**/*'],
+                from: ['x-pack/**/*'],
+                errorMessage: 'OSS cannot import x-pack files.',
+              },
+              {
+                target: ['src/core/**/*'],
+                from: [
+                  'plugins/**/*',
+                  'src/plugins/**/*',
+                  'src/legacy/core_plugins/**/*',
+                  'src/legacy/ui/**/*',
+                ],
+                errorMessage: 'The core cannot depend on any plugins.',
+              },
               {
                 from: ['src/legacy/ui/**/*', 'ui/**/*'],
                 target: [

.github/CODEOWNERS

@@ -13,9 +13,21 @@
 /src/plugins/kibana_react/ @elastic/kibana-app-arch
 /src/plugins/kibana_utils/ @elastic/kibana-app-arch
 /src/plugins/navigation/ @elastic/kibana-app-arch
+/src/plugins/share/ @elastic/kibana-app-arch
 /src/plugins/ui_actions/ @elastic/kibana-app-arch
 /src/plugins/visualizations/ @elastic/kibana-app-arch
 /x-pack/plugins/advanced_ui_actions/ @elastic/kibana-app-arch
+/src/legacy/core_plugins/data/ @elastic/kibana-app-arch
+/src/legacy/core_plugins/embeddable_api/ @elastic/kibana-app-arch
+/src/legacy/core_plugins/interpreter/ @elastic/kibana-app-arch
+/src/legacy/core_plugins/kibana_react/ @elastic/kibana-app-arch
+/src/legacy/core_plugins/kibana/public/management/ @elastic/kibana-app-arch
+/src/legacy/core_plugins/kibana/server/field_formats/ @elastic/kibana-app-arch
+/src/legacy/core_plugins/kibana/server/routes/api/management/ @elastic/kibana-app-arch
+/src/legacy/core_plugins/kibana/server/routes/api/suggestions/ @elastic/kibana-app-arch
+/src/legacy/core_plugins/visualizations/ @elastic/kibana-app-arch
+/src/legacy/server/index_patterns/ @elastic/kibana-app-arch
+/src/legacy/server/url_shortening/ @elastic/kibana-app-arch
 
 # APM
 /x-pack/legacy/plugins/apm/  @elastic/apm-ui
@@ -40,9 +52,11 @@
 # ML team owns the transform plugin, ES team added here for visibility
 # because the plugin lives in Kibana's Elasticsearch management section.
 /x-pack/legacy/plugins/transform/  @elastic/ml-ui @elastic/es-ui
+/x-pack/test/functional/apps/transform/ @elastic/ml-ui
+/x-pack/test/functional/services/transform_ui/ @elastic/ml-ui
+/x-pack/test/functional/services/transform.ts @elastic/ml-ui
 
 # Operations
-/renovate.json5 @elastic/kibana-operations
 /src/dev/ @elastic/kibana-operations
 /src/setup_node_env/ @elastic/kibana-operations
 /src/optimize/ @elastic/kibana-operations
@@ -59,6 +73,7 @@
 /config/kibana.yml @elastic/kibana-platform
 /x-pack/plugins/features/  @elastic/kibana-platform
 /x-pack/plugins/licensing/  @elastic/kibana-platform
+/packages/kbn-config-schema/ @elastic/kibana-platform
 
 # Security
 /x-pack/legacy/plugins/security/  @elastic/kibana-security
@@ -71,8 +86,10 @@
 /x-pack/test/api_integration/apis/security/ @elastic/kibana-security
 
 # Kibana Stack Services
+/src/dev/i18n @elastic/kibana-stack-services
 /packages/kbn-analytics/ @elastic/kibana-stack-services
 /src/legacy/core_plugins/ui_metric/ @elastic/kibana-stack-services
+/src/plugins/usage_collection/ @elastic/kibana-stack-services
 /x-pack/legacy/plugins/telemetry @elastic/kibana-stack-services
 /x-pack/legacy/plugins/alerting @elastic/kibana-stack-services
 /x-pack/legacy/plugins/actions @elastic/kibana-stack-services

.i18nrc.json

@@ -8,14 +8,14 @@
     "embeddableApi": "src/plugins/embeddable",
     "share": "src/plugins/share",
     "esUi": "src/plugins/es_ui_shared",
+    "devTools": "src/plugins/dev_tools",
     "expressions": "src/plugins/expressions",
     "inputControl": "src/legacy/core_plugins/input_control_vis",
     "inspector": "src/plugins/inspector",
     "inspectorViews": "src/legacy/core_plugins/inspector_views",
     "interpreter": "src/legacy/core_plugins/interpreter",
     "kbn": "src/legacy/core_plugins/kibana",
     "kbnDocViews": "src/legacy/core_plugins/kbn_doc_views",
-    "kbnESQuery": "packages/kbn-es-query",
     "kbnVislibVisTypes": "src/legacy/core_plugins/kbn_vislib_vis_types",
     "kibana_react": "src/legacy/core_plugins/kibana_react",
     "kibana-react": "src/plugins/kibana_react",

CONTRIBUTING.md

@@ -399,13 +399,19 @@ Test runner arguments:
  - `[test path]` is the relative path to the test file.
 
  Examples:
-  - Run the entire elasticsearch_service test suite with yarn:
-    `node scripts/jest src/core/server/elasticsearch/elasticsearch_service.test.ts`
-  - Run the jest test case whose description matches 'stops both admin and data clients':
-    `node scripts/jest -t 'stops both admin and data clients' src/core/server/elasticsearch/elasticsearch_service.test.ts`
+  - Run the entire elasticsearch_service test suite:
+    ```
+    node scripts/jest src/core/server/elasticsearch/elasticsearch_service.test.ts
+    ```
+  - Run the jest test case whose description matches `stops both admin and data clients`:
+    ```
+    node scripts/jest -t 'stops both admin and data clients' src/core/server/elasticsearch/elasticsearch_service.test.ts
+    ```
   - Run the api integration test case whose description matches the given string:
-    `node scripts/functional_tests_server --config test/api_integration/config.js`
-    `node scripts/functional_test_runner --config test/api_integration/config.js --grep='should return 404 if id does not match any sample data sets'`
+    ```
+    node scripts/functional_tests_server --config test/api_integration/config.js
+    node scripts/functional_test_runner --config test/api_integration/config.js --grep='should return 404 if id does not match any sample data sets'
+    ```
 
 ### Debugging Unit Tests
 

Jenkinsfile

@@ -4,14 +4,15 @@ 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 {
           parallel([
             'kibana-intake-agent': kibanaPipeline.legacyJobRunner('kibana-intake'),
             'x-pack-intake-agent': kibanaPipeline.legacyJobRunner('x-pack-intake'),
             'kibana-oss-agent': kibanaPipeline.withWorkers('kibana-oss-tests', { kibanaPipeline.buildOss() }, [
+              'oss-firefoxSmoke': kibanaPipeline.getPostBuildWorker('firefoxSmoke', { runbld('./test/scripts/jenkins_firefox_smoke.sh', 'Execute kibana-firefoxSmoke') }),
               'oss-ciGroup1': kibanaPipeline.getOssCiGroupWorker(1),
               'oss-ciGroup2': kibanaPipeline.getOssCiGroupWorker(2),
               'oss-ciGroup3': kibanaPipeline.getOssCiGroupWorker(3),
@@ -24,11 +25,11 @@ stage("Kibana Pipeline") { // This stage is just here to help the BlueOcean UI a
               'oss-ciGroup10': kibanaPipeline.getOssCiGroupWorker(10),
               'oss-ciGroup11': kibanaPipeline.getOssCiGroupWorker(11),
               'oss-ciGroup12': kibanaPipeline.getOssCiGroupWorker(12),
-              'oss-firefoxSmoke': kibanaPipeline.getPostBuildWorker('firefoxSmoke', { runbld('./test/scripts/jenkins_firefox_smoke.sh', 'Execute kibana-firefoxSmoke') }),
               'oss-accessibility': kibanaPipeline.getPostBuildWorker('accessibility', { runbld('./test/scripts/jenkins_accessibility.sh', 'Execute kibana-accessibility') }),
-              'oss-visualRegression': kibanaPipeline.getPostBuildWorker('visualRegression', { runbld('./test/scripts/jenkins_visual_regression.sh', 'Execute kibana-visualRegression') }),
+              // 'oss-visualRegression': kibanaPipeline.getPostBuildWorker('visualRegression', { runbld('./test/scripts/jenkins_visual_regression.sh', 'Execute kibana-visualRegression') }),
             ]),
             'kibana-xpack-agent': kibanaPipeline.withWorkers('kibana-xpack-tests', { kibanaPipeline.buildXpack() }, [
+              'xpack-firefoxSmoke': kibanaPipeline.getPostBuildWorker('xpack-firefoxSmoke', { runbld('./test/scripts/jenkins_xpack_firefox_smoke.sh', 'Execute xpack-firefoxSmoke') }),
               'xpack-ciGroup1': kibanaPipeline.getXpackCiGroupWorker(1),
               'xpack-ciGroup2': kibanaPipeline.getXpackCiGroupWorker(2),
               'xpack-ciGroup3': kibanaPipeline.getXpackCiGroupWorker(3),
@@ -39,9 +40,8 @@ stage("Kibana Pipeline") { // This stage is just here to help the BlueOcean UI a
               'xpack-ciGroup8': kibanaPipeline.getXpackCiGroupWorker(8),
               'xpack-ciGroup9': kibanaPipeline.getXpackCiGroupWorker(9),
               'xpack-ciGroup10': kibanaPipeline.getXpackCiGroupWorker(10),
-              'xpack-firefoxSmoke': kibanaPipeline.getPostBuildWorker('xpack-firefoxSmoke', { runbld('./test/scripts/jenkins_xpack_firefox_smoke.sh', 'Execute xpack-firefoxSmoke') }),
               'xpack-accessibility': kibanaPipeline.getPostBuildWorker('xpack-accessibility', { runbld('./test/scripts/jenkins_xpack_accessibility.sh', 'Execute xpack-accessibility') }),
-              'xpack-visualRegression': kibanaPipeline.getPostBuildWorker('xpack-visualRegression', { runbld('./test/scripts/jenkins_xpack_visual_regression.sh', 'Execute xpack-visualRegression') }),
+              // 'xpack-visualRegression': kibanaPipeline.getPostBuildWorker('xpack-visualRegression', { runbld('./test/scripts/jenkins_xpack_visual_regression.sh', 'Execute xpack-visualRegression') }),
             ]),
           ])
         }

TYPESCRIPT.md

@@ -21,7 +21,7 @@ The first thing that will probably happen when you convert a `.js` file in our s
 
 declare module '@elastic/eui' {
   // Add your types here
-  export const EuiPopoverTitle: React.SFC<EuiPopoverTitleProps>;
+  export const EuiPopoverTitle: React.FC<EuiPopoverTitleProps>;
   ...
 }
 ```
@@ -47,13 +47,13 @@ Since `@elastic/eui` already ships with a module declaration, any local addition
 // file `typings/@elastic/eui/index.d.ts`
 
 import { CommonProps } from '@elastic/eui';
-import { SFC } from 'react';
+import { FC } from 'react';
 
 declare module '@elastic/eui' {
   export type EuiNewComponentProps = CommonProps & {
     additionalProp: string;
   };
-  export const EuiNewComponent: SFC<EuiNewComponentProps>;
+  export const EuiNewComponent: FC<EuiNewComponentProps>;
 }
 ```
 

config/kibana.yml

@@ -51,7 +51,7 @@
 
 # Optional settings that provide the paths to the PEM-format SSL certificate and key files.
 # These files are used to verify the identity of Kibana to Elasticsearch and are required when
-# xpack.ssl.verification_mode in Elasticsearch is set to either certificate or full.
+# xpack.security.http.ssl.client_authentication in Elasticsearch is set to required.
 #elasticsearch.ssl.certificate: /path/to/your/client.crt
 #elasticsearch.ssl.key: /path/to/your/client.key
 

docs/api/role-management/put.asciidoc

@@ -26,7 +26,9 @@ To use the create or update role API, you must have the `manage_security` cluste
   (Optional, object) In the `metadata` object, keys that begin with `_` are reserved for system usage.
 
 `elasticsearch`:: 
-  (Optional, object) {es} cluster and index privileges. Valid keys include `cluster`, `indices`, and `run_as`. For more information, see {xpack-ref}/defining-roles.html[Defining Roles].
+  (Optional, object) {es} cluster and index privileges. Valid keys include 
+  `cluster`, `indices`, and `run_as`. For more information, see
+  {ref}/defining-roles.html[Defining roles].
 
 `kibana`:: 
   (list) Objects that specify the <<kibana-privileges, Kibana privileges>> for the role:

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.