Skip to content

Commit a7c6742

Browse files
author
Liza K
committed
Merge branch 'master' of github.com:elastic/kibana into pr/60342
2 parents 1f79aa6 + 8373eb8 commit a7c6742

File tree

499 files changed

+4651
-2296
lines changed

Some content is hidden

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

499 files changed

+4651
-2296
lines changed

.ci/packer_cache.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,20 +35,20 @@ mkdir -p ".geckodriver"
3535
cp "node_modules/geckodriver/geckodriver.tar.gz" .geckodriver/geckodriver.tar.gz
3636
echo "$geckodriverPkgVersion" > .geckodriver/pkgVersion
3737

38+
echo "Creating bootstrap_cache archive"
39+
3840
# archive cacheable directories
3941
mkdir -p "$HOME/.kibana/bootstrap_cache"
4042
tar -cf "$HOME/.kibana/bootstrap_cache/$branch.tar" \
41-
node_modules \
42-
packages/*/node_modules \
43-
x-pack/node_modules \
44-
x-pack/legacy/plugins/*/node_modules \
4543
x-pack/legacy/plugins/reporting/.chromium \
46-
test/plugin_functional/plugins/*/node_modules \
47-
examples/*/node_modules \
4844
.es \
4945
.chromedriver \
5046
.geckodriver;
5147

48+
echo "Adding node_modules"
49+
# Find all of the node_modules directories that aren't test fixtures, and aren't inside other node_modules directories, and append them to the tar
50+
find . -type d -name node_modules -not -path '*__fixtures__*' -prune -print0 | xargs -0I % tar -rf "$HOME/.kibana/bootstrap_cache/$branch.tar" "%"
51+
5252
echo "created $HOME/.kibana/bootstrap_cache/$branch.tar"
5353

5454
if [ "$branch" == "master" ]; then

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@
176176
/x-pack/plugins/telemetry_collection_xpack/ @elastic/pulse
177177

178178
# Kibana Alerting Services
179-
/x-pack/plugins/alerting/ @elastic/kibana-alerting-services
179+
/x-pack/plugins/alerts/ @elastic/kibana-alerting-services
180180
/x-pack/plugins/actions/ @elastic/kibana-alerting-services
181181
/x-pack/plugins/event_log/ @elastic/kibana-alerting-services
182182
/x-pack/plugins/task_manager/ @elastic/kibana-alerting-services

docs/development/core/server/kibana-plugin-core-server.elasticsearchservicesetup.adminclient.md

Lines changed: 0 additions & 27 deletions
This file was deleted.

docs/development/core/server/kibana-plugin-core-server.elasticsearchservicesetup.createclient.md

Lines changed: 0 additions & 28 deletions
This file was deleted.

docs/development/core/server/kibana-plugin-core-server.elasticsearchservicesetup.dataclient.md

