-
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 remote-tracking branch 'upstream/master' into ingest-overview-page
- Loading branch information
Showing
26 changed files
with
510 additions
and
461 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
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 was deleted.
Oops, something went wrong.
16 changes: 0 additions & 16 deletions
16
x-pack/legacy/plugins/tilemap/public/vis_type_enhancers/update_tilemap_settings.js
This file was deleted.
Oops, something went wrong.
36 changes: 0 additions & 36 deletions
36
x-pack/legacy/plugins/tilemap/server/lib/__tests__/inspect_settings.js
This file was deleted.
Oops, something went wrong.
32 changes: 0 additions & 32 deletions
32
x-pack/legacy/plugins/tilemap/server/lib/inspect_settings.js
This file was deleted.
Oops, something went wrong.
File renamed without changes.
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,8 @@ | ||
| { | ||
| "id": "mapsLegacyLicensing", | ||
| "version": "8.0.0", | ||
| "kibanaVersion": "kibana", | ||
| "server": false, | ||
| "ui": true, | ||
| "requiredPlugins": ["licensing", "mapsLegacy"] | ||
| } |
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,11 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License; | ||
| * you may not use this file except in compliance with the Elastic License. | ||
| */ | ||
|
|
||
| import { MapsLegacyLicensing } from './plugin'; | ||
|
|
||
| export function plugin() { | ||
| return new MapsLegacyLicensing(); | ||
| } |
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,49 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License; | ||
| * you may not use this file except in compliance with the Elastic License. | ||
| */ | ||
|
|
||
| import { CoreSetup, CoreStart, Plugin } from 'kibana/public'; | ||
| import { LicensingPluginSetup, ILicense } from '../../licensing/public'; | ||
|
|
||
| /** | ||
| * These are the interfaces with your public contracts. You should export these | ||
| * for other plugins to use in _their_ `SetupDeps`/`StartDeps` interfaces. | ||
| * @public | ||
| */ | ||
|
|
||
| // eslint-disable-next-line @typescript-eslint/no-empty-interface | ||
| export interface MapsLegacyLicensingSetupDependencies { | ||
| licensing: LicensingPluginSetup; | ||
| mapsLegacy: any; | ||
| } | ||
| // eslint-disable-next-line @typescript-eslint/no-empty-interface | ||
| export interface MapsLegacyLicensingStartDependencies {} | ||
|
|
||
| export type MapsLegacyLicensingSetup = ReturnType<MapsLegacyLicensing['setup']>; | ||
| export type MapsLegacyLicensingStart = ReturnType<MapsLegacyLicensing['start']>; | ||
|
|
||
| export class MapsLegacyLicensing | ||
| implements Plugin<MapsLegacyLicensingSetup, MapsLegacyLicensingStart> { | ||
| public setup(core: CoreSetup, plugins: MapsLegacyLicensingSetupDependencies) { | ||
| const { | ||
| licensing, | ||
| mapsLegacy: { serviceSettings }, | ||
| } = plugins; | ||
| if (licensing) { | ||
| licensing.license$.subscribe((license: ILicense) => { | ||
| const { uid, isActive } = license; | ||
| if (isActive && license.hasAtLeast('basic')) { | ||
| serviceSettings.setQueryParams({ license: uid }); | ||
| serviceSettings.disableZoomMessage(); | ||
| } else { | ||
| serviceSettings.setQueryParams({ license: undefined }); | ||
| serviceSettings.enableZoomMessage(); | ||
| } | ||
| }); | ||
| } | ||
| } | ||
|
|
||
| public start(core: CoreStart, plugins: MapsLegacyLicensingStartDependencies) {} | ||
| } |
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
12 changes: 11 additions & 1 deletion
12
...rs_actions_ui/public/application/components/builtin_alert_types/threshold/expression.scss
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,3 +1,13 @@ | ||
| .actAlertVisualization__chart { | ||
| height: $euiSize * 15; | ||
| height: $euiSize * 14; | ||
| } | ||
|
|
||
| .actAddAlertSteps { | ||
| .euiStep__titleWrapper { | ||
| align-items: center; | ||
| } | ||
|
|
||
| .euiStep__title { | ||
| @include euiTitle('xs'); | ||
| } | ||
| } |
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
Oops, something went wrong.