github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 17:28:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

[8.10] [Cases] Add contentManagement dependency to Observability and Security solution plugins (#165225) (#165574)

Browse source 
# Backport

This will backport the following commits from `main` to `8.10`:
- [[Cases] Add contentManagement dependency to Observability and
Security solution plugins
(#165225)](https://github.com/elastic/kibana/pull/165225)

<!--- Backport version: 8.9.8 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Janki
Salvi","email":"117571355+js-jankisalvi@users.noreply.github.com"},"sourceCommit":{"committedDate":"2023-09-04T08:10:14Z","message":"[Cases]
Add contentManagement dependency to Observability and Security solution
plugins (#165225)\n\nCo-authored-by: kibanamachine
<42973632+kibanamachine@users.noreply.github.com>","sha":"a2e841e6e45fb7605a60b4a6e85a124cd86ba487","branchLabelMapping":{"^v8.11.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["bug","release_note:skip","Team:ResponseOps","Feature:Cases","ci:skip-cypress-osquery","v8.10.0","v8.11.0"],"number":165225,"url":"https://github.com/elastic/kibana/pull/165225","mergeCommit":{"message":"[Cases]
Add contentManagement dependency to Observability and Security solution
plugins (#165225)\n\nCo-authored-by: kibanamachine
<42973632+kibanamachine@users.noreply.github.com>","sha":"a2e841e6e45fb7605a60b4a6e85a124cd86ba487"}},"sourceBranch":"main","suggestedTargetBranches":["8.10"],"targetPullRequestStates":[{"branch":"8.10","label":"v8.10.0","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v8.11.0","labelRegex":"^v8.11.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/165225","number":165225,"mergeCommit":{"message":"[Cases]
Add contentManagement dependency to Observability and Security solution
plugins (#165225)\n\nCo-authored-by: kibanamachine
<42973632+kibanamachine@users.noreply.github.com>","sha":"a2e841e6e45fb7605a60b4a6e85a124cd86ba487"}}]}]
BACKPORT-->

---------

Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
This commit is contained in:
Janki Salvi 2023-09-04 14:59:42 +02:00 • committed by GitHub
parent 706cf86d0c
commit 403d948ad3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
x-pack/plugins/observability/kibana.jsonc
View file

@ -11,6 +11,7 @@
"alerting",
"cases",
"charts",
"contentManagement",
"data",
"dataViews",
"dataViewEditor",

2
x-pack/plugins/observability/public/plugin.mock.tsx
View file

@ -6,6 +6,7 @@
*/
import React from 'react';
import { mockCasesContract } from '@kbn/cases-plugin/public/mocks';
import { contentManagementMock } from '@kbn/content-management-plugin/public/mocks';
import { timefilterServiceMock } from '@kbn/data-plugin/public/query/timefilter/timefilter_service.mock';
const triggersActionsUiStartMock = {
@ -110,6 +111,7 @@ export const observabilityPublicPluginsStartMock = {
createStart() {
return {
cases: mockCasesContract(),
contentManagement: contentManagementMock.createStartContract(),
triggersActionsUi: triggersActionsUiStartMock.createStart(),
data: data.createStart(),
dataViews: dataViews.createStart(),

2
x-pack/plugins/observability/public/plugin.ts
View file

@ -39,6 +39,7 @@ import {
TriggersAndActionsUIPublicPluginSetup,
TriggersAndActionsUIPublicPluginStart,
} from '@kbn/triggers-actions-ui-plugin/public';
import type { ContentManagementPublicStart } from '@kbn/content-management-plugin/public';
import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
import {
@ -115,6 +116,7 @@ export interface ObservabilityPublicPluginsStart {
actionTypeRegistry: ActionTypeRegistryContract;
cases: CasesUiStart;
charts: ChartsPluginStart;
contentManagement: ContentManagementPublicStart;
data: DataPublicPluginStart;
dataViews: DataViewsPublicPluginStart;
dataViewEditor: DataViewEditorStart;

3
x-pack/plugins/observability/tsconfig.json
View file

@ -83,7 +83,8 @@
"@kbn/actions-plugin",
"@kbn/core-capabilities-common",
"@kbn/deeplinks-analytics",
"@kbn/observability-ai-assistant-plugin"
"@kbn/observability-ai-assistant-plugin",
"@kbn/content-management-plugin"
],
"exclude": [
"target/**/*"

2
x-pack/plugins/security_solution/kibana.jsonc
View file

@ -17,6 +17,7 @@
"cloud",
"cloudDefend",
"cloudSecurityPosture",
"contentManagement",
"dashboard",
"data",
"dataViews",
@ -45,7 +46,6 @@
"files",
"controls",
"dataViewEditor",
"savedObjectsManagement",
"stackConnectors",
"discover",
"notifications"

2
x-pack/plugins/security_solution/public/plugin.tsx
View file

@ -193,7 +193,7 @@ export class Plugin implements IPlugin<PluginSetup, PluginStart, SetupPlugins, S
securityLayout: {
getPluginWrapper: () => SecuritySolutionTemplateWrapper,
},
savedObjectsManagement: startPluginsDeps.savedObjectsManagement,
contentManagement: startPluginsDeps.contentManagement,
telemetry: this.telemetry.start(),
discoverFilterManager: filterManager,
customDataService,

6
x-pack/plugins/security_solution/public/types.ts
View file

@ -48,7 +48,7 @@ import type { ThreatIntelligencePluginStart } from '@kbn/threat-intelligence-plu
import type { CloudExperimentsPluginStart } from '@kbn/cloud-experiments-plugin/common';
import type { GuidedOnboardingPluginStart } from '@kbn/guided-onboarding-plugin/public';
import type { DataViewsServicePublic } from '@kbn/data-views-plugin/public';
import type { SavedObjectsManagementPluginStart } from '@kbn/saved-objects-management-plugin/public';
import type { ContentManagementPublicStart } from '@kbn/content-management-plugin/public';
import type { RouteProps } from 'react-router-dom';
import type { DiscoverStart } from '@kbn/discover-plugin/public';
@ -133,7 +133,7 @@ export interface StartPlugins {
}
export interface StartPluginsDependencies extends StartPlugins {
savedObjectsManagement: SavedObjectsManagementPluginStart;
contentManagement: ContentManagementPublicStart;
savedObjectsTaggingOss: SavedObjectTaggingOssPluginStart;
}
@ -160,7 +160,7 @@ export type StartServices = CoreStart &
securityLayout: {
getPluginWrapper: () => typeof SecuritySolutionTemplateWrapper;
};
savedObjectsManagement: SavedObjectsManagementPluginStart;
contentManagement: ContentManagementPublicStart;
telemetry: TelemetryClientStart;
discoverFilterManager: FilterManager;
customDataService: DataPublicPluginStart;

2
x-pack/plugins/security_solution/tsconfig.json
View file

@ -149,7 +149,6 @@
"@kbn/expandable-flyout",
"@kbn/securitysolution-grouping",
"@kbn/securitysolution-data-table",
"@kbn/saved-objects-management-plugin",
"@kbn/core-analytics-server",
"@kbn/analytics-client",
"@kbn/security-solution-side-nav",
@ -169,5 +168,6 @@
"@kbn/core-logging-server-mocks",
"@kbn/core-lifecycle-browser",
"@kbn/handlebars",
"@kbn/content-management-plugin"
]
}