Merge branch 'master' into lens/format-selection

Author: elasticmachine

.ci/end2end.groovy

@@ -13,7 +13,7 @@ pipeline {
     BASE_DIR = 'src/github.com/elastic/kibana'
     HOME = "${env.WORKSPACE}"
     APM_ITS = 'apm-integration-testing'
-    CYPRESS_DIR = 'x-pack/legacy/plugins/apm/cypress'
+    CYPRESS_DIR = 'x-pack/legacy/plugins/apm/e2e'
     PIPELINE_LOG_LEVEL = 'DEBUG'
   }
   options {
@@ -107,7 +107,7 @@ pipeline {
         dir("${BASE_DIR}"){
           sh '''
             jobs -l
-            docker build --tag cypress ${CYPRESS_DIR}/ci
+            docker build --tag cypress --build-arg NODE_VERSION=$(cat .node-version) ${CYPRESS_DIR}/ci
             docker run --rm -t --user "$(id -u):$(id -g)" \
                     -v `pwd`:/app --network="host" \
                     --name cypress cypress'''
@@ -116,8 +116,8 @@ pipeline {
       post {
         always {
           dir("${BASE_DIR}"){
-            archiveArtifacts(allowEmptyArchive: false, artifacts: "${CYPRESS_DIR}/screenshots/**,${CYPRESS_DIR}/videos/**,${CYPRESS_DIR}/*e2e-tests.xml")
-            junit(allowEmptyResults: true, testResults: "${CYPRESS_DIR}/*e2e-tests.xml")
+            archiveArtifacts(allowEmptyArchive: false, artifacts: "${CYPRESS_DIR}/**/screenshots/**,${CYPRESS_DIR}/**/videos/**,${CYPRESS_DIR}/**/test-results/*e2e-tests.xml")
+            junit(allowEmptyResults: true, testResults: "${CYPRESS_DIR}/**/test-results/*e2e-tests.xml")
           }
           dir("${APM_ITS}"){
             sh 'docker-compose logs > apm-its.log || true'

.eslintignore

@@ -39,7 +39,7 @@ src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/moc
 /x-pack/legacy/plugins/infra/common/graphql/types.ts
 /x-pack/legacy/plugins/infra/public/graphql/types.ts
 /x-pack/legacy/plugins/infra/server/graphql/types.ts
-/x-pack/legacy/plugins/apm/cypress/**/snapshots.js
+/x-pack/legacy/plugins/apm/e2e/cypress/**/snapshots.js
 /src/legacy/plugin_discovery/plugin_pack/__tests__/fixtures/plugins/broken
 **/graphql/types.ts
 **/*.js.snap

.github/paths-labeller.yml

@@ -0,0 +1,3 @@
+---
+  - "Feature:Drilldowns":
+    - "x-pack/plugins/drilldowns/**/*.*"

.github/workflows/pr-project-assigner.yml

@@ -8,7 +8,7 @@ jobs:
     name: Assign a PR to project based on label
     steps:
       - name: Assign to project
-        uses: elastic/github-actions/project-assigner@v1.0.2
+        uses: elastic/github-actions/project-assigner@v1.0.3
         id: project_assigner
         with:
           issue-mappings: |
@@ -17,4 +17,4 @@ jobs:
               { "label": "Feature:Lens", "projectName": "Lens", "columnId": 6219362 },
               { "label": "Team:Canvas", "projectName": "canvas", "columnId": 6187580 }
             ]
-          ghToken: ${{ secrets.GITHUB_TOKEN }}
+          ghToken: ${{ secrets.PROJECT_ASSIGNER_TOKEN }}

.github/workflows/project-assigner.yml

@@ -8,10 +8,10 @@ jobs:
     name: Assign issue or PR to project based on label
     steps:
       - name: Assign to project
-        uses: elastic/github-actions/project-assigner@v1.0.2
+        uses: elastic/github-actions/project-assigner@v1.0.3
         id: project_assigner
         with:
           issue-mappings: '[{"label": "Team:AppArch", "projectName": "kibana-app-arch", "columnId": 6173895}, {"label": "Feature:Lens", "projectName": "Lens", "columnId": 6219363}, {"label": "Team:Canvas", "projectName": "canvas", "columnId": 6187593}]'
-          ghToken: ${{ secrets.GITHUB_TOKEN }}
+          ghToken: ${{ secrets.PROJECT_ASSIGNER_TOKEN }}
 
 

docs/canvas/canvas-function-reference.asciidoc

@@ -1244,7 +1244,7 @@ Alias: `format`
 [[formatnumber_fn]]
 === `formatnumber`
 
-Formats a number into a formatted number string using NumeralJS. For more information, see http://numeraljs.com/#format.
+Formats a number into a formatted number string using the <<numeral, numeral pattern syntax>>.
 
 *Expression syntax*
 [source,js]
@@ -1276,7 +1276,7 @@ The `formatnumber` subexpression receives the same `context` as the `progress` f
 
 Alias: `format`
 |`string`
-|A NumeralJS format string. For example, `"0.0a"` or `"0%"`. See http://numeraljs.com/#format.
+|A <<numeral, numeral pattern>> string. For example, `"0.0a"` or `"0%"`.
 |===
 
 *Returns:* `string`
@@ -1675,7 +1675,7 @@ Default: `${font size=48 family="'Open Sans', Helvetica, Arial, sans-serif" colo
 
 Alias: `format`
 |`string`
-|A NumeralJS format string. For example, `"0.0a"` or `"0%"`. See http://numeraljs.com/#format.
+|A <<numeral, numeral pattern>> string. For example, `"0.0a"` or `"0%"`.
 |===
 
 *Returns:* `render`

docs/development/core/public/kibana-plugin-public.app.md

@@ -9,7 +9,7 @@ Extension of [common app properties](./kibana-plugin-public.appbase.md) with the
 <b>Signature:</b>
 
 ```typescript
-export interface App extends AppBase 
+export interface App<HistoryLocationState = unknown> extends AppBase 
 ```
 
 ## Properties
@@ -18,5 +18,5 @@ export interface App extends AppBase
 |  --- | --- | --- |
 |  [appRoute](./kibana-plugin-public.app.approute.md) | <code>string</code> | Override the application's routing path from <code>/app/${id}</code>. Must be unique across registered applications. Should not include the base path from HTTP. |
 |  [chromeless](./kibana-plugin-public.app.chromeless.md) | <code>boolean</code> | Hide the UI chrome when the application is mounted. Defaults to <code>false</code>. Takes precedence over chrome service visibility settings. |
-|  [mount](./kibana-plugin-public.app.mount.md) | <code>AppMount &#124; AppMountDeprecated</code> | A mount function called when the user navigates to this app's route. May have signature of [AppMount](./kibana-plugin-public.appmount.md) or [AppMountDeprecated](./kibana-plugin-public.appmountdeprecated.md)<!-- -->. |
+|  [mount](./kibana-plugin-public.app.mount.md) | <code>AppMount&lt;HistoryLocationState&gt; &#124; AppMountDeprecated&lt;HistoryLocationState&gt;</code> | A mount function called when the user navigates to this app's route. May have signature of [AppMount](./kibana-plugin-public.appmount.md) or [AppMountDeprecated](./kibana-plugin-public.appmountdeprecated.md)<!-- -->. |
 

docs/development/core/public/kibana-plugin-public.app.mount.md

@@ -9,7 +9,7 @@ A mount function called when the user navigates to this app's route. May have si
 <b>Signature:</b>
 
 ```typescript
-mount: AppMount | AppMountDeprecated;
+mount: AppMount<HistoryLocationState> | AppMountDeprecated<HistoryLocationState>;
 ```
 
 ## Remarks

docs/development/core/public/kibana-plugin-public.applicationsetup.register.md

@@ -9,14 +9,14 @@ Register an mountable application to the system.
 <b>Signature:</b>
 
 ```typescript
-register(app: App): void;
+register<HistoryLocationState = unknown>(app: App<HistoryLocationState>): void;
 ```
 
 ## Parameters
 
 |  Parameter | Type | Description |
 |  --- | --- | --- |
-|  app | <code>App</code> | an [App](./kibana-plugin-public.app.md) |
+|  app | <code>App&lt;HistoryLocationState&gt;</code> | an [App](./kibana-plugin-public.app.md) |
 
 <b>Returns:</b>
 

docs/development/core/public/kibana-plugin-public.appmount.md

@@ -9,5 +9,5 @@ A mount function called when the user navigates to this app's route.
 <b>Signature:</b>
 
 ```typescript
-export declare type AppMount = (params: AppMountParameters) => AppUnmount | Promise<AppUnmount>;
+export declare type AppMount<HistoryLocationState = unknown> = (params: AppMountParameters<HistoryLocationState>) => AppUnmount | Promise<AppUnmount>;
 ```