Skip to content

Commit

Permalink
Merge branch 'main' into short-urls/new-error-page
Browse files Browse the repository at this point in the history
  • Loading branch information
tsullivan authored Nov 28, 2023
2 parents b0f932a + 59eb614 commit e5813ec
Show file tree
Hide file tree
Showing 142 changed files with 2,375 additions and 1,006 deletions.
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -566,6 +566,7 @@ packages/kbn-osquery-io-ts-types @elastic/security-asset-management
x-pack/plugins/osquery @elastic/security-defend-workflows
examples/partial_results_example @elastic/kibana-data-discovery
x-pack/plugins/painless_lab @elastic/platform-deployment-management
packages/kbn-panel-loader @elastic/kibana-presentation
packages/kbn-peggy @elastic/kibana-operations
packages/kbn-peggy-loader @elastic/kibana-operations
packages/kbn-performance-testing-dataset-extractor @elastic/kibana-performance-testing
Expand Down
2 changes: 1 addition & 1 deletion docs/developer/plugin-list.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -672,7 +672,7 @@ Elastic.
|This plugin allows for other plugins to add data to Kibana stack monitoring documents.
|{kib-repo}blob/{branch}/x-pack/plugins/notifications/README.md[notifications]
|{kib-repo}blob/{branch}/x-pack/plugins/notifications/README.mdx[notifications]
|The Notifications plugin provides a set of services to help Solutions and plugins send notifications to users.
Expand Down
3 changes: 1 addition & 2 deletions docs/setup/settings.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -323,8 +323,7 @@ run {kib} in different modes. Valid options are `background_tasks` and `ui`,
or `*` to select all roles. *Default: `*`*

`notifications.connectors.default.email`::
Specifies the name of the connector that is used to send email notifications.
In {ecloud}, the default value is `elastic-cloud-email`.
Choose the default email connector for user notifications. As of `8.6.0`, {kib} is shipping with a new notification mechanism that will send email notifications for various user actions, e.g. assigning a _Case_ to a user. To enable notifications, an email connector must be <<pre-configured-connectors,preconfigured>> in the system via `kibana.yml`, and the notifications plugin must be configured to point to the ID of that connector.

[[path-data]] `path.data`::
The path where {kib} stores persistent data
Expand Down
3 changes: 3 additions & 0 deletions nav-kibana-dev.docnav.json
Original file line number Diff line number Diff line change
Expand Up @@ -425,6 +425,9 @@
{
"id": "kibNewsfeedPluginApi"
},
{
"id": "kibNotificationsPluginApi"
},
{
"id": "kibObservabilityPluginApi"
},
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -581,6 +581,7 @@
"@kbn/osquery-plugin": "link:x-pack/plugins/osquery",
"@kbn/paertial-results-example-plugin": "link:examples/partial_results_example",
"@kbn/painless-lab-plugin": "link:x-pack/plugins/painless_lab",
"@kbn/panel-loader": "link:packages/kbn-panel-loader",
"@kbn/portable-dashboards-example": "link:examples/portable_dashboards_example",
"@kbn/preboot-example-plugin": "link:examples/preboot_example",
"@kbn/presentation-util-plugin": "link:src/plugins/presentation_util",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,12 @@ describe('mapNodesVersionCompatibility', () => {
return { nodes: { 'node-without-http': { version, ip: 'ip' } } } as any;
}

it('returns isCompatible=false with a single node with non-SemVer-compliant version', async () => {
const nodesInfo = createNodes('615c621a8416c444941dc97b142a0122d5c878d0');
const result = await mapNodesVersionCompatibility(nodesInfo, KIBANA_VERSION, false);
expect(result.isCompatible).toBe(false);
});

it('returns isCompatible=true with a single node that matches', async () => {
const nodesInfo = createNodes('5.1.0');
const result = await mapNodesVersionCompatibility(nodesInfo, KIBANA_VERSION, false);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,12 @@ describe('plugins/elasticsearch', () => {
it('when majors are equal, but ES minor is less than Kibana minor', () => {
expect(esVersionCompatibleWithKibana('1.0.0', '1.1.0')).toBe(false);
});

it('ES is not SemVer-compliant', () => {
expect(
esVersionCompatibleWithKibana('615c621a8416c444941dc97b142a0122d5c878d0', '1.1.0')
).toBe(false);
});
});

describe('returns true', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ import semver, { coerce } from 'semver';
* 2. Older versions of ES won't work with newer versions of Kibana.
*/
export function esVersionCompatibleWithKibana(esVersion: string, kibanaVersion: string) {
if (!semver.valid(esVersion)) {
return false;
}

const esVersionNumbers = {
major: semver.major(esVersion),
minor: semver.minor(esVersion),
Expand Down
Loading

0 comments on commit e5813ec

Please sign in to comment.