Remove TLS requirement for alerting when security is enabled #115234
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
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
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 |
|---|---|---|
|
|
@@ -82,11 +82,11 @@ export const HealthCheck: React.FunctionComponent<Props> = ({ | |
| ) : !healthCheck.isAlertsAvailable ? ( | ||
| <AlertsError docLinks={docLinks} className={className} /> | ||
| ) : !healthCheck.isSufficientlySecure && !healthCheck.hasPermanentEncryptionKey ? ( | ||
| <ApiKeysAndEncryptionError docLinks={docLinks} className={className} /> | ||
| ) : !healthCheck.hasPermanentEncryptionKey ? ( | ||
| <EncryptionError docLinks={docLinks} className={className} /> | ||
| ) : ( | ||
| <ApiKeysDisabledError docLinks={docLinks} className={className} /> | ||
| ); | ||
| } | ||
| ) | ||
|
|
@@ -143,7 +143,7 @@ const EncryptionError = ({ docLinks, className }: PromptErrorProps) => ( | |
| /> | ||
| ); | ||
|
|
||
| const ApiKeysDisabledError = ({ docLinks, className }: PromptErrorProps) => ( | ||
| <EuiEmptyPrompt | ||
| iconType="watchesApp" | ||
| data-test-subj="actionNeededEmptyPrompt" | ||
|
|
@@ -152,22 +152,28 @@ const TlsError = ({ docLinks, className }: PromptErrorProps) => ( | |
| title={ | ||
| <h2> | ||
| <FormattedMessage | ||
| id="xpack.triggersActionsUI.components.healthCheck.apiKeysDisabledErrorTitle" | ||
| defaultMessage="You must enable API keys" | ||
|
There was a problem hiding this comment. @gchaps to review this change. It was the following before:
|
||
| /> | ||
| </h2> | ||
| } | ||
| body={ | ||
| <div className={`${className}__body`}> | ||
| <p role="banner"> | ||
| {i18n.translate('xpack.triggersActionsUI.components.healthCheck.apiKeysDisabledError', { | ||
| defaultMessage: 'Alerting relies on API keys. ', | ||
|
There was a problem hiding this comment. @gchaps to review this change. It was the following before:
There was a problem hiding this comment. This text now just repeats the title. Is there something more you can add? Or can it simply be: You must enable API keys to use Alerting I'm also wondering if we should make the two messages parallel: Additional setup required |
||
| })} | ||
| <EuiLink | ||
| href={docLinks.links.security.elasticsearchEnableApiKeys} | ||
| external | ||
| target="_blank" | ||
| > | ||
| {i18n.translate( | ||
| 'xpack.triggersActionsUI.components.healthCheck.apiKeysDisabledErrorAction', | ||
| { | ||
| defaultMessage: 'Learn how to enable API keys.', | ||
|
There was a problem hiding this comment. @gchaps to review this change. It was the following before:
|
||
| } | ||
| )} | ||
| </EuiLink> | ||
| </p> | ||
| </div> | ||
|
|
@@ -206,7 +212,7 @@ const AlertsError = ({ docLinks, className }: PromptErrorProps) => ( | |
| /> | ||
| ); | ||
|
|
||
| const ApiKeysAndEncryptionError = ({ docLinks, className }: PromptErrorProps) => ( | ||
| <EuiEmptyPrompt | ||
| iconType="watchesApp" | ||
| data-test-subj="actionNeededEmptyPrompt" | ||
|
|
@@ -215,21 +221,23 @@ const TlsAndEncryptionError = ({ docLinks, className }: PromptErrorProps) => ( | |
| title={ | ||
| <h2> | ||
| <FormattedMessage | ||
| id="xpack.triggersActionsUI.components.healthCheck.apiKeysAndEncryptionErrorTitle" | ||
| defaultMessage="Additional setup required" | ||
| /> | ||
| </h2> | ||
| } | ||
| body={ | ||
| <div className={`${className}__body`}> | ||
| <p role="banner"> | ||
| {i18n.translate( | ||
| 'xpack.triggersActionsUI.components.healthCheck.apiKeysAndEncryptionError', | ||
| { | ||
| defaultMessage: 'You must enable API keys and configure an encryption key. ', | ||
|
There was a problem hiding this comment. @gchaps to review this change. It was the following before:
|
||
| } | ||
| )} | ||
| <EuiLink href={docLinks.links.alerting.setupPrerequisites} external target="_blank"> | ||
| {i18n.translate( | ||
| 'xpack.triggersActionsUI.components.healthCheck.apiKeysAndEncryptionErrorAction', | ||
| { | ||
| defaultMessage: 'Learn how.', | ||
| } | ||
|
|
||
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.
@gchaps to review this change. It was the following before: