Skip to content

Commit 6630313

Browse files
kibanamachinekibanamachine
authored
Merge branch 'master' into vislib-brush-timestamp
2 parents 208c416 + df46bfc commit 6630313

1,190 files changed

Lines changed: 25204 additions & 11915 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/es-snapshots/Jenkinsfile_verify_es‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ currentBuild.description = "ES: ${SNAPSHOT_VERSION}<br />Kibana: ${params.branch
1919

2020
def SNAPSHOT_MANIFEST = "https://storage.googleapis.com/kibana-ci-es-snapshots-daily/${SNAPSHOT_VERSION}/archives/${SNAPSHOT_ID}/manifest.json"
2121

22-
kibanaPipeline(timeoutMinutes: 150) {
22+
kibanaPipeline(timeoutMinutes: 210) {
2323
catchErrors {
2424
slackNotifications.onFailure(
2525
title: "*<${env.BUILD_URL}|[${SNAPSHOT_VERSION}] ES Snapshot Verification Failure>*",

‎.github/CODEOWNERS‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,13 @@
7474
#CC# /src/plugins/apm_oss/ @elastic/apm-ui
7575
#CC# /x-pack/plugins/observability/ @elastic/apm-ui
7676

77-
# Client Side Monitoring (lives in APM directories but owned by Uptime)
77+
# Uptime
78+
/x-pack/plugins/uptime @elastic/uptime
79+
/x-pack/test/functional_with_es_ssl/apps/uptime @elastic/uptime
80+
/x-pack/test/functional/apps/uptime @elastic/uptime
81+
/x-pack/test/api_integration/apis/uptime @elastic/uptime
82+
83+
# Client Side Monitoring / Uptime (lives in APM directories but owned by Uptime)
7884
/x-pack/plugins/apm/e2e/cypress/support/step_definitions/csm @elastic/uptime
7985
/x-pack/plugins/apm/e2e/cypress/integration/csm_dashboard.feature @elastic/uptime
8086
/x-pack/plugins/apm/public/application/csmApp.tsx @elastic/uptime
@@ -106,7 +112,6 @@
106112
/x-pack/plugins/fleet/ @elastic/fleet
107113
/x-pack/plugins/observability/ @elastic/observability-ui
108114
/x-pack/plugins/monitoring/ @elastic/stack-monitoring-ui
109-
/x-pack/plugins/uptime @elastic/uptime
110115

111116
# Machine Learning
112117
/x-pack/plugins/ml/ @elastic/ml-ui

‎.github/workflows/backport.yml‎

Lines changed: 14 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -18,34 +18,20 @@ jobs:
1818
)
1919
runs-on: ubuntu-latest
2020
steps:
21-
- name: 'Get backport config'
22-
run: |
23-
curl 'https://raw.githubusercontent.com/elastic/kibana/master/.backportrc.json' > .backportrc.json
24-
25-
- name: Use Node.js 14.x
26-
uses: actions/setup-node@v1
21+
- name: Checkout Actions
22+
uses: actions/checkout@v2
2723
with:
28-
node-version: 14.x
29-
30-
- name: Install backport CLI
31-
run: npm install -g backport@5.6.4
24+
repository: 'elastic/kibana-github-actions'
25+
ref: main
26+
path: ./actions
3227

33-
- name: Backport PR
34-
run: |
35-
git config --global user.name "kibanamachine"
36-
git config --global user.email "42973632+kibanamachine@users.noreply.github.com"
37-
backport --fork true --username kibanamachine --accessToken "${{ secrets.KIBANAMACHINE_TOKEN }}" --ci --pr "$PR_NUMBER" --labels backport --assignee "$PR_OWNER" | tee 'output.log'
38-
env:
39-
PR_NUMBER: ${{ github.event.pull_request.number }}
40-
PR_OWNER: ${{ github.event.pull_request.user.login }}
28+
- name: Install Actions
29+
run: npm install --production --prefix ./actions
4130

42-
- name: Report backport status
43-
run: |
44-
COMMENT="Backport result
45-
\`\`\`
46-
$(cat output.log)
47-
\`\`\`"
48-
49-
GITHUB_TOKEN="${{ secrets.KIBANAMACHINE_TOKEN }}" gh api -X POST repos/elastic/kibana/issues/$PR_NUMBER/comments -F body="$COMMENT"
50-
env:
51-
PR_NUMBER: ${{ github.event.pull_request.number }}
31+
- name: Run Backport
32+
uses: ./actions/backport
33+
with:
34+
branch: master
35+
github_token: ${{secrets.KIBANAMACHINE_TOKEN}}
36+
commit_user: kibanamachine
37+
commit_email: 42973632+kibanamachine@users.noreply.github.com

‎Jenkinsfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
library 'kibana-pipeline-library'
44
kibanaLibrary.load()
55

6-
kibanaPipeline(timeoutMinutes: 155, checkPrChanges: true, setCommitStatus: true) {
6+
kibanaPipeline(timeoutMinutes: 210, checkPrChanges: true, setCommitStatus: true) {
77
slackNotifications.onFailure(disabled: !params.NOTIFY_ON_FAILURE) {
88
githubPr.withDefaultPrComments {
99
ciStats.trackBuild {

‎docs/development/core/server/kibana-plugin-core-server.loggingservicesetup.configure.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Customize the configuration for the plugins.data.search context.
3434
core.logging.configure(
3535
of({
3636
appenders: new Map(),
37-
loggers: [{ context: 'search', appenders: ['default'] }]
37+
loggers: [{ name: 'search', appenders: ['default'] }]
3838
})
3939
)
4040

‎docs/development/plugins/data/public/kibana-plugin-plugins-data-public.isearchoptions.indexpattern.md‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<!-- Do not edit this file. It is automatically generated by API Documenter. -->
2+
3+
[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [ISearchOptions](./kibana-plugin-plugins-data-public.isearchoptions.md) &gt; [indexPattern](./kibana-plugin-plugins-data-public.isearchoptions.indexpattern.md)
4+
5+
## ISearchOptions.indexPattern property
6+
7+
Index pattern reference is used for better error messages
8+
9+
<b>Signature:</b>
10+
11+
```typescript
12+
indexPattern?: IndexPattern;
13+
```

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ export interface ISearchOptions
1515
| Property | Type | Description |
1616
| --- | --- | --- |
1717
| [abortSignal](./kibana-plugin-plugins-data-public.isearchoptions.abortsignal.md) | <code>AbortSignal</code> | An <code>AbortSignal</code> that allows the caller of <code>search</code> to abort a search request. |
18+
| [indexPattern](./kibana-plugin-plugins-data-public.isearchoptions.indexpattern.md) | <code>IndexPattern</code> | Index pattern reference is used for better error messages |
1819
| [isRestore](./kibana-plugin-plugins-data-public.isearchoptions.isrestore.md) | <code>boolean</code> | Whether the session is restored (i.e. search requests should re-use the stored search IDs, rather than starting from scratch) |
1920
| [isStored](./kibana-plugin-plugins-data-public.isearchoptions.isstored.md) | <code>boolean</code> | Whether the session is already saved (i.e. sent to background) |
2021
| [legacyHitsTotal](./kibana-plugin-plugins-data-public.isearchoptions.legacyhitstotal.md) | <code>boolean</code> | Request the legacy format for the total number of hits. If sending <code>rest_total_hits_as_int</code> to something other than <code>true</code>, this should be set to <code>false</code>. |

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,13 @@ Constructs a new instance of the `PainlessError` class
99
<b>Signature:</b>
1010

1111
```typescript
12-
constructor(err: IEsError);
12+
constructor(err: IEsError, indexPattern?: IndexPattern);
1313
```
1414

1515
## Parameters
1616

1717
| Parameter | Type | Description |
1818
| --- | --- | --- |
1919
| err | <code>IEsError</code> | |
20+
| indexPattern | <code>IndexPattern</code> | |
2021

‎docs/development/plugins/data/public/kibana-plugin-plugins-data-public.painlesserror.indexpattern.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<!-- Do not edit this file. It is automatically generated by API Documenter. -->
2+
3+
[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [PainlessError](./kibana-plugin-plugins-data-public.painlesserror.md) &gt; [indexPattern](./kibana-plugin-plugins-data-public.painlesserror.indexpattern.md)
4+
5+
## PainlessError.indexPattern property
6+
7+
<b>Signature:</b>
8+
9+
```typescript
10+
indexPattern?: IndexPattern;
11+
```

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,13 @@ export declare class PainlessError extends EsError
1414
1515
| Constructor | Modifiers | Description |
1616
| --- | --- | --- |
17-
| [(constructor)(err)](./kibana-plugin-plugins-data-public.painlesserror._constructor_.md) | | Constructs a new instance of the <code>PainlessError</code> class |
17+
| [(constructor)(err, indexPattern)](./kibana-plugin-plugins-data-public.painlesserror._constructor_.md) | | Constructs a new instance of the <code>PainlessError</code> class |
1818
1919
## Properties
2020
2121
| Property | Modifiers | Type | Description |
2222
| --- | --- | --- | --- |
23+
| [indexPattern](./kibana-plugin-plugins-data-public.painlesserror.indexpattern.md) | | <code>IndexPattern</code> | |
2324
| [painlessStack](./kibana-plugin-plugins-data-public.painlesserror.painlessstack.md) | | <code>string</code> | |
2425
2526
## Methods

0 commit comments

Comments
 (0)