-
Notifications
You must be signed in to change notification settings - Fork 8.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into saved-objects-fix-proxie-tests
- Loading branch information
Showing
211 changed files
with
4,287 additions
and
642 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,3 @@ | ||
| [ | ||
| "x-pack/plugins/watcher/jest.config.js", | ||
| "src/core/server/integration_tests/ui_settings/jest.integration.config.js" | ||
| "x-pack/plugins/watcher/jest.config.js" | ||
| ] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| xpack.serverless.plugin.developer.projectSwitcher.currentType: 'search' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,2 @@ | ||
| xpack.infra.logs.app_target: discover | ||
| xpack.serverless.plugin.developer.projectSwitcher.currentType: 'observability' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| xpack.serverless.plugin.developer.projectSwitcher.currentType: 'security' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,19 @@ | ||
| newsfeed.enabled: false | ||
| xpack.security.showNavLinks: false | ||
| xpack.serverless.plugin.enabled: true | ||
| xpack.fleet.enableExperimental: ['fleetServerStandalone'] | ||
| xpack.fleet.internal.disableILMPolicies: true | ||
|
|
||
| # Management team plugins | ||
| xpack.upgrade_assistant.enabled: false | ||
| xpack.rollup.enabled: false | ||
| xpack.watcher.enabled: false | ||
| xpack.ccr.enabled: false | ||
| xpack.ilm.enabled: false | ||
| xpack.remote_clusters.enabled: false | ||
| xpack.snapshot_restore.enabled: false | ||
| xpack.license_management.enabled: false | ||
|
|
||
| # Other disabled plugins | ||
| xpack.canvas.enabled: false | ||
| xpack.reporting.enabled: false |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
90 changes: 90 additions & 0 deletions
90
packages/core/chrome/core-chrome-browser-internal/src/ui/project/header.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License | ||
| * 2.0 and the Server Side Public License, v 1; you may not use this file except | ||
| * in compliance with, at your election, the Elastic License 2.0 or the Server | ||
| * Side Public License, v 1. | ||
| */ | ||
|
|
||
| import React from 'react'; | ||
| import { Router } from 'react-router-dom'; | ||
| import { EuiHeader, EuiHeaderLogo, EuiHeaderSection, EuiHeaderSectionItem } from '@elastic/eui'; | ||
| import { | ||
| ChromeBreadcrumb, | ||
| ChromeGlobalHelpExtensionMenuLink, | ||
| ChromeHelpExtension, | ||
| ChromeNavControl, | ||
| } from '@kbn/core-chrome-browser/src'; | ||
| import { Observable } from 'rxjs'; | ||
| import { MountPoint } from '@kbn/core-mount-utils-browser'; | ||
| import { InternalApplicationStart } from '@kbn/core-application-browser-internal'; | ||
| import { HeaderBreadcrumbs } from '../header/header_breadcrumbs'; | ||
| import { HeaderActionMenu } from '../header/header_action_menu'; | ||
| import { HeaderHelpMenu } from '../header/header_help_menu'; | ||
| import { HeaderNavControls } from '../header/header_nav_controls'; | ||
| import { ProjectNavigation } from './navigation'; | ||
|
|
||
| interface Props { | ||
| breadcrumbs$: Observable<ChromeBreadcrumb[]>; | ||
| actionMenu$: Observable<MountPoint | undefined>; | ||
| kibanaDocLink: string; | ||
| globalHelpExtensionMenuLinks$: Observable<ChromeGlobalHelpExtensionMenuLink[]>; | ||
| helpExtension$: Observable<ChromeHelpExtension | undefined>; | ||
| helpSupportUrl$: Observable<string>; | ||
| kibanaVersion: string; | ||
| application: InternalApplicationStart; | ||
| navControlsRight$: Observable<ChromeNavControl[]>; | ||
| } | ||
|
|
||
| export const ProjectHeader = ({ | ||
| application, | ||
| kibanaDocLink, | ||
| kibanaVersion, | ||
| ...observables | ||
| }: Props) => { | ||
| const renderLogo = () => ( | ||
| <EuiHeaderLogo | ||
| iconType="logoElastic" | ||
| href="#" | ||
| onClick={(e) => e.preventDefault()} | ||
| aria-label="Go to home page" | ||
| /> | ||
| ); | ||
|
|
||
| return ( | ||
| <> | ||
| <EuiHeader position="fixed"> | ||
| <EuiHeaderSection grow={false}> | ||
| <EuiHeaderSectionItem border="right">{renderLogo()}</EuiHeaderSectionItem> | ||
| <EuiHeaderSectionItem> | ||
| <HeaderBreadcrumbs breadcrumbs$={observables.breadcrumbs$} /> | ||
| </EuiHeaderSectionItem> | ||
| </EuiHeaderSection> | ||
| <EuiHeaderSection side="right"> | ||
| <EuiHeaderSectionItem> | ||
| <HeaderHelpMenu | ||
| globalHelpExtensionMenuLinks$={observables.globalHelpExtensionMenuLinks$} | ||
| helpExtension$={observables.helpExtension$} | ||
| helpSupportUrl$={observables.helpSupportUrl$} | ||
| kibanaDocLink={kibanaDocLink} | ||
| kibanaVersion={kibanaVersion} | ||
| navigateToUrl={application.navigateToUrl} | ||
| /> | ||
| </EuiHeaderSectionItem> | ||
| <EuiHeaderSectionItem border="left"> | ||
| <HeaderActionMenu actionMenu$={observables.actionMenu$} /> | ||
| </EuiHeaderSectionItem> | ||
|
|
||
| <EuiHeaderSectionItem> | ||
| <HeaderNavControls navControls$={observables.navControlsRight$} /> | ||
| </EuiHeaderSectionItem> | ||
| </EuiHeaderSection> | ||
| </EuiHeader> | ||
| <Router history={application.history}> | ||
| <ProjectNavigation> | ||
| <span /> | ||
| </ProjectNavigation> | ||
| </Router> | ||
| </> | ||
| ); | ||
| }; |
Oops, something went wrong.