Skip to content

Commit 31b4ae4

Browse files
authored
expose ES createClient to plugins (#40717) (#40839)
1 parent 5636c33 commit 31b4ae4

File tree

6 files changed

+14
-3
lines changed

6 files changed

+14
-3
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,6 @@
1010
elasticsearch: {
1111
adminClient$: Observable<ClusterClient>;
1212
dataClient$: Observable<ClusterClient>;
13+
createClient: (type: string, clientConfig?: Partial<ElasticsearchClientConfig>) => ClusterClient;
1314
};
1415
```

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ export interface CoreSetup
1616

1717
| Property | Type | Description |
1818
| --- | --- | --- |
19-
| [elasticsearch](./kibana-plugin-server.coresetup.elasticsearch.md) | <code>{</code><br/><code> adminClient$: Observable&lt;ClusterClient&gt;;</code><br/><code> dataClient$: Observable&lt;ClusterClient&gt;;</code><br/><code> }</code> | |
19+
| [elasticsearch](./kibana-plugin-server.coresetup.elasticsearch.md) | <code>{</code><br/><code> adminClient$: Observable&lt;ClusterClient&gt;;</code><br/><code> dataClient$: Observable&lt;ClusterClient&gt;;</code><br/><code> createClient: (type: string, clientConfig?: Partial&lt;ElasticsearchClientConfig&gt;) =&gt; ClusterClient;</code><br/><code> }</code> | |
2020
| [http](./kibana-plugin-server.coresetup.http.md) | <code>{</code><br/><code> registerOnPreAuth: HttpServiceSetup['registerOnPreAuth'];</code><br/><code> registerAuth: HttpServiceSetup['registerAuth'];</code><br/><code> registerOnPostAuth: HttpServiceSetup['registerOnPostAuth'];</code><br/><code> basePath: HttpServiceSetup['basePath'];</code><br/><code> createNewServer: HttpServiceSetup['createNewServer'];</code><br/><code> isTlsEnabled: HttpServiceSetup['isTlsEnabled'];</code><br/><code> }</code> | |
2121

src/core/server/elasticsearch/elasticsearch_service.mock.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import { ElasticsearchConfig } from './elasticsearch_config';
2323
import { ElasticsearchService, ElasticsearchServiceSetup } from './elasticsearch_service';
2424

2525
const createSetupContractMock = () => {
26-
const setupContract: ElasticsearchServiceSetup = {
26+
const setupContract: jest.Mocked<ElasticsearchServiceSetup> = {
2727
legacy: {
2828
config$: new BehaviorSubject({} as ElasticsearchConfig),
2929
},

src/core/server/index.ts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,11 @@
3636
*/
3737

3838
import { Observable } from 'rxjs';
39-
import { ClusterClient, ElasticsearchServiceSetup } from './elasticsearch';
39+
import {
40+
ClusterClient,
41+
ElasticsearchClientConfig,
42+
ElasticsearchServiceSetup,
43+
} from './elasticsearch';
4044
import { HttpServiceSetup, HttpServiceStart } from './http';
4145
import { PluginsServiceSetup, PluginsServiceStart } from './plugins';
4246

@@ -115,6 +119,10 @@ export interface CoreSetup {
115119
elasticsearch: {
116120
adminClient$: Observable<ClusterClient>;
117121
dataClient$: Observable<ClusterClient>;
122+
createClient: (
123+
type: string,
124+
clientConfig?: Partial<ElasticsearchClientConfig>
125+
) => ClusterClient;
118126
};
119127
http: {
120128
registerOnPreAuth: HttpServiceSetup['registerOnPreAuth'];

src/core/server/plugins/plugin_context.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ export function createPluginSetupContext<TPlugin, TPluginDependencies>(
115115
elasticsearch: {
116116
adminClient$: deps.elasticsearch.adminClient$,
117117
dataClient$: deps.elasticsearch.dataClient$,
118+
createClient: deps.elasticsearch.createClient,
118119
},
119120
http: {
120121
registerOnPreAuth: deps.http.registerOnPreAuth,

src/core/server/server.api.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ export interface CoreSetup {
8989
elasticsearch: {
9090
adminClient$: Observable<ClusterClient>;
9191
dataClient$: Observable<ClusterClient>;
92+
createClient: (type: string, clientConfig?: Partial<ElasticsearchClientConfig>) => ClusterClient;
9293
};
9394
// (undocumented)
9495
http: {

0 commit comments

Comments
 (0)