Skip to content

Commit d6c73d0

Browse files
elasticmachineelasticmachine
authored
Merge branch 'master' into alerting/index-threshold
2 parents cfbd390 + 38067da commit d6c73d0

1,178 files changed

Lines changed: 31807 additions & 69836 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.ci/end2end.groovy‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ pipeline {
1313
BASE_DIR = 'src/github.com/elastic/kibana'
1414
HOME = "${env.WORKSPACE}"
1515
APM_ITS = 'apm-integration-testing'
16-
CYPRESS_DIR = 'x-pack/legacy/plugins/apm/cypress'
16+
CYPRESS_DIR = 'x-pack/legacy/plugins/apm/e2e'
1717
PIPELINE_LOG_LEVEL = 'DEBUG'
1818
}
1919
options {
@@ -107,7 +107,7 @@ pipeline {
107107
dir("${BASE_DIR}"){
108108
sh '''
109109
jobs -l
110-
docker build --tag cypress ${CYPRESS_DIR}/ci
110+
docker build --tag cypress --build-arg NODE_VERSION=$(cat .node-version) ${CYPRESS_DIR}/ci
111111
docker run --rm -t --user "$(id -u):$(id -g)" \
112112
-v `pwd`:/app --network="host" \
113113
--name cypress cypress'''
@@ -116,8 +116,8 @@ pipeline {
116116
post {
117117
always {
118118
dir("${BASE_DIR}"){
119-
archiveArtifacts(allowEmptyArchive: false, artifacts: "${CYPRESS_DIR}/screenshots/**,${CYPRESS_DIR}/videos/**,${CYPRESS_DIR}/*e2e-tests.xml")
120-
junit(allowEmptyResults: true, testResults: "${CYPRESS_DIR}/*e2e-tests.xml")
119+
archiveArtifacts(allowEmptyArchive: false, artifacts: "${CYPRESS_DIR}/**/screenshots/**,${CYPRESS_DIR}/**/videos/**,${CYPRESS_DIR}/**/test-results/*e2e-tests.xml")
120+
junit(allowEmptyResults: true, testResults: "${CYPRESS_DIR}/**/test-results/*e2e-tests.xml")
121121
}
122122
dir("${APM_ITS}"){
123123
sh 'docker-compose logs > apm-its.log || true'

‎.eslintignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/moc
3939
/x-pack/legacy/plugins/infra/common/graphql/types.ts
4040
/x-pack/legacy/plugins/infra/public/graphql/types.ts
4141
/x-pack/legacy/plugins/infra/server/graphql/types.ts
42-
/x-pack/legacy/plugins/apm/cypress/**/snapshots.js
42+
/x-pack/legacy/plugins/apm/e2e/cypress/**/snapshots.js
4343
/src/legacy/plugin_discovery/plugin_pack/__tests__/fixtures/plugins/broken
4444
**/graphql/types.ts
4545
**/*.js.snap

‎.github/paths-labeller.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
---
2+
- "Feature:Drilldowns":
3+
- "x-pack/plugins/drilldowns/**/*.*"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
name: Assign a PR to project based on label
99
steps:
1010
- name: Assign to project
11-
uses: elastic/github-actions/project-assigner@v1.0.2
11+
uses: elastic/github-actions/project-assigner@v1.0.3
1212
id: project_assigner
1313
with:
1414
issue-mappings: |
@@ -17,4 +17,4 @@ jobs:
1717
{ "label": "Feature:Lens", "projectName": "Lens", "columnId": 6219362 },
1818
{ "label": "Team:Canvas", "projectName": "canvas", "columnId": 6187580 }
1919
]
20-
ghToken: ${{ secrets.GITHUB_TOKEN }}
20+
ghToken: ${{ secrets.PROJECT_ASSIGNER_TOKEN }}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ jobs:
88
name: Assign issue or PR to project based on label
99
steps:
1010
- name: Assign to project
11-
uses: elastic/github-actions/project-assigner@v1.0.2
11+
uses: elastic/github-actions/project-assigner@v1.0.3
1212
id: project_assigner
1313
with:
1414
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}]'
15-
ghToken: ${{ secrets.GITHUB_TOKEN }}
15+
ghToken: ${{ secrets.PROJECT_ASSIGNER_TOKEN }}
1616

1717

‎docs/canvas/canvas-function-reference.asciidoc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1244,7 +1244,7 @@ Alias: `format`
12441244
[[formatnumber_fn]]
12451245
=== `formatnumber`
12461246

1247-
Formats a number into a formatted number string using NumeralJS. For more information, see http://numeraljs.com/#format.
1247+
Formats a number into a formatted number string using the <<numeral, numeral pattern syntax>>.
12481248

12491249
*Expression syntax*
12501250
[source,js]
@@ -1276,7 +1276,7 @@ The `formatnumber` subexpression receives the same `context` as the `progress` f
12761276

12771277
Alias: `format`
12781278
|`string`
1279-
|A NumeralJS format string. For example, `"0.0a"` or `"0%"`. See http://numeraljs.com/#format.
1279+
|A <<numeral, numeral pattern>> string. For example, `"0.0a"` or `"0%"`.
12801280
|===
12811281

12821282
*Returns:* `string`
@@ -1675,7 +1675,7 @@ Default: `${font size=48 family="'Open Sans', Helvetica, Arial, sans-serif" colo
16751675

16761676
Alias: `format`
16771677
|`string`
1678-
|A NumeralJS format string. For example, `"0.0a"` or `"0%"`. See http://numeraljs.com/#format.
1678+
|A <<numeral, numeral pattern>> string. For example, `"0.0a"` or `"0%"`.
16791679
|===
16801680

16811681
*Returns:* `render`

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Extension of [common app properties](./kibana-plugin-public.appbase.md) with the
99
<b>Signature:</b>
1010

1111
```typescript
12-
export interface App extends AppBase
12+
export interface App<HistoryLocationState = unknown> extends AppBase
1313
```
1414
1515
## Properties
@@ -18,5 +18,5 @@ export interface App extends AppBase
1818
| --- | --- | --- |
1919
| [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. |
2020
| [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. |
21-
| [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)<!-- -->. |
21+
| [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)<!-- -->. |
2222

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ A mount function called when the user navigates to this app's route. May have si
99
<b>Signature:</b>
1010

1111
```typescript
12-
mount: AppMount | AppMountDeprecated;
12+
mount: AppMount<HistoryLocationState> | AppMountDeprecated<HistoryLocationState>;
1313
```
1414

1515
## Remarks

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ Register an mountable application to the system.
99
<b>Signature:</b>
1010

1111
```typescript
12-
register(app: App): void;
12+
register<HistoryLocationState = unknown>(app: App<HistoryLocationState>): void;
1313
```
1414
1515
## Parameters
1616
1717
| Parameter | Type | Description |
1818
| --- | --- | --- |
19-
| app | <code>App</code> | an [App](./kibana-plugin-public.app.md) |
19+
| app | <code>App&lt;HistoryLocationState&gt;</code> | an [App](./kibana-plugin-public.app.md) |
2020
2121
<b>Returns:</b>
2222

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ A mount function called when the user navigates to this app's route.
99
<b>Signature:</b>
1010

1111
```typescript
12-
export declare type AppMount = (params: AppMountParameters) => AppUnmount | Promise<AppUnmount>;
12+
export declare type AppMount<HistoryLocationState = unknown> = (params: AppMountParameters<HistoryLocationState>) => AppUnmount | Promise<AppUnmount>;
1313
```

0 commit comments

Comments
 (0)