Skip to content

Commit c2698e4

Browse files
gmmorrisgmmorris
committed
Merge branch 'master' into task-manager/run-now
2 parents 9041b18 + cd109fa commit c2698e4

1,506 files changed

Lines changed: 29740 additions & 19985 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/Jenkinsfile_flaky‎

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,13 @@
33
library 'kibana-pipeline-library'
44
kibanaLibrary.load()
55

6-
// Looks like 'oss:ciGroup:1' or 'oss:firefoxSmoke'
7-
def JOB_PARTS = params.CI_GROUP.split(':')
6+
def CI_GROUP_PARAM = params.CI_GROUP
7+
8+
// Looks like 'oss:ciGroup:1', 'oss:firefoxSmoke', or 'all:serverMocha'
9+
def JOB_PARTS = CI_GROUP_PARAM.split(':')
810
def IS_XPACK = JOB_PARTS[0] == 'xpack'
911
def JOB = JOB_PARTS[1]
12+
def NEED_BUILD = JOB != 'serverMocha'
1013
def CI_GROUP = JOB_PARTS.size() > 2 ? JOB_PARTS[2] : ''
1114
def EXECUTIONS = params.NUMBER_EXECUTIONS.toInteger()
1215
def AGENT_COUNT = getAgentCount(EXECUTIONS)
@@ -31,13 +34,15 @@ stage("Kibana Pipeline") {
3134
print "Agent ${agentNumberInside} - ${agentExecutions} executions"
3235

3336
kibanaPipeline.withWorkers('flaky-test-runner', {
34-
if (!IS_XPACK) {
35-
kibanaPipeline.buildOss()
36-
if (CI_GROUP == '1') {
37-
runbld("./test/scripts/jenkins_build_kbn_tp_sample_panel_action.sh", "Build kbn tp sample panel action for ciGroup1")
37+
if (NEED_BUILD) {
38+
if (!IS_XPACK) {
39+
kibanaPipeline.buildOss()
40+
if (CI_GROUP == '1') {
41+
runbld("./test/scripts/jenkins_build_kbn_tp_sample_panel_action.sh", "Build kbn tp sample panel action for ciGroup1")
42+
}
43+
} else {
44+
kibanaPipeline.buildXpack()
3845
}
39-
} else {
40-
kibanaPipeline.buildXpack()
4146
}
4247
}, getWorkerMap(agentNumberInside, agentExecutions, worker, workerFailures))()
4348
}
@@ -61,7 +66,17 @@ stage("Kibana Pipeline") {
6166

6267
def getWorkerFromParams(isXpack, job, ciGroup) {
6368
if (!isXpack) {
64-
if (job == 'firefoxSmoke') {
69+
if (job == 'serverMocha') {
70+
return kibanaPipeline.getPostBuildWorker('serverMocha', {
71+
kibanaPipeline.bash(
72+
"""
73+
source src/dev/ci_setup/setup_env.sh
74+
node scripts/mocha
75+
""",
76+
"run `node scripts/mocha`"
77+
)
78+
})
79+
} else if (job == 'firefoxSmoke') {
6580
return kibanaPipeline.getPostBuildWorker('firefoxSmoke', { runbld('./test/scripts/jenkins_firefox_smoke.sh', 'Execute kibana-firefoxSmoke') })
6681
} else if(job == 'visualRegression') {
6782
return kibanaPipeline.getPostBuildWorker('visualRegression', { runbld('./test/scripts/jenkins_visual_regression.sh', 'Execute kibana-visualRegression') })

‎.eslintignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ bower_components
88
/plugins
99
/built_assets
1010
/html_docs
11+
/src/plugins/data/common/es_query/kuery/ast/_generated_/**
1112
/src/fixtures/vislib/mock_data
1213
/src/legacy/ui/public/angular-bootstrap
1314
/src/legacy/ui/public/flot-charts
@@ -19,7 +20,6 @@ bower_components
1920
/src/core/lib/kbn_internal_native_observable
2021
/packages/*/target
2122
/packages/eslint-config-kibana
22-
/packages/kbn-es-query/src/kuery/ast/kuery.js
2323
/packages/kbn-pm/dist
2424
/packages/kbn-plugin-generator/sao_template/template
2525
/packages/kbn-ui-framework/dist

‎.eslintrc.js‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,6 @@ module.exports = {
6464
'jsx-a11y/no-onchange': 'off',
6565
},
6666
},
67-
{
68-
files: ['src/legacy/core_plugins/console/**/*.{js,ts,tsx}'],
69-
rules: {
70-
'react-hooks/exhaustive-deps': 'off',
71-
},
72-
},
7367
{
7468
files: ['src/legacy/core_plugins/data/**/*.{js,ts,tsx}'],
7569
rules: {

‎.github/CODEOWNERS‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
/x-pack/test/functional/services/transform.ts @elastic/ml-ui
4646

4747
# Operations
48-
/renovate.json5 @elastic/kibana-operations
4948
/src/dev/ @elastic/kibana-operations
5049
/src/setup_node_env/ @elastic/kibana-operations
5150
/src/optimize/ @elastic/kibana-operations
@@ -62,6 +61,7 @@
6261
/config/kibana.yml @elastic/kibana-platform
6362
/x-pack/plugins/features/ @elastic/kibana-platform
6463
/x-pack/plugins/licensing/ @elastic/kibana-platform
64+
/packages/kbn-config-schema/ @elastic/kibana-platform
6565

6666
# Security
6767
/x-pack/legacy/plugins/security/ @elastic/kibana-security
@@ -77,6 +77,7 @@
7777
/src/dev/i18n @elastic/kibana-stack-services
7878
/packages/kbn-analytics/ @elastic/kibana-stack-services
7979
/src/legacy/core_plugins/ui_metric/ @elastic/kibana-stack-services
80+
/src/plugins/usage_collection/ @elastic/kibana-stack-services
8081
/x-pack/legacy/plugins/telemetry @elastic/kibana-stack-services
8182
/x-pack/legacy/plugins/alerting @elastic/kibana-stack-services
8283
/x-pack/legacy/plugins/actions @elastic/kibana-stack-services

‎.i18nrc.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
"interpreter": "src/legacy/core_plugins/interpreter",
1717
"kbn": "src/legacy/core_plugins/kibana",
1818
"kbnDocViews": "src/legacy/core_plugins/kbn_doc_views",
19-
"kbnESQuery": "packages/kbn-es-query",
2019
"kbnVislibVisTypes": "src/legacy/core_plugins/kbn_vislib_vis_types",
2120
"kibana_react": "src/legacy/core_plugins/kibana_react",
2221
"kibana-react": "src/plugins/kibana_react",

‎docs/api/role-management/put.asciidoc‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ To use the create or update role API, you must have the `manage_security` cluste
2626
(Optional, object) In the `metadata` object, keys that begin with `_` are reserved for system usage.
2727

2828
`elasticsearch`::
29-
(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].
29+
(Optional, object) {es} cluster and index privileges. Valid keys include
30+
`cluster`, `indices`, and `run_as`. For more information, see
31+
{ref}/defining-roles.html[Defining roles].
3032

3133
`kibana`::
3234
(list) Objects that specify the <<kibana-privileges, Kibana privileges>> for the role:

‎docs/developer/security/rbac.asciidoc‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
11
[[development-security-rbac]]
22
=== Role-based access control
33

4-
Role-based access control (RBAC) in {kib} relies upon the {xpack-ref}/security-privileges.html#application-privileges[application privileges] that Elasticsearch exposes. This allows {kib} to define the privileges that {kib} wishes to grant to users, assign them to the relevant users using roles, and then authorize the user to perform a specific action. This is handled within a secured instance of the `SavedObjectsClient` and available transparently to consumers when using `request.getSavedObjectsClient()` or `savedObjects.getScopedSavedObjectsClient()`.
4+
Role-based access control (RBAC) in {kib} relies upon the
5+
{ref}/security-privileges.html#application-privileges[application privileges]
6+
that Elasticsearch exposes. This allows {kib} to define the privileges that
7+
{kib} wishes to grant to users, assign them to the relevant users using roles,
8+
and then authorize the user to perform a specific action. This is handled within
9+
a secured instance of the `SavedObjectsClient` and available transparently to
10+
consumers when using `request.getSavedObjectsClient()` or
11+
`savedObjects.getScopedSavedObjectsClient()`.
512

613
[[development-rbac-privileges]]
714
==== {kib} Privileges

‎docs/development/core/public/kibana-plugin-public.savedobjectsclient.find.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ Search for objects
99
<b>Signature:</b>
1010

1111
```typescript
12-
find: <T extends SavedObjectAttributes>(options: Pick<SavedObjectFindOptionsServer, "search" | "filter" | "type" | "searchFields" | "defaultSearchOperator" | "hasReference" | "sortField" | "page" | "perPage" | "fields">) => Promise<SavedObjectsFindResponsePublic<T>>;
12+
find: <T extends SavedObjectAttributes>(options: Pick<SavedObjectFindOptionsServer, "search" | "filter" | "type" | "fields" | "searchFields" | "defaultSearchOperator" | "hasReference" | "sortField" | "page" | "perPage">) => Promise<SavedObjectsFindResponsePublic<T>>;
1313
```

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export declare class SavedObjectsClient
2020
| [bulkGet](./kibana-plugin-public.savedobjectsclient.bulkget.md) | | <code>(objects?: {</code><br/><code> id: string;</code><br/><code> type: string;</code><br/><code> }[]) =&gt; Promise&lt;SavedObjectsBatchResponse&lt;SavedObjectAttributes&gt;&gt;</code> | Returns an array of objects by id |
2121
| [create](./kibana-plugin-public.savedobjectsclient.create.md) | | <code>&lt;T extends SavedObjectAttributes&gt;(type: string, attributes: T, options?: SavedObjectsCreateOptions) =&gt; Promise&lt;SimpleSavedObject&lt;T&gt;&gt;</code> | Persists an object |
2222
| [delete](./kibana-plugin-public.savedobjectsclient.delete.md) | | <code>(type: string, id: string) =&gt; Promise&lt;{}&gt;</code> | Deletes an object |
23-
| [find](./kibana-plugin-public.savedobjectsclient.find.md) | | <code>&lt;T extends SavedObjectAttributes&gt;(options: Pick&lt;SavedObjectFindOptionsServer, &quot;search&quot; &#124; &quot;filter&quot; &#124; &quot;type&quot; &#124; &quot;searchFields&quot; &#124; &quot;defaultSearchOperator&quot; &#124; &quot;hasReference&quot; &#124; &quot;sortField&quot; &#124; &quot;page&quot; &#124; &quot;perPage&quot; &#124; &quot;fields&quot;&gt;) =&gt; Promise&lt;SavedObjectsFindResponsePublic&lt;T&gt;&gt;</code> | Search for objects |
23+
| [find](./kibana-plugin-public.savedobjectsclient.find.md) | | <code>&lt;T extends SavedObjectAttributes&gt;(options: Pick&lt;SavedObjectFindOptionsServer, &quot;search&quot; &#124; &quot;filter&quot; &#124; &quot;type&quot; &#124; &quot;fields&quot; &#124; &quot;searchFields&quot; &#124; &quot;defaultSearchOperator&quot; &#124; &quot;hasReference&quot; &#124; &quot;sortField&quot; &#124; &quot;page&quot; &#124; &quot;perPage&quot;&gt;) =&gt; Promise&lt;SavedObjectsFindResponsePublic&lt;T&gt;&gt;</code> | Search for objects |
2424
| [get](./kibana-plugin-public.savedobjectsclient.get.md) | | <code>&lt;T extends SavedObjectAttributes&gt;(type: string, id: string) =&gt; Promise&lt;SimpleSavedObject&lt;T&gt;&gt;</code> | Fetches a single object |
2525

2626
## Methods

‎docs/development/core/server/kibana-plugin-server.basepath.get.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ returns `basePath` value, specific for an incoming request.
99
<b>Signature:</b>
1010

1111
```typescript
12-
get: (request: KibanaRequest<unknown, unknown, unknown> | LegacyRequest) => string;
12+
get: (request: KibanaRequest<unknown, unknown, unknown, any> | LegacyRequest) => string;
1313
```

0 commit comments

Comments
 (0)