-
Notifications
You must be signed in to change notification settings - Fork 8.3k
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.
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
[sample data] handle index aliases when installing/uninstalling datasets #122689
Merged
pgayvallet
merged 9 commits into
elastic:main
from
pgayvallet:kbn-120137-sample-data-alias
Jan 17, 2022
Merged
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
6e90891
refactor install/uninstall routes
pgayvallet 53b9b99
only skip failing tests
pgayvallet 075278d
check for aliases when uninstalling sample datasets
pgayvallet 3559586
fix return value
pgayvallet 35e3167
add unit tests
pgayvallet 3bdd27f
factorize installer creation
pgayvallet 593aad1
add tests for the alias scenario
pgayvallet fc510d7
Merge branch 'main' into kbn-120137-sample-data-alias
kibanamachine 31b0594
Merge branch 'main' into kbn-120137-sample-data-alias
kibanamachine File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
/* | ||
* 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 and the Server Side Public License, v 1; you may not use this file except | ||
* in compliance with, at your election, the Elastic License 2.0 or the Server | ||
* Side Public License, v 1. | ||
*/ | ||
|
||
export class SampleDataInstallError extends Error { | ||
constructor(message: string, public readonly httpCode: number) { | ||
super(message); | ||
} | ||
} |
74 changes: 74 additions & 0 deletions
74
src/plugins/home/server/services/sample_data/lib/insert_data_into_index.ts
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,74 @@ | ||
/* | ||
* 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 and the Server Side Public License, v 1; you may not use this file except | ||
* in compliance with, at your election, the Elastic License 2.0 or the Server | ||
* Side Public License, v 1. | ||
*/ | ||
|
||
import { IScopedClusterClient, Logger } from 'kibana/server'; | ||
import type { DataIndexSchema } from './sample_dataset_registry_types'; | ||
import { | ||
translateTimeRelativeToDifference, | ||
translateTimeRelativeToWeek, | ||
} from './translate_timestamp'; | ||
import { loadData } from './load_data'; | ||
|
||
export const insertDataIntoIndex = ({ | ||
dataIndexConfig, | ||
logger, | ||
esClient, | ||
index, | ||
nowReference, | ||
}: { | ||
dataIndexConfig: DataIndexSchema; | ||
index: string; | ||
nowReference: string; | ||
esClient: IScopedClusterClient; | ||
logger: Logger; | ||
}) => { | ||
const updateTimestamps = (doc: any) => { | ||
dataIndexConfig.timeFields | ||
.filter((timeFieldName: string) => doc[timeFieldName]) | ||
.forEach((timeFieldName: string) => { | ||
doc[timeFieldName] = dataIndexConfig.preserveDayOfWeekTimeOfDay | ||
? translateTimeRelativeToWeek( | ||
doc[timeFieldName], | ||
dataIndexConfig.currentTimeMarker, | ||
nowReference | ||
) | ||
: translateTimeRelativeToDifference( | ||
doc[timeFieldName], | ||
dataIndexConfig.currentTimeMarker, | ||
nowReference | ||
); | ||
}); | ||
return doc; | ||
}; | ||
|
||
const bulkInsert = async (docs: unknown[]) => { | ||
const insertCmd = { index: { _index: index } }; | ||
const bulk: unknown[] = []; | ||
docs.forEach((doc: unknown) => { | ||
bulk.push(insertCmd); | ||
bulk.push(updateTimestamps(doc)); | ||
}); | ||
|
||
const { body: resp } = await esClient.asCurrentUser.bulk({ | ||
body: bulk, | ||
}); | ||
|
||
if (resp.errors) { | ||
const errMsg = `sample_data install errors while bulk inserting. Elasticsearch response: ${JSON.stringify( | ||
resp, | ||
null, | ||
'' | ||
)}`; | ||
logger.warn(errMsg); | ||
return Promise.reject( | ||
new Error(`Unable to load sample data into index "${index}", see kibana logs for details`) | ||
); | ||
} | ||
}; | ||
return loadData(dataIndexConfig.dataPath, bulkInsert); // this returns a Promise | ||
}; |
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
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This was extracted from
src/plugins/home/server/services/sample_data/routes/install.ts