-
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
[ILM] Cloud-specific changes for 7.10 #79650
Merged
jloleysens
merged 15 commits into
elastic:master
from
jloleysens:ilm/cloud-data-tier-migration
Oct 13, 2020
Merged
Changes from 4 commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
9340f57
added cloud cold tier specific call out, probably wip
jloleysens 7f1a6a4
Merge branch 'master' into ilm/cloud-data-tier-migration
kibanamachine ad721b5
added jest test
jloleysens 3308f5f
rephrase copy
jloleysens d040694
Merge branch 'master' into ilm/cloud-data-tier-migration
kibanamachine b2f602b
Merge branch 'master' into ilm/cloud-data-tier-migration
kibanamachine 38e6900
Added logic for showing/hiding data tier allocation option
jloleysens 56a4cee
added test for not-on-cloud case
jloleysens 9cb0c1e
Refactored logic for rendering data allocation notices
jloleysens 7b6351e
paraphrashing of Adams copy recommendation
jloleysens 7cee2fd
Fix comment
jloleysens fb9b70c
Merge branch 'master' of github.com:elastic/kibana into ilm/cloud-dat…
jloleysens ca92f73
address pr feedback
jloleysens 45a9385
clarify slight hack comment
jloleysens 3003f61
complete refactor of new flag for tests
jloleysens 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
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 |
---|---|---|
|
@@ -9,6 +9,7 @@ | |
"features" | ||
], | ||
"optionalPlugins": [ | ||
"cloud", | ||
"usageCollection", | ||
"indexManagement", | ||
"home" | ||
|
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
27 changes: 27 additions & 0 deletions
27
...lication/sections/edit_policy/components/data_tier_allocation/cloud_data_tier_callout.tsx
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,27 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License; | ||
* you may not use this file except in compliance with the Elastic License. | ||
*/ | ||
|
||
import { i18n } from '@kbn/i18n'; | ||
import React, { FunctionComponent } from 'react'; | ||
import { EuiCallOut } from '@elastic/eui'; | ||
|
||
const i18nTexts = { | ||
title: i18n.translate('xpack.indexLifecycleMgmt.editPolicy.cloudDataTierCallout.title', { | ||
defaultMessage: 'No cold tier found', | ||
}), | ||
body: i18n.translate('xpack.indexLifecycleMgmt.editPolicy.cloudDataTierCallout.body', { | ||
defaultMessage: | ||
'Data in this phase will be allocated to hot and warm tier nodes. Go to the Cloud UI to create a cold tier.', | ||
}), | ||
}; | ||
|
||
export const CloudDataTierCallout: FunctionComponent = () => { | ||
return ( | ||
<EuiCallOut title={i18nTexts.title} data-test-subj="cloudDataTierCallout"> | ||
{i18nTexts.body} | ||
</EuiCallOut> | ||
); | ||
}; |
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
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
10 changes: 10 additions & 0 deletions
10
x-pack/plugins/index_lifecycle_management/public/shared_imports.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,10 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License; | ||
* you may not use this file except in compliance with the Elastic License. | ||
*/ | ||
import { AppServicesContext } from './types'; | ||
import { useKibana as _useKibana } from '../../../../src/plugins/kibana_react/public'; | ||
|
||
export { KibanaContextProvider } from '../../../../src/plugins/kibana_react/public'; | ||
export const useKibana = () => _useKibana<AppServicesContext>(); |
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
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.
We might need some writer's eyes on this copy. For example, I'd expect to refer to "Elastic Cloud" instead of "Cloud UI". Can we make that a link to https://cloud.elastic.co/home?