Lines changed: 0 additions & 27 deletions
This file was deleted.
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<!-- Do not edit this file. It is automatically generated by API Documenter. -->
2+
3+
[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [ElasticsearchServiceSetup](./kibana-plugin-core-server.elasticsearchservicesetup.md) &gt; [legacy](./kibana-plugin-core-server.elasticsearchservicesetup.legacy.md)
4+
5+
## ElasticsearchServiceSetup.legacy property
6+
7+
> Warning: This API is now obsolete.
8+
>
9+
> Use [ElasticsearchServiceStart.legacy](./kibana-plugin-core-server.elasticsearchservicestart.legacy.md) instead.
10+
>
11+
12+
<b>Signature:</b>
13+
14+
```typescript
15+
legacy: {
16+
readonly createClient: (type: string, clientConfig?: Partial<ElasticsearchClientConfig>) => ICustomClusterClient;
17+
readonly client: IClusterClient;
18+
};
19+
```

docs/development/core/server/kibana-plugin-core-server.elasticsearchservicesetup.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,5 @@ export interface ElasticsearchServiceSetup
1515

1616
| Property | Type | Description |
1717
| --- | --- | --- |
18-
| [adminClient](./kibana-plugin-core-server.elasticsearchservicesetup.adminclient.md) | <code>IClusterClient</code> | |
19-
| [createClient](./kibana-plugin-core-server.elasticsearchservicesetup.createclient.md) | <code>(type: string, clientConfig?: Partial&lt;ElasticsearchClientConfig&gt;) =&gt; ICustomClusterClient</code> | |
20-
| [dataClient](./kibana-plugin-core-server.elasticsearchservicesetup.dataclient.md) | <code>IClusterClient</code> | |
18+
| [legacy](./kibana-plugin-core-server.elasticsearchservicesetup.legacy.md) | <code>{</code><br/><code> readonly createClient: (type: string, clientConfig?: Partial&lt;ElasticsearchClientConfig&gt;) =&gt; ICustomClusterClient;</code><br/><code> readonly client: IClusterClient;</code><br/><code> }</code> | |
2119

docs/development/core/server/kibana-plugin-core-server.elasticsearchservicestart.legacy.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44

55
## ElasticsearchServiceStart.legacy property
66

7+
> Warning: This API is now obsolete.
8+
>
9+
> Provided for the backward compatibility. Switch to the new elasticsearch client as soon as https://github.com/elastic/kibana/issues/35508 done.
10+
>
11+
712
<b>Signature:</b>
813

914
```typescript

docs/development/core/server/kibana-plugin-core-server.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
125125
| [PluginConfigDescriptor](./kibana-plugin-core-server.pluginconfigdescriptor.md) | Describes a plugin configuration properties. |
126126
| [PluginInitializerContext](./kibana-plugin-core-server.plugininitializercontext.md) | Context that's available to plugins during initialization stage. |
127127
| [PluginManifest](./kibana-plugin-core-server.pluginmanifest.md) | Describes the set of required and optional properties plugin can define in its mandatory JSON manifest file. |
128-
| [RequestHandlerContext](./kibana-plugin-core-server.requesthandlercontext.md) | Plugin specific context passed to a route handler.<!-- -->Provides the following clients and services: - [savedObjects.client](./kibana-plugin-core-server.savedobjectsclient.md) - Saved Objects client which uses the credentials of the incoming request - [savedObjects.typeRegistry](./kibana-plugin-core-server.isavedobjecttyperegistry.md) - Type registry containing all the registered types. - [elasticsearch.dataClient](./kibana-plugin-core-server.scopedclusterclient.md) - Elasticsearch data client which uses the credentials of the incoming request - [elasticsearch.adminClient](./kibana-plugin-core-server.scopedclusterclient.md) - Elasticsearch admin client which uses the credentials of the incoming request - [uiSettings.client](./kibana-plugin-core-server.iuisettingsclient.md) - uiSettings client which uses the credentials of the incoming request |
128+
| [RequestHandlerContext](./kibana-plugin-core-server.requesthandlercontext.md) | Plugin specific context passed to a route handler.<!-- -->Provides the following clients and services: - [savedObjects.client](./kibana-plugin-core-server.savedobjectsclient.md) - Saved Objects client which uses the credentials of the incoming request - [savedObjects.typeRegistry](./kibana-plugin-core-server.isavedobjecttyperegistry.md) - Type registry containing all the registered types. - [elasticsearch.legacy.client](./kibana-plugin-core-server.scopedclusterclient.md) - Elasticsearch data client which uses the credentials of the incoming request - [uiSettings.client](./kibana-plugin-core-server.iuisettingsclient.md) - uiSettings client which uses the credentials of the incoming request |
129129
| [RouteConfig](./kibana-plugin-core-server.routeconfig.md) | Route specific configuration. |
130130
| [RouteConfigOptions](./kibana-plugin-core-server.routeconfigoptions.md) | Additional route options. |
131131
| [RouteConfigOptionsBody](./kibana-plugin-core-server.routeconfigoptionsbody.md) | Additional body options for a route |

docs/development/core/server/kibana-plugin-core-server.requesthandlercontext.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
Plugin specific context passed to a route handler.
88

9-
Provides the following clients and services: - [savedObjects.client](./kibana-plugin-core-server.savedobjectsclient.md) - Saved Objects client which uses the credentials of the incoming request - [savedObjects.typeRegistry](./kibana-plugin-core-server.isavedobjecttyperegistry.md) - Type registry containing all the registered types. - [elasticsearch.dataClient](./kibana-plugin-core-server.scopedclusterclient.md) - Elasticsearch data client which uses the credentials of the incoming request - [elasticsearch.adminClient](./kibana-plugin-core-server.scopedclusterclient.md) - Elasticsearch admin client which uses the credentials of the incoming request - [uiSettings.client](./kibana-plugin-core-server.iuisettingsclient.md) - uiSettings client which uses the credentials of the incoming request
9+
Provides the following clients and services: - [savedObjects.client](./kibana-plugin-core-server.savedobjectsclient.md) - Saved Objects client which uses the credentials of the incoming request - [savedObjects.typeRegistry](./kibana-plugin-core-server.isavedobjecttyperegistry.md) - Type registry containing all the registered types. - [elasticsearch.legacy.client](./kibana-plugin-core-server.scopedclusterclient.md) - Elasticsearch data client which uses the credentials of the incoming request - [uiSettings.client](./kibana-plugin-core-server.iuisettingsclient.md) - uiSettings client which uses the credentials of the incoming request
1010

1111
<b>Signature:</b>
1212

0 commit comments

Comments
 (0)