Merge branch 'master' of github.com:elastic/kibana into feature/compo…

…nent_templates_list_view

.ci/Jenkinsfile_coverage

@@ -11,8 +11,11 @@ kibanaPipeline(timeoutMinutes: 240) {
       'CODE_COVERAGE=1', // Enables coverage.  Needed for multiple ci scripts, such as remote.ts, test/scripts/*.sh, schema.js, etc.
     ]) {
       workers.base(name: 'coverage-worker', size: 'l', ramDisk: false, bootstrapped: false) {
-        kibanaCoverage.runTests()
-        handleIngestion(TIME_STAMP)
+        catchError {
+          kibanaCoverage.runTests()
+          handleIngestion(TIME_STAMP)
+        }
+        handleFail()
       }
     }
     kibanaPipeline.sendMail()
@@ -29,4 +32,13 @@ def handleIngestion(timestamp) {
   kibanaCoverage.uploadCoverageStaticSite(timestamp)
 }
 
+def handleFail() {
+  def buildStatus = buildUtils.getBuildStatus()
+  if(params.NOTIFY_ON_FAILURE && buildStatus != 'SUCCESS' && buildStatus != 'ABORTED') {
+    slackNotifications.sendFailedBuild(
+      channel: '#kibana-qa',
+      username: 'Kibana QA'
+    )
+  }
+}
 

.eslintrc.js

