Skip to content

Commit 844897b

Browse files
kibanamachinekibanamachine
authored
Merge branch 'main' into tests/unskip-cit-ccr-follower-indices
2 parents adf2f89 + 3fa1750 commit 844897b

84 files changed

Lines changed: 233 additions & 166 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.

‎dev_docs/tutorials/expressions.mdx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ const result = await executionContract.getData();
5757
```
5858
5959
<DocCallOut>
60-
Check the full spec of execute function [here](https://github.com/elastic/kibana/blob/main/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.execution.md)
60+
Check the full spec of execute function <DocLink id="kibExpressionsPluginApi" section="def-common.ExpressionsService.execute" text="here" />
6161
</DocCallOut>
6262
6363
In addition, on the browser side, there are two additional ways to run expressions and render the results.
@@ -71,7 +71,7 @@ This is the easiest way to get expressions rendered inside your application.
7171
```
7272
7373
<DocCallOut>
74-
Check the full spec of ReactExpressionRenderer component props [here](https://github.com/elastic/kibana/blob/main/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.reactexpressionrendererprops.md)
74+
Check the full spec of ReactExpressionRenderer component props <DocLink id="kibExpressionsPluginApi" section="def-public.ReactExpressionRendererProps" text="here" />
7575
</DocCallOut>
7676
7777
#### Expression loader
@@ -83,7 +83,7 @@ const handler = loader(domElement, expression, params);
8383
```
8484
8585
<DocCallOut>
86-
Check the full spec of expression loader params [here](https://github.com/elastic/kibana/blob/main/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.iexpressionloaderparams.md)
86+
Check the full spec of expression loader params <DocLink id="kibExpressionsPluginApi" section="def-public.IExpressionLoaderParams" text="here" />
8787
</DocCallOut>
8888
8989
### Creating new expression functions
@@ -106,7 +106,7 @@ expressions.registerFunction(functionDefinition);
106106
```
107107
108108
<DocCallOut>
109-
Check the full interface of ExpressionFuntionDefinition [here](https://github.com/elastic/kibana/blob/main/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionfunctiondefinition.md)
109+
Check the full interface of ExpressionFuntionDefinition <DocLink id="kibExpressionsPluginApi" section="def-common.ExpressionFunctionDefinition" text="here" />
110110
</DocCallOut>
111111
112112
### Creating new expression renderers
@@ -128,5 +128,5 @@ expressions.registerRenderer(rendererDefinition);
128128
```
129129
130130
<DocCallOut>
131-
Check the full interface of ExpressionRendererDefinition [here](https://github.com/elastic/kibana/blob/main/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionrenderdefinition.md)
131+
Check the full interface of ExpressionRendererDefinition <DocLink id="kibExpressionsPluginApi" section="def-common.ExpressionRenderDefinition" text="here" />
132132
</DocCallOut>

‎docs/user/commands/cli-commands.asciidoc‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
[[cli-commands]]
2+
== Command line tools
3+
4+
{kib} provides the following tools for configuring security and performing other tasks from the command line:
5+
6+
* <<kibana-verification-code,`kibana-verification-code`>>
7+
8+
include::kibana-verification-code.asciidoc[]

‎docs/user/commands/kibana-verification-code.asciidoc‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
[[kibana-verification-code]]
2+
=== kibana-verification-code
3+
4+
The `kibana-verification-code` tool retrieves a verification code for enrolling
5+
a {kib} instance with a secured {es} cluster.
6+
7+
[discrete]
8+
==== Synopsis
9+
10+
[source,shell]
11+
----
12+
bin/kibana-verification-code
13+
[-V, --version] [-h, --help]
14+
----
15+
16+
[discrete]
17+
==== Description
18+
19+
Use this command to retrieve a verification code for {kib}. You enter this code
20+
in {kib} when manually configuring a secure connection with an {es} cluster.
21+
This tool is useful if you don’t have access to the {kib} terminal output, such
22+
as on a hosted environment. You can connect to a machine where {kib} is
23+
running (such as using SSH) and retrieve a verification code that you enter in
24+
{kib}.
25+
26+
IMPORTANT: You must run this tool on the same machine where {kib} is running.
27+
28+
[discrete]
29+
[[kibana-verification-code-parameters]]
30+
==== Parameters
31+
32+
`-h, --help`:: Returns all of the command parameters.
33+
34+
`-V, --version`:: Displays the {kib} version number.
35+
36+
[discrete]
37+
==== Examples
38+
39+
The following command retrieves a verification code for {kib}.
40+
41+
[source,shell]
42+
----
43+
bin/kibana-verification-code
44+
----

‎docs/user/setup.asciidoc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,3 +70,5 @@ include::monitoring/configuring-monitoring.asciidoc[leveloffset=+1]
7070
include::monitoring/monitoring-metricbeat.asciidoc[leveloffset=+2]
7171
include::monitoring/viewing-metrics.asciidoc[leveloffset=+2]
7272
include::monitoring/monitoring-kibana.asciidoc[leveloffset=+2]
73+
74+
include::commands/cli-commands.asciidoc[]

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@
100100
"@dnd-kit/core": "^3.1.1",
101101
"@dnd-kit/sortable": "^4.0.0",
102102
"@dnd-kit/utilities": "^2.0.0",
103-
"@elastic/apm-rum": "^5.9.1",
104-
"@elastic/apm-rum-react": "^1.3.1",
103+
"@elastic/apm-rum": "^5.10.0",
104+
"@elastic/apm-rum-react": "^1.3.2",
105105
"@elastic/apm-synthtrace": "link:bazel-bin/packages/elastic-apm-synthtrace",
106106
"@elastic/charts": "40.1.0",
107107
"@elastic/datemath": "link:bazel-bin/packages/elastic-datemath",
@@ -226,7 +226,7 @@
226226
"deep-freeze-strict": "^1.1.1",
227227
"deepmerge": "^4.2.2",
228228
"del": "^5.1.0",
229-
"elastic-apm-node": "^3.25.0",
229+
"elastic-apm-node": "^3.26.0",
230230
"execa": "^4.0.2",
231231
"exit-hook": "^2.2.0",
232232
"expiry-js": "0.1.7",

‎src/core/public/apm_system.test.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
jest.mock('@elastic/apm-rum');
1010
import type { DeeplyMockedKeys, MockedKeys } from '@kbn/utility-types/jest';
1111
import { init, apm } from '@elastic/apm-rum';
12+
import type { Transaction } from '@elastic/apm-rum';
1213
import { ApmSystem } from './apm_system';
1314
import { Subject } from 'rxjs';
1415
import { InternalApplicationStart } from './application/types';

‎src/core/public/apm_system.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Side Public License, v 1.
77
*/
88

9-
import type { ApmBase, AgentConfigOptions } from '@elastic/apm-rum';
9+
import type { ApmBase, AgentConfigOptions, Transaction } from '@elastic/apm-rum';
1010
import { modifyUrl } from '@kbn/std';
1111
import { CachedResourceObserver } from './apm_resource_counter';
1212
import type { InternalApplicationStart } from './application';

‎src/dev/build/tasks/build_kibana_example_plugins.ts‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,23 @@ import { exec, mkdirp, copyAll, Task } from '../lib';
1313

1414
export const BuildKibanaExamplePlugins: Task = {
1515
description: 'Building distributable versions of Kibana example plugins',
16-
async run(config, log, build) {
17-
const examplesDir = Path.resolve(REPO_ROOT, 'examples');
16+
async run(config, log) {
1817
const args = [
19-
'../../scripts/plugin_helpers',
18+
Path.resolve(REPO_ROOT, 'scripts/plugin_helpers'),
2019
'build',
2120
`--kibana-version=${config.getBuildVersion()}`,
2221
];
2322

24-
const folders = Fs.readdirSync(examplesDir, { withFileTypes: true })
25-
.filter((f) => f.isDirectory())
26-
.map((f) => Path.resolve(REPO_ROOT, 'examples', f.name));
23+
const getExampleFolders = (dir: string) => {
24+
return Fs.readdirSync(dir, { withFileTypes: true })
25+
.filter((f) => f.isDirectory())
26+
.map((f) => Path.resolve(dir, f.name));
27+
};
28+
29+
const folders = [
30+
...getExampleFolders(Path.resolve(REPO_ROOT, 'examples')),
31+
...getExampleFolders(Path.resolve(REPO_ROOT, 'x-pack/examples')),
32+
];
2733

2834
for (const examplePlugin of folders) {
2935
try {
@@ -40,8 +46,8 @@ export const BuildKibanaExamplePlugins: Task = {
4046

4147
const pluginsDir = config.resolveFromTarget('example_plugins');
4248
await mkdirp(pluginsDir);
43-
await copyAll(examplesDir, pluginsDir, {
44-
select: ['*/build/*.zip'],
49+
await copyAll(REPO_ROOT, pluginsDir, {
50+
select: ['examples/*/build/*.zip', 'x-pack/examples/*/build/*.zip'],
4551
});
4652
},
4753
};

‎src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ export class DashboardContainer extends Container<InheritedChildInput, Dashboard
101101

102102
private onDestroyControlGroup?: () => void;
103103
public controlGroup?: ControlGroupContainer;
104+
private domNode?: HTMLElement;
104105

105106
public getPanelCount = () => {
106107
return Object.keys(this.getInput().panels).length;
@@ -258,6 +259,10 @@ export class DashboardContainer extends Container<InheritedChildInput, Dashboard
258259
}
259260

260261
public render(dom: HTMLElement) {
262+
if (this.domNode) {
263+
ReactDOM.unmountComponentAtNode(this.domNode);
264+
}
265+
this.domNode = dom;
261266
ReactDOM.render(
262267
<I18nProvider>
263268
<KibanaContextProvider services={this.services}>
@@ -275,6 +280,7 @@ export class DashboardContainer extends Container<InheritedChildInput, Dashboard
275280
public destroy() {
276281
super.destroy();
277282
this.onDestroyControlGroup?.();
283+
if (this.domNode) ReactDOM.unmountComponentAtNode(this.domNode);
278284
}
279285

280286
protected getInheritedInput(id: string): InheritedChildInput {

‎src/plugins/dashboard/public/application/lib/diff_dashboard_state.ts‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,15 @@ export const diffDashboardState = (
4141
const common = commonDiffFilters<DashboardState>(
4242
original as unknown as DashboardDiffCommonFilters,
4343
newState as unknown as DashboardDiffCommonFilters,
44-
['viewMode', 'panels', 'options', 'savedQuery', 'expandedPanelId', 'controlGroupInput'],
44+
[
45+
'viewMode',
46+
'panels',
47+
'options',
48+
'fullScreenMode',
49+
'savedQuery',
50+
'expandedPanelId',
51+
'controlGroupInput',
52+
],
4553
true
4654
);
4755

0 commit comments

Comments
 (0)