Skip to content

Commit 2b87bc2

Browse files
author
Thomas Watson
authored
Merge branch 'main' into fix-eslintrc
2 parents 197570b + d6b8e4b commit 2b87bc2

File tree

285 files changed

+10192
-4232
lines changed

Some content is hidden

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

285 files changed

+10192
-4232
lines changed

.buildkite/scripts/steps/es_snapshots/build.sh

+17-1
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ echo "--- Build Elasticsearch"
6969
:distribution:archives:darwin-aarch64-tar:assemble \
7070
:distribution:archives:darwin-tar:assemble \
7171
:distribution:docker:docker-export:assemble \
72+
:distribution:docker:cloud-docker-export:assemble \
7273
:distribution:archives:linux-aarch64-tar:assemble \
7374
:distribution:archives:linux-tar:assemble \
7475
:distribution:archives:windows-zip:assemble \
@@ -79,11 +80,26 @@ find distribution -type f \( -name 'elasticsearch-*-*-*-*.tar.gz' -o -name 'elas
7980

8081
ls -alh "$destination"
8182

82-
echo "--- Create docker image archives"
83+
echo "--- Create docker default image archives"
8384
docker images "docker.elastic.co/elasticsearch/elasticsearch"
8485
docker images "docker.elastic.co/elasticsearch/elasticsearch" --format "{{.Tag}}" | xargs -n1 echo 'docker save docker.elastic.co/elasticsearch/elasticsearch:${0} | gzip > ../es-build/elasticsearch-${0}-docker-image.tar.gz'
8586
docker images "docker.elastic.co/elasticsearch/elasticsearch" --format "{{.Tag}}" | xargs -n1 bash -c 'docker save docker.elastic.co/elasticsearch/elasticsearch:${0} | gzip > ../es-build/elasticsearch-${0}-docker-image.tar.gz'
8687

88+
echo "--- Create kibana-ci docker cloud image archives"
89+
ES_CLOUD_ID=$(docker images "docker.elastic.co/elasticsearch-ci/elasticsearch-cloud" --format "{{.ID}}")
90+
ES_CLOUD_VERSION=$(docker images "docker.elastic.co/elasticsearch-ci/elasticsearch-cloud" --format "{{.Tag}}")
91+
KIBANA_ES_CLOUD_VERSION="$ES_CLOUD_VERSION-$ELASTICSEARCH_GIT_COMMIT"
92+
KIBANA_ES_CLOUD_IMAGE="docker.elastic.co/kibana-ci/elasticsearch-cloud:$KIBANA_ES_CLOUD_VERSION"
93+
94+
docker tag "$ES_CLOUD_ID" "$KIBANA_ES_CLOUD_IMAGE"
95+
96+
echo "$KIBANA_DOCKER_PASSWORD" | docker login -u "$KIBANA_DOCKER_USERNAME" --password-stdin docker.elastic.co
97+
trap 'docker logout docker.elastic.co' EXIT
98+
docker image push "$KIBANA_ES_CLOUD_IMAGE"
99+
100+
export ELASTICSEARCH_CLOUD_IMAGE="$KIBANA_ES_CLOUD_IMAGE"
101+
export ELASTICSEARCH_CLOUD_IMAGE_CHECKSUM="$(docker images "$KIBANA_ES_CLOUD_IMAGE" --format "{{.Digest}}")"
102+
87103
echo "--- Create checksums for snapshot files"
88104
cd "$destination"
89105
find ./* -exec bash -c "shasum -a 512 {} > {}.sha512" \;

.buildkite/scripts/steps/es_snapshots/create_manifest.js

+13
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ const { BASE_BUCKET_DAILY } = require('./bucket_config.js');
1616
const destination = process.argv[2] || __dirname + '/test';
1717

1818
const ES_BRANCH = process.env.ELASTICSEARCH_BRANCH;
19+
const ES_CLOUD_IMAGE = process.env.ELASTICSEARCH_CLOUD_IMAGE;
20+
const ES_CLOUD_IMAGE_CHECKSUM = process.env.ELASTICSEARCH_CLOUD_IMAGE_CHECKSUM;
1921
const GIT_COMMIT = process.env.ELASTICSEARCH_GIT_COMMIT;
2022
const GIT_COMMIT_SHORT = process.env.ELASTICSEARCH_GIT_COMMIT_SHORT;
2123

@@ -59,6 +61,17 @@ const { BASE_BUCKET_DAILY } = require('./bucket_config.js');
5961
};
6062
});
6163

64+
if (ES_CLOUD_IMAGE && ES_CLOUD_IMAGE_CHECKSUM) {
65+
manifestEntries.push({
66+
checksum: ES_CLOUD_IMAGE_CHECKSUM,
67+
url: ES_CLOUD_IMAGE,
68+
version: VERSION,
69+
platform: 'docker',
70+
architecture: 'image',
71+
license: 'default',
72+
});
73+
}
74+
6275
const manifest = {
6376
id: SNAPSHOT_ID,
6477
bucket: `${BASE_BUCKET_DAILY}/${DESTINATION}`.toString(),

docs/development/core/public/kibana-plugin-core-public.applicationstart.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@ export interface ApplicationStart
2525
| --- | --- |
2626
| [getUrlForApp(appId, options)](./kibana-plugin-core-public.applicationstart.geturlforapp.md) | Returns the absolute path (or URL) to a given app, including the global base path.<!-- -->By default, it returns the absolute path of the application (e.g <code>/basePath/app/my-app</code>). Use the <code>absolute</code> option to generate an absolute url instead (e.g <code>http://host:port/basePath/app/my-app</code>)<!-- -->Note that when generating absolute urls, the origin (protocol, host and port) are determined from the browser's current location. |
2727
| [navigateToApp(appId, options)](./kibana-plugin-core-public.applicationstart.navigatetoapp.md) | Navigate to a given app |
28-
| [navigateToUrl(url)](./kibana-plugin-core-public.applicationstart.navigatetourl.md) | Navigate to given URL in a SPA friendly way when possible (when the URL will redirect to a valid application within the current basePath).<!-- -->The method resolves pathnames the same way browsers do when resolving a <code>&lt;a href&gt;</code> value. The provided <code>url</code> can be: - an absolute URL - an absolute path - a path relative to the current URL (window.location.href)<!-- -->If all these criteria are true for the given URL: - (only for absolute URLs) The origin of the URL matches the origin of the browser's current location - The resolved pathname of the provided URL/path starts with the current basePath (eg. /mybasepath/s/my-space) - The pathname segment after the basePath matches any known application route (eg. /app/<id>/ or any application's <code>appRoute</code> configuration)<!-- -->Then a SPA navigation will be performed using <code>navigateToApp</code> using the corresponding application and path. Otherwise, fallback to a full page reload to navigate to the url using <code>window.location.assign</code> |
28+
| [navigateToUrl(url, options)](./kibana-plugin-core-public.applicationstart.navigatetourl.md) | Navigate to given URL in a SPA friendly way when possible (when the URL will redirect to a valid application within the current basePath).<!-- -->The method resolves pathnames the same way browsers do when resolving a <code>&lt;a href&gt;</code> value. The provided <code>url</code> can be: - an absolute URL - an absolute path - a path relative to the current URL (window.location.href)<!-- -->If all these criteria are true for the given URL: - (only for absolute URLs) The origin of the URL matches the origin of the browser's current location - The resolved pathname of the provided URL/path starts with the current basePath (eg. /mybasepath/s/my-space) - The pathname segment after the basePath matches any known application route (eg. /app/<id>/ or any application's <code>appRoute</code> configuration)<!-- -->Then a SPA navigation will be performed using <code>navigateToApp</code> using the corresponding application and path. Otherwise, fallback to a full page reload to navigate to the url using <code>window.location.assign</code> |
2929

docs/development/core/public/kibana-plugin-core-public.applicationstart.navigatetourl.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,15 @@ Then a SPA navigation will be performed using `navigateToApp` using the correspo
1515
<b>Signature:</b>
1616

1717
```typescript
18-
navigateToUrl(url: string): Promise<void>;
18+
navigateToUrl(url: string, options?: NavigateToUrlOptions): Promise<void>;
1919
```
2020

2121
## Parameters
2222

2323
| Parameter | Type | Description |
2424
| --- | --- | --- |
2525
| url | string | an absolute URL, an absolute path or a relative path, to navigate to. |
26+
| options | NavigateToUrlOptions | |
2627

2728
<b>Returns:</b>
2829

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

+1
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
8585
| [IHttpResponseInterceptorOverrides](./kibana-plugin-core-public.ihttpresponseinterceptoroverrides.md) | Properties that can be returned by HttpInterceptor.request to override the response. |
8686
| [IUiSettingsClient](./kibana-plugin-core-public.iuisettingsclient.md) | Client-side client that provides access to the advanced settings stored in elasticsearch. The settings provide control over the behavior of the Kibana application. For example, a user can specify how to display numeric or date fields. Users can adjust the settings via Management UI. [IUiSettingsClient](./kibana-plugin-core-public.iuisettingsclient.md) |
8787
| [NavigateToAppOptions](./kibana-plugin-core-public.navigatetoappoptions.md) | Options for the [navigateToApp API](./kibana-plugin-core-public.applicationstart.navigatetoapp.md) |
88+
| [NavigateToUrlOptions](./kibana-plugin-core-public.navigatetourloptions.md) | Options for the [navigateToUrl API](./kibana-plugin-core-public.applicationstart.navigatetourl.md) |
8889
| [NotificationsSetup](./kibana-plugin-core-public.notificationssetup.md) | |
8990
| [NotificationsStart](./kibana-plugin-core-public.notificationsstart.md) | |
9091
| [OverlayBannersStart](./kibana-plugin-core-public.overlaybannersstart.md) | |

docs/development/core/public/kibana-plugin-core-public.navigatetoappoptions.md

+1
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,6 @@ export interface NavigateToAppOptions
2020
| [openInNewTab?](./kibana-plugin-core-public.navigatetoappoptions.openinnewtab.md) | boolean | <i>(Optional)</i> if true, will open the app in new tab, will share session information via window.open if base |
2121
| [path?](./kibana-plugin-core-public.navigatetoappoptions.path.md) | string | <i>(Optional)</i> optional path inside application to deep link to. If undefined, will use [the app's default path](./kibana-plugin-core-public.app.defaultpath.md) as default. |
2222
| [replace?](./kibana-plugin-core-public.navigatetoappoptions.replace.md) | boolean | <i>(Optional)</i> if true, will not create a new history entry when navigating (using <code>replace</code> instead of <code>push</code>) |
23+
| [skipAppLeave?](./kibana-plugin-core-public.navigatetoappoptions.skipappleave.md) | boolean | <i>(Optional)</i> if true, will bypass the default onAppLeave behavior |
2324
| [state?](./kibana-plugin-core-public.navigatetoappoptions.state.md) | unknown | <i>(Optional)</i> optional state to forward to the application |
2425

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-core-public](./kibana-plugin-core-public.md) &gt; [NavigateToAppOptions](./kibana-plugin-core-public.navigatetoappoptions.md) &gt; [skipAppLeave](./kibana-plugin-core-public.navigatetoappoptions.skipappleave.md)
4+
5+
## NavigateToAppOptions.skipAppLeave property
6+
7+
if true, will bypass the default onAppLeave behavior
8+
9+
<b>Signature:</b>
10+
11+
```typescript
12+
skipAppLeave?: boolean;
13+
```
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-core-public](./kibana-plugin-core-public.md) &gt; [NavigateToUrlOptions](./kibana-plugin-core-public.navigatetourloptions.md) &gt; [forceRedirect](./kibana-plugin-core-public.navigatetourloptions.forceredirect.md)
4+
5+
## NavigateToUrlOptions.forceRedirect property
6+
7+
if true, will redirect directly to the url
8+
9+
<b>Signature:</b>
10+
11+
```typescript
12+
forceRedirect?: boolean;
13+
```
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<!-- Do not edit this file. It is automatically generated by API Documenter. -->
2+
3+
[Home](./index.md) &gt; [kibana-plugin-core-public](./kibana-plugin-core-public.md) &gt; [NavigateToUrlOptions](./kibana-plugin-core-public.navigatetourloptions.md)
4+
5+
## NavigateToUrlOptions interface
6+
7+
Options for the [navigateToUrl API](./kibana-plugin-core-public.applicationstart.navigatetourl.md)
8+
9+
<b>Signature:</b>
10+
11+
```typescript
12+
export interface NavigateToUrlOptions
13+
```
14+
15+
## Properties
16+
17+
| Property | Type | Description |
18+
| --- | --- | --- |
19+
| [forceRedirect?](./kibana-plugin-core-public.navigatetourloptions.forceredirect.md) | boolean | <i>(Optional)</i> if true, will redirect directly to the url |
20+
| [skipAppLeave?](./kibana-plugin-core-public.navigatetourloptions.skipappleave.md) | boolean | <i>(Optional)</i> if true, will bypass the default onAppLeave behavior |
21+
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-core-public](./kibana-plugin-core-public.md) &gt; [NavigateToUrlOptions](./kibana-plugin-core-public.navigatetourloptions.md) &gt; [skipAppLeave](./kibana-plugin-core-public.navigatetourloptions.skipappleave.md)
4+
5+
## NavigateToUrlOptions.skipAppLeave property
6+
7+
if true, will bypass the default onAppLeave behavior
8+
9+
<b>Signature:</b>
10+
11+
```typescript
12+
skipAppLeave?: boolean;
13+
```

docs/management/connectors/action-types/servicenow-sir.asciidoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<titleabbrev>ServiceNow SecOps</titleabbrev>
66
++++
77

8-
The {sn} SecOps connector uses the https://docs.servicenow.com/bundle/orlando-application-development/page/integrate/inbound-rest/concept/c_TableAPI.html[V2 Table API] to create {sn} security incidents.
8+
The {sn} SecOps connector uses the https://developer.servicenow.com/dev.do#!/reference/api/sandiego/rest/c_ImportSetAPI[Import Set API] to create {sn} security incidents.
99

1010
[float]
1111
[[servicenow-sir-connector-prerequisites]]

docs/management/connectors/action-types/servicenow.asciidoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<titleabbrev>ServiceNow ITSM</titleabbrev>
66
++++
77

8-
The {sn} ITSM connector uses the https://docs.servicenow.com/bundle/orlando-application-development/page/integrate/inbound-rest/concept/c_TableAPI.html[V2 Table API] to create {sn} incidents.
8+
The {sn} ITSM connector uses the https://developer.servicenow.com/dev.do#!/reference/api/sandiego/rest/c_ImportSetAPI[Import Set API] to create {sn} incidents.
99

1010
[float]
1111
[[servicenow-itsm-connector-prerequisites]]

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -753,7 +753,7 @@
753753
"callsites": "^3.1.0",
754754
"chai": "3.5.0",
755755
"chance": "1.0.18",
756-
"chromedriver": "^99.0.0",
756+
"chromedriver": "^100.0.0",
757757
"clean-webpack-plugin": "^3.0.0",
758758
"cmd-shim": "^2.1.0",
759759
"compression-webpack-plugin": "^4.0.0",

packages/kbn-doc-links/src/get_doc_links.ts

+1
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,7 @@ export const getDocLinks = ({ kibanaBranch }: GetDocLinkOptions): DocLinks => {
242242
asyncSearch: `${ELASTICSEARCH_DOCS}async-search-intro.html`,
243243
dataStreams: `${ELASTICSEARCH_DOCS}data-streams.html`,
244244
deprecationLogging: `${ELASTICSEARCH_DOCS}logging.html#deprecation-logging`,
245+
createIndex: `${ELASTICSEARCH_DOCS}indices-create-index.html`,
245246
frozenIndices: `${ELASTICSEARCH_DOCS}frozen-indices.html`,
246247
gettingStarted: `${ELASTICSEARCH_DOCS}getting-started.html`,
247248
hiddenIndices: `${ELASTICSEARCH_DOCS}multi-index.html#hidden`,

packages/kbn-shared-ux-components/src/index.ts

+17
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,23 @@ export const LazyIconButtonGroup = React.lazy(() =>
9595
*/
9696
export const IconButtonGroup = withSuspense(LazyIconButtonGroup);
9797

98+
/**
99+
* The lazily loaded `KibanaPageTemplateSolutionNav` component that is wrapped by the `withSuspense` HOC. Consumers should use
100+
* `React.Suspense` or `withSuspense` HOC to load this component.
101+
*/
102+
export const KibanaPageTemplateSolutionNavLazy = React.lazy(() =>
103+
import('./page_template/solution_nav').then(({ KibanaPageTemplateSolutionNav }) => ({
104+
default: KibanaPageTemplateSolutionNav,
105+
}))
106+
);
107+
108+
/**
109+
* A `KibanaPageTemplateSolutionNav` component that is wrapped by the `withSuspense` HOC. This component can
110+
* be used directly by consumers and will load the `KibanaPageTemplateSolutionNavLazy` component lazily with
111+
* a predefined fallback and error boundary.
112+
*/
113+
export const KibanaPageTemplateSolutionNav = withSuspense(KibanaPageTemplateSolutionNavLazy);
114+
98115
/**
99116
* The Lazily-loaded `KibanaSolutionAvatar` component. Consumers should use `React.Suspense` or
100117
* the withSuspense` HOC to load this component.

0 commit comments

Comments
 (0)