Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Ingest Manager] Update asset paths to use _ instead of - #70320

Merged
merged 4 commits into from
Jul 2, 2020
Merged

[Ingest Manager] Update asset paths to use _ instead of - #70320

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1c47adf
[Ingest Manager] Update asset paths to use _ instead of -
ruflin Jun 30, 2020
bdffda0
fix index-pattern issue
ruflin Jul 1, 2020
8c1143a
Merge branch 'master' into update-asset-paths
elasticmachine Jul 1, 2020
e007300
Merge branch 'master' into update-asset-paths
ruflin Jul 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 8 additions & 11 deletions x-pack/plugins/ingest_manager/common/types/models/epm.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ export enum KibanaAssetType {
}

export enum ElasticsearchAssetType {
componentTemplate = 'component-template',
ingestPipeline = 'ingest-pipeline',
indexTemplate = 'index-template',
ilmPolicy = 'ilm-policy',
componentTemplate = 'component_template',
ingestPipeline = 'ingest_pipeline',
indexTemplate = 'index_template',
ilmPolicy = 'ilm_policy',
}

export enum AgentAssetType {
Expand Down Expand Up @@ -243,13 +243,10 @@ export type AssetReference = Pick<SavedObjectReference, 'id'> & {
* Types of assets which can be installed/removed
*/
export enum IngestAssetType {
DataFrameTransform = 'data-frame-transform',
IlmPolicy = 'ilm-policy',
IndexTemplate = 'index-template',
ComponentTemplate = 'component-template',
IngestPipeline = 'ingest-pipeline',
MlJob = 'ml-job',
RollupJob = 'rollup-job',
IlmPolicy = 'ilm_policy',
IndexTemplate = 'index_template',
ComponentTemplate = 'component_template',
IngestPipeline = 'ingest_pipeline',
}

export enum DefaultPackages {
Expand Down
8 changes: 4 additions & 4 deletions x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/constants.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ export const DisplayedAssets: ServiceNameToAssetTypes = {

export const AssetTitleMap: Record<AssetType, string> = {
dashboard: 'Dashboard',
'ilm-policy': 'ILM Policy',
'ingest-pipeline': 'Ingest Pipeline',
ilm_policy: 'ILM Policy',
ingest_pipeline: 'Ingest Pipeline',
'index-pattern': 'Index Pattern',
'index-template': 'Index Template',
'component-template': 'Component Template',
index_template: 'Index Template',
component_template: 'Component Template',
search: 'Saved Search',
visualization: 'Visualization',
input: 'Agent input',
Expand Down