Skip to content

Commit

Permalink
[ilm] Remove observability solution dependency on index lifecycle man…
Browse files Browse the repository at this point in the history
…agement plugin bundle (elastic#199383)

Create package for observability solution's dependencies from index
lifecycle management. Previously it relied on the plugin bundle but
thats best avoided with our sustainable architecture efforts.

Part of elastic/kibana-team#1179

---------

Co-authored-by: kibanamachine <[email protected]>
  • Loading branch information
mattkime and kibanamachine authored Nov 11, 2024
1 parent 54b1370 commit d805546
Show file tree
Hide file tree
Showing 17 changed files with 60 additions and 8 deletions.
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -766,6 +766,7 @@ x-pack/examples/triggers_actions_ui_example @elastic/response-ops
x-pack/examples/ui_actions_enhanced_examples @elastic/appex-sharedux
x-pack/packages/ai-infra/inference-common @elastic/appex-ai-infra
x-pack/packages/ai-infra/product-doc-artifact-builder @elastic/appex-ai-infra
x-pack/packages/index-lifecycle-management/index_lifecycle_management_common_shared @elastic/kibana-management
x-pack/packages/index-management/index_management_shared_types @elastic/kibana-management
x-pack/packages/kbn-ai-assistant @elastic/search-kibana
x-pack/packages/kbn-ai-assistant-common @elastic/search-kibana
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -567,6 +567,7 @@
"@kbn/i18n-react": "link:packages/kbn-i18n-react",
"@kbn/iframe-embedded-plugin": "link:x-pack/test/functional_embedded/plugins/iframe_embedded",
"@kbn/image-embeddable-plugin": "link:src/plugins/image_embeddable",
"@kbn/index-lifecycle-management-common-shared": "link:x-pack/packages/index-lifecycle-management/index_lifecycle_management_common_shared",
"@kbn/index-lifecycle-management-plugin": "link:x-pack/plugins/index_lifecycle_management",
"@kbn/index-management-plugin": "link:x-pack/plugins/index_management",
"@kbn/index-management-shared-types": "link:x-pack/packages/index-management/index_management_shared_types",
Expand Down
2 changes: 2 additions & 0 deletions tsconfig.base.json
Original file line number Diff line number Diff line change
Expand Up @@ -1034,6 +1034,8 @@
"@kbn/import-locator/*": ["packages/kbn-import-locator/*"],
"@kbn/import-resolver": ["packages/kbn-import-resolver"],
"@kbn/import-resolver/*": ["packages/kbn-import-resolver/*"],
"@kbn/index-lifecycle-management-common-shared": ["x-pack/packages/index-lifecycle-management/index_lifecycle_management_common_shared"],
"@kbn/index-lifecycle-management-common-shared/*": ["x-pack/packages/index-lifecycle-management/index_lifecycle_management_common_shared/*"],
"@kbn/index-lifecycle-management-plugin": ["x-pack/plugins/index_lifecycle_management"],
"@kbn/index-lifecycle-management-plugin/*": ["x-pack/plugins/index_lifecycle_management/*"],
"@kbn/index-management-plugin": ["x-pack/plugins/index_management"],
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# @kbn/index-lifecycle-management-common-shared

Contains types and functions used and exported by the index lifecycle management plugin. Primarily used to address dependency issues.
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
/*
* 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; you may not use this file except in compliance with the Elastic License
* 2.0.
*/

export const ILM_LOCATOR_ID = 'ILM_LOCATOR_ID';
export * from './src/policies';
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"type": "shared-common",
"id": "@kbn/index-lifecycle-management-common-shared",
"owner": "@elastic/kibana-management"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"name": "@kbn/index-lifecycle-management-common-shared",
"private": true,
"version": "1.0.0",
"license": "Elastic License 2.0"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"extends": "../../../../tsconfig.base.json",
"compilerOptions": {
"outDir": "target/types",
"types": [
"jest",
"node",
"react"
]
},
"include": [
"**/*.ts",
"**/*.tsx"
],
"exclude": [
"target/**/*"
],
"kbn_references": [
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

export * from './api';

export * from './policies';
export * from '@kbn/index-lifecycle-management-common-shared';

/**
* These roles reflect how nodes are stratified into different data tiers.
Expand Down
3 changes: 2 additions & 1 deletion x-pack/plugins/index_lifecycle_management/public/locator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,15 @@
import type { SerializableRecord } from '@kbn/utility-types';
import { ManagementAppLocator } from '@kbn/management-plugin/common';
import { LocatorDefinition } from '@kbn/share-plugin/public';
import { ILM_LOCATOR_ID } from '@kbn/index-lifecycle-management-common-shared';
import {
getPoliciesListPath,
getPolicyCreatePath,
getPolicyEditPath,
} from './application/services/navigation';
import { PLUGIN } from '../common/constants';

export const ILM_LOCATOR_ID = 'ILM_LOCATOR_ID';
export { ILM_LOCATOR_ID };

export interface IlmLocatorParams extends SerializableRecord {
page: 'policies_list' | 'policy_edit' | 'policy_create';
Expand Down
1 change: 1 addition & 0 deletions x-pack/plugins/index_lifecycle_management/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
"@kbn/react-kibana-context-render",
"@kbn/unsaved-changes-prompt",
"@kbn/shared-ux-table-persist",
"@kbn/index-lifecycle-management-common-shared",
],
"exclude": [
"target/**/*",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,7 @@
"kibanaUtils",
"observability",
"spaces",
"indexLifecycleManagement",
"unifiedDocViewer"
]
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

import { PolicyFromES } from '@kbn/index-lifecycle-management-plugin/common/types';
import { PolicyFromES } from '@kbn/index-lifecycle-management-common-shared';
import { DataStream } from '@kbn/index-management-plugin/common';
import { CatIndicesResponse } from '@elastic/elasticsearch/lib/api/types';
import { apiService } from '../../../../../utils/api_service';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import React from 'react';
import { EuiIconTip, EuiLink, EuiSkeletonText, EuiToolTip, EuiText } from '@elastic/eui';
import { useKibana } from '@kbn/kibana-react-plugin/public';
import { ILM_LOCATOR_ID } from '@kbn/index-lifecycle-management-plugin/public';
import { ILM_LOCATOR_ID } from '@kbn/index-lifecycle-management-common-shared';
import { useFetcher } from '@kbn/observability-shared-plugin/public';
import { i18n } from '@kbn/i18n';
import { useSyntheticsSettingsContext } from '../../contexts';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
"@kbn/observability-plugin",
"@kbn/fleet-plugin",
"@kbn/unified-search-plugin",
"@kbn/index-lifecycle-management-plugin",
"@kbn/i18n",
"@kbn/core",
"@kbn/config-schema",
Expand Down Expand Up @@ -105,7 +104,8 @@
"@kbn/slo-plugin",
"@kbn/ebt-tools",
"@kbn/alerting-types",
"@kbn/core-chrome-browser"
"@kbn/core-chrome-browser",
"@kbn/index-lifecycle-management-common-shared"
],
"exclude": ["target/**/*"]
}
4 changes: 4 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5322,6 +5322,10 @@
version "0.0.0"
uid ""

"@kbn/index-lifecycle-management-common-shared@link:x-pack/packages/index-lifecycle-management/index_lifecycle_management_common_shared":
version "0.0.0"
uid ""

"@kbn/index-lifecycle-management-plugin@link:x-pack/plugins/index_lifecycle_management":
version "0.0.0"
uid ""
Expand Down

0 comments on commit d805546

Please sign in to comment.