[Monitoring] Change cloud messaging on no data page (#88375)

* WIP

* Update tests

* Update copy

* Fix translations and update copy

* Fix tests and update copy
This commit is contained in:
Chris Roberson 2021-01-15 13:43:27 -05:00 committed by GitHub
parent 73cd1a088c
commit 68288ebfdb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 124 additions and 63 deletions

View file

@ -4,45 +4,41 @@
* you may not use this file except in compliance with the Elastic License. * you may not use this file except in compliance with the Elastic License.
*/ */
import React, { Fragment } from 'react'; import React from 'react';
import { EuiTitle, EuiText, EuiTextColor, EuiLink, EuiSpacer } from '@elastic/eui'; import { EuiText, EuiTextColor, EuiLink } from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n/react'; import { FormattedMessage } from '@kbn/i18n/react';
export const CloudDeployment = () => { export const CloudDeployment = () => {
return ( return (
<Fragment> <EuiTextColor color="subdued">
<EuiTitle size="l"> <EuiText>
<h2> <p>
<FormattedMessage <FormattedMessage
id="xpack.monitoring.noData.blurbs.cloudDeploymentTitle" id="xpack.monitoring.noData.blurbs.cloudDeploymentDescription"
defaultMessage="Your monitoring data is not available here." defaultMessage="Configure monitoring through "
/> />
</h2> <EuiLink href="https://cloud.elastic.co/deployments" target="_blank">
</EuiTitle> Elasticsearch Service Console
<EuiTextColor color="subdued"> </EuiLink>{' '}
<EuiSpacer /> <FormattedMessage
<EuiText> id="xpack.monitoring.noData.blurbs.cloudDeploymentDescription2"
<p> defaultMessage="Go to "
<FormattedMessage />
id="xpack.monitoring.noData.blurbs.cloudDeploymentDescription" <EuiLink href="https://cloud.elastic.co/deployments" target="_blank">
defaultMessage="Please return to your " Logs and metrics
/> </EuiLink>{' '}
<EuiLink href="https://cloud.elastic.co/deployments" target="_blank"> <FormattedMessage
cloud dashboard. id="xpack.monitoring.noData.blurbs.cloudDeploymentDescription3"
</EuiLink>{' '} defaultMessage="section for a deployment to configure monitoring. For more information visit "
<FormattedMessage />
id="xpack.monitoring.noData.blurbs.cloudDeploymentDescriptionMore" <EuiLink
defaultMessage="For more information on Monitoring in Elastic Cloud, please see " href="https://www.elastic.co/guide/en/cloud/current/ec-enable-monitoring.html"
/> target="_blank"
<EuiLink >
href="https://www.elastic.co/guide/en/cloud/current/ec-enable-monitoring.html" the documentation page.
target="_blank" </EuiLink>
> </p>
the documentation. </EuiText>
</EuiLink> </EuiTextColor>
</p>
</EuiText>
</EuiTextColor>
</Fragment>
); );
}; };

View file

@ -87,29 +87,21 @@ Array [
exports[`ExplainExportersCloud should explain about xpack.monitoring.exporters setting in a cloud environment 1`] = ` exports[`ExplainExportersCloud should explain about xpack.monitoring.exporters setting in a cloud environment 1`] = `
Array [ Array [
<h2
class="euiTitle euiTitle--large"
>
Your monitoring data is not available here.
</h2>,
<span <span
class="euiTextColor euiTextColor--subdued" class="euiTextColor euiTextColor--subdued"
> >
<div
class="euiSpacer euiSpacer--l"
/>
<div <div
class="euiText euiText--medium" class="euiText euiText--medium"
> >
<p> <p>
Please return to your Configure monitoring through
<a <a
class="euiLink euiLink--primary" class="euiLink euiLink--primary"
href="https://cloud.elastic.co/deployments" href="https://cloud.elastic.co/deployments"
rel="noopener" rel="noopener"
target="_blank" target="_blank"
> >
cloud dashboard. Elasticsearch Service Console
<span <span
aria-label="External link" aria-label="External link"
class="euiLink__externalIcon" class="euiLink__externalIcon"
@ -121,14 +113,33 @@ Array [
(opens in a new tab or window) (opens in a new tab or window)
</span> </span>
</a> </a>
For more information on Monitoring in Elastic Cloud, please see Go to
<a
class="euiLink euiLink--primary"
href="https://cloud.elastic.co/deployments"
rel="noopener"
target="_blank"
>
Logs and metrics
<span
aria-label="External link"
class="euiLink__externalIcon"
data-euiicon-type="popout"
/>
<span
class="euiScreenReaderOnly"
>
(opens in a new tab or window)
</span>
</a>
section for a deployment to configure monitoring. For more information visit
<a <a
class="euiLink euiLink--primary" class="euiLink euiLink--primary"
href="https://www.elastic.co/guide/en/cloud/current/ec-enable-monitoring.html" href="https://www.elastic.co/guide/en/cloud/current/ec-enable-monitoring.html"
rel="noopener" rel="noopener"
target="_blank" target="_blank"
> >
the documentation. the documentation page.
<span <span
aria-label="External link" aria-label="External link"
class="euiLink__externalIcon" class="euiLink__externalIcon"

View file

@ -27,6 +27,7 @@ import { toggleSetupMode } from '../../lib/setup_mode';
import { CheckingSettings } from './checking_settings'; import { CheckingSettings } from './checking_settings';
import { ReasonFound, WeTried } from './reasons'; import { ReasonFound, WeTried } from './reasons';
import { CheckerErrors } from './checker_errors'; import { CheckerErrors } from './checker_errors';
import { CloudDeployment } from './blurbs';
import { getSafeForExternalLink } from '../../lib/get_safe_for_external_link'; import { getSafeForExternalLink } from '../../lib/get_safe_for_external_link';
function NoDataMessage(props) { function NoDataMessage(props) {
@ -45,7 +46,8 @@ function NoDataMessage(props) {
export function NoData(props) { export function NoData(props) {
const [isLoading, setIsLoading] = useState(false); const [isLoading, setIsLoading] = useState(false);
const [useInternalCollection, setUseInternalCollection] = useState(props.isCloudEnabled); const [useInternalCollection, setUseInternalCollection] = useState(false);
const isCloudEnabled = props.isCloudEnabled;
async function startSetup() { async function startSetup() {
setIsLoading(true); setIsLoading(true);
@ -53,6 +55,51 @@ export function NoData(props) {
window.location.hash = getSafeForExternalLink('#/elasticsearch/nodes'); window.location.hash = getSafeForExternalLink('#/elasticsearch/nodes');
} }
if (isCloudEnabled) {
return (
<EuiPage>
<EuiScreenReaderOnly>
<h1>
<FormattedMessage
id="xpack.monitoring.noData.cloud.heading"
defaultMessage="No monitoring data found."
/>
</h1>
</EuiScreenReaderOnly>
<EuiPageBody restrictWidth={600}>
<EuiPageContent
verticalPosition="center"
horizontalPosition="center"
className="eui-textCenter"
>
<EuiIcon type="monitoringApp" size="xxl" />
<EuiSpacer size="m" />
<EuiTitle size="l">
<h2>
<FormattedMessage
id="xpack.monitoring.noData.cloud.title"
defaultMessage="Monitoring data not available"
/>
</h2>
</EuiTitle>
<EuiTextColor color="subdued">
<EuiText>
<p>
<FormattedMessage
id="xpack.monitoring.noData.cloud.description"
defaultMessage="Monitoring provides insight to your hardware performance and load."
/>
</p>
</EuiText>
</EuiTextColor>
<EuiHorizontalRule size="half" />
<CloudDeployment />
</EuiPageContent>
</EuiPageBody>
</EuiPage>
);
}
if (useInternalCollection) { if (useInternalCollection) {
return ( return (
<EuiPage> <EuiPage>

View file

@ -162,29 +162,21 @@ Array [
exports[`ReasonFound should load ExplainExportersCloud component 1`] = ` exports[`ReasonFound should load ExplainExportersCloud component 1`] = `
Array [ Array [
<h2
class="euiTitle euiTitle--large"
>
Your monitoring data is not available here.
</h2>,
<span <span
class="euiTextColor euiTextColor--subdued" class="euiTextColor euiTextColor--subdued"
> >
<div
class="euiSpacer euiSpacer--l"
/>
<div <div
class="euiText euiText--medium" class="euiText euiText--medium"
> >
<p> <p>
Please return to your Configure monitoring through
<a <a
class="euiLink euiLink--primary" class="euiLink euiLink--primary"
href="https://cloud.elastic.co/deployments" href="https://cloud.elastic.co/deployments"
rel="noopener" rel="noopener"
target="_blank" target="_blank"
> >
cloud dashboard. Elasticsearch Service Console
<span <span
aria-label="External link" aria-label="External link"
class="euiLink__externalIcon" class="euiLink__externalIcon"
@ -196,14 +188,33 @@ Array [
(opens in a new tab or window) (opens in a new tab or window)
</span> </span>
</a> </a>
For more information on Monitoring in Elastic Cloud, please see Go to
<a
class="euiLink euiLink--primary"
href="https://cloud.elastic.co/deployments"
rel="noopener"
target="_blank"
>
Logs and metrics
<span
aria-label="External link"
class="euiLink__externalIcon"
data-euiicon-type="popout"
/>
<span
class="euiScreenReaderOnly"
>
(opens in a new tab or window)
</span>
</a>
section for a deployment to configure monitoring. For more information visit
<a <a
class="euiLink euiLink--primary" class="euiLink euiLink--primary"
href="https://www.elastic.co/guide/en/cloud/current/ec-enable-monitoring.html" href="https://www.elastic.co/guide/en/cloud/current/ec-enable-monitoring.html"
rel="noopener" rel="noopener"
target="_blank" target="_blank"
> >
the documentation. the documentation page.
<span <span
aria-label="External link" aria-label="External link"
class="euiLink__externalIcon" class="euiLink__externalIcon"

View file

@ -15844,8 +15844,6 @@
"xpack.monitoring.noData.blurbs.changesNeededDescription": "監視を実行するには、次の手順に従います", "xpack.monitoring.noData.blurbs.changesNeededDescription": "監視を実行するには、次の手順に従います",
"xpack.monitoring.noData.blurbs.changesNeededTitle": "調整が必要です", "xpack.monitoring.noData.blurbs.changesNeededTitle": "調整が必要です",
"xpack.monitoring.noData.blurbs.cloudDeploymentDescription": "次の場所に戻ってください: ", "xpack.monitoring.noData.blurbs.cloudDeploymentDescription": "次の場所に戻ってください: ",
"xpack.monitoring.noData.blurbs.cloudDeploymentDescriptionMore": "Elastic Cloud での監視の詳細は、 ",
"xpack.monitoring.noData.blurbs.cloudDeploymentTitle": "監視データはこちらに表示されません。",
"xpack.monitoring.noData.blurbs.lookingForMonitoringDataDescription": "監視は、ハードウェアパフォーマンスと負荷の情報を提供します。", "xpack.monitoring.noData.blurbs.lookingForMonitoringDataDescription": "監視は、ハードウェアパフォーマンスと負荷の情報を提供します。",
"xpack.monitoring.noData.blurbs.lookingForMonitoringDataTitle": "監視データを検索中です", "xpack.monitoring.noData.blurbs.lookingForMonitoringDataTitle": "監視データを検索中です",
"xpack.monitoring.noData.blurbs.monitoringIsOffDescription": "監視は、ハードウェアパフォーマンスと負荷の情報を提供します。", "xpack.monitoring.noData.blurbs.monitoringIsOffDescription": "監視は、ハードウェアパフォーマンスと負荷の情報を提供します。",

View file

@ -15887,8 +15887,6 @@
"xpack.monitoring.noData.blurbs.changesNeededDescription": "若要运行监测,请执行以下步骤", "xpack.monitoring.noData.blurbs.changesNeededDescription": "若要运行监测,请执行以下步骤",
"xpack.monitoring.noData.blurbs.changesNeededTitle": "您需要做些调整", "xpack.monitoring.noData.blurbs.changesNeededTitle": "您需要做些调整",
"xpack.monitoring.noData.blurbs.cloudDeploymentDescription": "请返回到您的 ", "xpack.monitoring.noData.blurbs.cloudDeploymentDescription": "请返回到您的 ",
"xpack.monitoring.noData.blurbs.cloudDeploymentDescriptionMore": "有关在 Elastic Cloud 中监测的详情,请参阅 ",
"xpack.monitoring.noData.blurbs.cloudDeploymentTitle": "此处没有您的监测数据。",
"xpack.monitoring.noData.blurbs.lookingForMonitoringDataDescription": "通过 Monitoring可深入了解您的硬件性能和负载。", "xpack.monitoring.noData.blurbs.lookingForMonitoringDataDescription": "通过 Monitoring可深入了解您的硬件性能和负载。",
"xpack.monitoring.noData.blurbs.lookingForMonitoringDataTitle": "我们正在寻找您的监测数据", "xpack.monitoring.noData.blurbs.lookingForMonitoringDataTitle": "我们正在寻找您的监测数据",
"xpack.monitoring.noData.blurbs.monitoringIsOffDescription": "通过 Monitoring可深入了解您的硬件性能和负载。", "xpack.monitoring.noData.blurbs.monitoringIsOffDescription": "通过 Monitoring可深入了解您的硬件性能和负载。",