@@ -225,7 +225,7 @@ module.exports = {
                   '!src/core/server/index.ts', // relative import
                   '!src/core/server/mocks{,.ts}',
                   '!src/core/server/types{,.ts}',
-                  '!src/core/server/test_utils',
+                  '!src/core/server/test_utils{,.ts}',
                   // for absolute imports until fixed in
                   // https://github.com/elastic/kibana/issues/36096
                   '!src/core/server/*.test.mocks{,.ts}',
@@ -587,11 +587,11 @@ module.exports = {
     },
 
     /**
-     * SIEM overrides
+     * Security Solution overrides
      */
     {
       // front end typescript and javascript files only
-      files: ['x-pack/plugins/siem/public/**/*.{js,ts,tsx}'],
+      files: ['x-pack/plugins/security_solution/public/**/*.{js,ts,tsx}'],
       rules: {
         'import/no-nodejs-modules': 'error',
         'no-restricted-imports': [
@@ -605,7 +605,7 @@ module.exports = {
     },
     {
       // typescript only for front and back end
-      files: ['x-pack/{,legacy/}plugins/siem/**/*.{ts,tsx}'],
+      files: ['x-pack/{,legacy/}plugins/security_solution/**/*.{ts,tsx}'],
       rules: {
         // This will be turned on after bug fixes are complete
         // '@typescript-eslint/explicit-member-accessibility': 'warn',
@@ -640,7 +640,7 @@ module.exports = {
     // {
     //   // will introduced after the other warns are fixed
     //   // typescript and javascript for front end react performance
-    //   files: ['x-pack/plugins/siem/public/**/!(*.test).{js,ts,tsx}'],
+    //   files: ['x-pack/plugins/security_solution/public/**/!(*.test).{js,ts,tsx}'],
     //   plugins: ['react-perf'],
     //   rules: {
     //     // 'react-perf/jsx-no-new-object-as-prop': 'error',
@@ -651,7 +651,7 @@ module.exports = {
     // },
     {
       // typescript and javascript for front and back end
-      files: ['x-pack/{,legacy/}plugins/siem/**/*.{js,ts,tsx}'],
+      files: ['x-pack/{,legacy/}plugins/security_solution/**/*.{js,ts,tsx}'],
       plugins: ['eslint-plugin-node', 'react'],
       env: {
         mocha: true,

.github/CODEOWNERS

@@ -139,6 +139,7 @@
 /config/kibana.yml @elastic/kibana-platform
 /x-pack/plugins/features/  @elastic/kibana-platform
 /x-pack/plugins/licensing/  @elastic/kibana-platform
+/x-pack/plugins/global_search/  @elastic/kibana-platform
 /x-pack/plugins/cloud/ @elastic/kibana-platform
 /packages/kbn-config-schema/ @elastic/kibana-platform
 /src/legacy/server/config/ @elastic/kibana-platform
@@ -225,12 +226,12 @@
 /x-pack/test/plugin_functional/plugins/resolver_test/ @elastic/endpoint-app-team @elastic/siem
 /x-pack/test/plugin_functional/test_suites/resolver/ @elastic/endpoint-app-team @elastic/siem
 
-# SIEM
-/x-pack/plugins/siem/ @elastic/siem @elastic/endpoint-app-team
+# Security Solution
+/x-pack/plugins/security_solution/ @elastic/siem @elastic/endpoint-app-team
 /x-pack/test/detection_engine_api_integration @elastic/siem @elastic/endpoint-app-team
-/x-pack/test/api_integration/apis/siem @elastic/siem @elastic/endpoint-app-team
+/x-pack/test/api_integration/apis/security_solution @elastic/siem @elastic/endpoint-app-team
 /x-pack/plugins/case @elastic/siem @elastic/endpoint-app-team
 /x-pack/plugins/lists @elastic/siem @elastic/endpoint-app-team
 
 # Security Intelligence And Analytics
-/x-pack/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules @elastic/security-intelligence-analytics
+/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules @elastic/security-intelligence-analytics

.node-version

@@ -1 +1 @@
-10.19.0
+10.21.0

.nvmrc

@@ -1 +1 @@
-10.19.0
+10.21.0

.sass-lint.yml

@@ -4,14 +4,14 @@ files:
     - 'src/legacy/core_plugins/timelion/**/*.s+(a|c)ss'
     - 'src/plugins/vis_type_vislib/**/*.s+(a|c)ss'
     - 'src/plugins/vis_type_xy/**/*.s+(a|c)ss'
-    - 'x-pack/legacy/plugins/security/**/*.s+(a|c)ss'
     - 'x-pack/plugins/canvas/**/*.s+(a|c)ss'
     - 'x-pack/plugins/triggers_actions_ui/**/*.s+(a|c)ss'
     - 'x-pack/plugins/lens/**/*.s+(a|c)ss'
     - 'x-pack/plugins/cross_cluster_replication/**/*.s+(a|c)ss'
     - 'x-pack/legacy/plugins/maps/**/*.s+(a|c)ss'
     - 'x-pack/plugins/maps/**/*.s+(a|c)ss'
     - 'x-pack/plugins/spaces/**/*.s+(a|c)ss'
+    - 'x-pack/plugins/security/**/*.s+(a|c)ss'
   ignore:
     - 'x-pack/plugins/canvas/shareable_runtime/**/*.s+(a|c)ss'
 rules:

Jenkinsfile

@@ -41,9 +41,10 @@ kibanaPipeline(timeoutMinutes: 155, checkPrChanges: true) {
             'xpack-ciGroup9': kibanaPipeline.xpackCiGroupProcess(9),
             'xpack-ciGroup10': kibanaPipeline.xpackCiGroupProcess(10),
             'xpack-accessibility': kibanaPipeline.functionalTestProcess('xpack-accessibility', './test/scripts/jenkins_xpack_accessibility.sh'),
-            'xpack-siemCypress': { processNumber ->
-              whenChanged(['x-pack/plugins/siem/', 'x-pack/test/siem_cypress/']) {
-                kibanaPipeline.functionalTestProcess('xpack-siemCypress', './test/scripts/jenkins_siem_cypress.sh')(processNumber)
+            'xpack-pageLoadMetrics': kibanaPipeline.functionalTestProcess('xpack-pageLoadMetrics', './test/scripts/jenkins_xpack_page_load_metrics.sh'),
+            'xpack-securitySolutionCypress': { processNumber ->
+              whenChanged(['x-pack/plugins/security_solution/', 'x-pack/test/security_solution_cypress/']) {
+                kibanaPipeline.functionalTestProcess('xpack-securitySolutionCypress', './test/scripts/jenkins_security_solution_cypress.sh')(processNumber)
               }
             },
 

docs/apm/advanced-queries.asciidoc

@@ -11,7 +11,7 @@ or, to only show transactions that are slower than a specified time threshold.
 ==== Example APM app queries
 
 * Exclude response times slower than 2000 ms: `transaction.duration.us > 2000000`
-* Filter by response status code: `context.response.status_code >= 400`
+* Filter by response status code: `context.response.status_code ≥ 400`
 * Filter by single user ID: `context.user.id : 12`
 
 When querying in the APM app, you're merely searching and selecting data from fields in Elasticsearch documents.

docs/apm/deployment-annotations.asciidoc

@@ -7,13 +7,40 @@
 ++++
 
 For enhanced visibility into your deployments, we offer deployment annotations on all transaction charts.
-This feature automatically tags new deployments, so you can easily see if your deploy has increased response times
-for an end-user, or if the memory/CPU footprint of your application has changed.
-Being able to identify bad deployments quickly enables you to rollback and fix issues without causing costly outages.
+This feature enables you to easily determine if your deployment has increased response times for an end-user,
+or if the memory/CPU footprint of your application has changed.
+Being able to quickly identify bad deployments enables you to rollback and fix issues without causing costly outages.
+
+By default, automatic deployment annotations are enabled.
+This means the APM app will create an annotation on your data when the `service.version` of your application changes.
+
+Alternatively, you can explicitly create deployment annotations with our annotation API.
+The API can integrate into your CI/CD pipeline,
+so that each time you deploy, a POST request is sent to the annotation API endpoint:
+
+[source,console]
+----
+curl -X POST \
+  http://localhost:5601/api/apm/services/${SERVICE_NAME}/annotation \ <1>
+-H 'Content-Type: application/json' \
+-H 'kbn-xsrf: true' \
+-H 'Authorization: Basic ${API_KEY}' \ <2>
+-d '{
+      "@timestamp": "${DEPLOY_TIME}", <3>
+      "service": {
+        "version": "${SERVICE_VERSION}" <4>
+      },
+      "message": "${MESSAGE}" <5>
+    }'
+----
+<1> The `service.name` of your application
+<2> An APM app API key with sufficient privileges
+<3> The time of the deployment
+<4> The `service.version` to be displayed in the annotation
+<5> A custom message to be displayed in the annotation
+
+See the <<apm-annotation-api,annotation API>> reference for more information.
 
-Deployment annotations are enabled by default, and can be created with the <<apm-annotation-api,annotation API>>.
-If there are no created annotations for the selected time period,
-the APM app will automatically annotate your data if the `service.version` of your application changes.
 
 NOTE: If custom annotations have been created for the selected time period, any derived annotations, i.e., those created automatically when `service.version` changes, will not be shown.
 

docs/apm/service-maps.asciidoc

@@ -62,9 +62,9 @@ Machine learning jobs can be created to calculate anomaly scores on APM transact
 When these jobs are active, service maps will display a color-coded anomaly indicator based on the detected anomaly score:
 
 [horizontal]
-image:apm/images/green-service.png[APM green service]:: Max anomaly score **<=25**. Service is healthy.
+image:apm/images/green-service.png[APM green service]:: Max anomaly score **≤25**. Service is healthy.
 image:apm/images/yellow-service.png[APM yellow service]:: Max anomaly score **26-74**. Anomalous activity detected. Service may be degraded.
-image:apm/images/red-service.png[APM red service]:: Max anomaly score **>=75**. Anomalous activity detected. Service is unhealthy.
+image:apm/images/red-service.png[APM red service]:: Max anomaly score **≥75**. Anomalous activity detected. Service is unhealthy.
 
 [role="screenshot"]
 image::apm/images/apm-service-map-anomaly.png[Example view of anomaly scores on service maps in the APM app]
@@ -92,10 +92,10 @@ Type and subtype are based on `span.type`, and `span.subtype`.
 Service maps are supported for the following Agent versions:
 
 [horizontal]
-Go Agent:: >= v1.7.0
-Java Agent:: >= v1.13.0
-.NET Agent:: >= v1.3.0
-Node.js Agent:: >= v3.6.0
-Python Agent:: >= v5.5.0
-Ruby Agent:: >= v3.6.0
-Real User Monitoring (RUM) Agent:: >= v4.7.0
+Go Agent:: ≥ v1.7.0
+Java Agent:: ≥ v1.13.0
+.NET Agent:: ≥ v1.3.0
+Node.js Agent:: ≥ v3.6.0
+Python Agent:: ≥ v5.5.0
+Ruby Agent:: ≥ v3.6.0
+Real User Monitoring (RUM) Agent:: ≥ v4.7.0

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md

@@ -114,6 +114,7 @@
 |  [SearchBar](./kibana-plugin-plugins-data-public.searchbar.md) |  |
 |  [SYNC\_SEARCH\_STRATEGY](./kibana-plugin-plugins-data-public.sync_search_strategy.md) |  |
 |  [syncQueryStateWithUrl](./kibana-plugin-plugins-data-public.syncquerystatewithurl.md) | Helper to setup syncing of global data with the URL |
+|  [UI\_SETTINGS](./kibana-plugin-plugins-data-public.ui_settings.md) |  |
 
 ## Type Aliases
 

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.plugin._constructor_.md

@@ -9,12 +9,12 @@ Constructs a new instance of the `DataPublicPlugin` class
 <b>Signature:</b>
 
 ```typescript
-constructor(initializerContext: PluginInitializerContext);
+constructor(initializerContext: PluginInitializerContext<ConfigSchema>);
 ```
 
 ## Parameters
 
 |  Parameter | Type | Description |
 |  --- | --- | --- |
-|  initializerContext | <code>PluginInitializerContext</code> |  |
+|  initializerContext | <code>PluginInitializerContext&lt;ConfigSchema&gt;</code> |  |
 

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.plugin.md

@@ -7,14 +7,14 @@
 <b>Signature:</b>
 
 ```typescript
-export declare function plugin(initializerContext: PluginInitializerContext): DataPublicPlugin;
+export declare function plugin(initializerContext: PluginInitializerContext<ConfigSchema>): DataPublicPlugin;
 ```
 
 ## Parameters
 
 |  Parameter | Type | Description |
 |  --- | --- | --- |
-|  initializerContext | <code>PluginInitializerContext</code> |  |
+|  initializerContext | <code>PluginInitializerContext&lt;ConfigSchema&gt;</code> |  |
 
 <b>Returns:</b>
 

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.ui_settings.md

@@ -0,0 +1,39 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [UI\_SETTINGS](./kibana-plugin-plugins-data-public.ui_settings.md)
+
+## UI\_SETTINGS variable
+
+<b>Signature:</b>
+
+```typescript
+UI_SETTINGS: {
+    META_FIELDS: string;
+    DOC_HIGHLIGHT: string;
+    QUERY_STRING_OPTIONS: string;
+    QUERY_ALLOW_LEADING_WILDCARDS: string;
+    SEARCH_QUERY_LANGUAGE: string;
+    SORT_OPTIONS: string;
+    COURIER_IGNORE_FILTER_IF_FIELD_NOT_IN_INDEX: string;
+    COURIER_SET_REQUEST_PREFERENCE: string;
+    COURIER_CUSTOM_REQUEST_PREFERENCE: string;
+    COURIER_MAX_CONCURRENT_SHARD_REQUESTS: string;
+    COURIER_BATCH_SEARCHES: string;
+    SEARCH_INCLUDE_FROZEN: string;
+    HISTOGRAM_BAR_TARGET: string;
+    HISTOGRAM_MAX_BARS: string;
+    HISTORY_LIMIT: string;
+    SHORT_DOTS_ENABLE: string;
+    FORMAT_DEFAULT_TYPE_MAP: string;
+    FORMAT_NUMBER_DEFAULT_PATTERN: string;
+    FORMAT_PERCENT_DEFAULT_PATTERN: string;
+    FORMAT_BYTES_DEFAULT_PATTERN: string;
+    FORMAT_CURRENCY_DEFAULT_PATTERN: string;
+    FORMAT_NUMBER_DEFAULT_LOCALE: string;
+    TIMEPICKER_REFRESH_INTERVAL_DEFAULTS: string;
+    TIMEPICKER_QUICK_RANGES: string;
+    INDEXPATTERN_PLACEHOLDER: string;
+    FILTERS_PINNED_BY_DEFAULT: string;
+    FILTERS_EDITOR_SUGGEST_VALUES: string;
+}
+```

docs/development/plugins/data/server/kibana-plugin-plugins-data-server.config.md

@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-server](./kibana-plugin-plugins-data-server.md) &gt; [config](./kibana-plugin-plugins-data-server.config.md)
+
+## config variable
+
+<b>Signature:</b>
+
+```typescript
+config: PluginConfigDescriptor<ConfigSchema>
+```

docs/development/plugins/data/server/kibana-plugin-plugins-data-server.md

@@ -55,12 +55,14 @@
 |  Variable | Description |
 |  --- | --- |
 |  [castEsToKbnFieldTypeName](./kibana-plugin-plugins-data-server.castestokbnfieldtypename.md) | Get the KbnFieldType name for an esType string |
+|  [config](./kibana-plugin-plugins-data-server.config.md) |  |
 |  [esFilters](./kibana-plugin-plugins-data-server.esfilters.md) |  |
 |  [esKuery](./kibana-plugin-plugins-data-server.eskuery.md) |  |
 |  [esQuery](./kibana-plugin-plugins-data-server.esquery.md) |  |
 |  [fieldFormats](./kibana-plugin-plugins-data-server.fieldformats.md) |  |
 |  [indexPatterns](./kibana-plugin-plugins-data-server.indexpatterns.md) |  |
 |  [search](./kibana-plugin-plugins-data-server.search.md) |  |
+|  [UI\_SETTINGS](./kibana-plugin-plugins-data-server.ui_settings.md) |  |
 
 ## Type Aliases
 

docs/development/plugins/data/server/kibana-plugin-plugins-data-server.plugin._constructor_.md

@@ -9,12 +9,12 @@ Constructs a new instance of the `DataServerPlugin` class
 <b>Signature:</b>
 
 ```typescript
-constructor(initializerContext: PluginInitializerContext);
+constructor(initializerContext: PluginInitializerContext<ConfigSchema>);
 ```
 
 ## Parameters
 
 |  Parameter | Type | Description |
 |  --- | --- | --- |
-|  initializerContext | <code>PluginInitializerContext</code> |  |
+|  initializerContext | <code>PluginInitializerContext&lt;ConfigSchema&gt;</code> |  |
 

docs/development/plugins/data/server/kibana-plugin-plugins-data-server.plugin.md

@@ -9,14 +9,14 @@ Static code to be shared externally
 <b>Signature:</b>
 
 ```typescript
-export declare function plugin(initializerContext: PluginInitializerContext): DataServerPlugin;
+export declare function plugin(initializerContext: PluginInitializerContext<ConfigSchema>): DataServerPlugin;
 ```
 
 ## Parameters
 
 |  Parameter | Type | Description |
 |  --- | --- | --- |
-|  initializerContext | <code>PluginInitializerContext</code> |  |
+|  initializerContext | <code>PluginInitializerContext&lt;ConfigSchema&gt;</code> |  |
 
 <b>Returns:</b>