Skip to content

Commit

Permalink
[Ingest Manager] Update asset paths to use _ instead of -
Browse files Browse the repository at this point in the history
In elastic/package-registry#517 the naming of the file paths inside a package is standardised to only use `_` and not `-`. This adjusts the paths for `ilm-policy`, `component-template`, `index-template` to the correct path.

An additional change here is to get rid of assets we don't support yet, like rollup jobs and ml jobs. We will reintroduce these when we support them.
  • Loading branch information
ruflin committed Jun 30, 2020
1 parent 6027451 commit 1c47adf
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 16 deletions.
19 changes: 8 additions & 11 deletions x-pack/plugins/ingest_manager/common/types/models/epm.ts
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
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',
'index-pattern': 'Index Pattern',
'index-template': 'Index Template',
'component-template': 'Component Template',
ilm_policy: 'ILM Policy',
ingest_pipeline: 'Ingest Pipeline',
index_pattern: 'Index Pattern',
index_template: 'Index Template',
component_template: 'Component Template',
search: 'Saved Search',
visualization: 'Visualization',
input: 'Agent input',
Expand Down

0 comments on commit 1c47adf

Please sign in to comment.