Skip to content
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

Feature/translate monitoring license #24826

Merged
Merged
Show file tree
Hide file tree
Changes from 22 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
c7ec189
Merge pull request #1 from elastic/master
Nox911 Sep 24, 2018
fa01b88
Merge pull request #2 from elastic/master
Nox911 Sep 27, 2018
70f6c7e
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Sep 27, 2018
68587a0
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Sep 28, 2018
42aa7d3
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Oct 2, 2018
efeaefe
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Oct 2, 2018
8a054ed
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Oct 8, 2018
b0d1660
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Oct 16, 2018
62b6ad1
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Oct 17, 2018
acbad4b
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Oct 18, 2018
a850650
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Oct 22, 2018
0a200ce
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Oct 25, 2018
b2a8244
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Oct 29, 2018
0838719
Translate monitoring -> license
Nox911 Oct 30, 2018
eb3df63
Translate monitoring -> page_loading
Nox911 Oct 30, 2018
2f65f53
Translate monitoring -> no_data
Nox911 Oct 30, 2018
e6bc0bd
Merge branch 'master' into feature/translate-monitoring-license
Nox911 Oct 30, 2018
b4b979e
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Oct 30, 2018
c398b02
Fix issues
Nox911 Oct 31, 2018
ab0d975
Merge branch 'master' into feature/translate-monitoring-license
Nox911 Oct 31, 2018
d349a4f
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Oct 31, 2018
d54d376
Merge branch 'master' into feature/translate-monitoring-license
Nox911 Oct 31, 2018
1d2f4dc
Merge branch 'master' into feature/translate-monitoring-license
Nox911 Nov 1, 2018
b014c29
Merge branch 'master' into feature/translate-monitoring-license
maryia-lapata Nov 1, 2018
51fe40a
Update unit tests
maryia-lapata Nov 1, 2018
ae285b9
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Nov 2, 2018
388b7b8
Merge branch 'master' into feature/translate-monitoring-license
Nox911 Nov 2, 2018
3051641
Merge branch 'master' of https://github.com/elastic/kibana
Nox911 Nov 5, 2018
a083e8f
Merge branch 'master' into feature/translate-monitoring-license
Nox911 Nov 5, 2018
79a8af4
Merge branch 'master' into feature/translate-monitoring-license
maryia-lapata Nov 14, 2018
2080ece
Merge branch 'master' into feature/translate-monitoring-license
maryia-lapata Nov 14, 2018
03188c0
Fix eslint
maryia-lapata Nov 14, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .i18nrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,10 @@
"tileMap": "src/core_plugins/tile_map",
"tagCloud": "src/core_plugins/tagcloud",
"xpack.idxMgmt": "x-pack/plugins/index_management",
"xpack.watcher": "x-pack/plugins/watcher",
"xpack.monitoring": "x-pack/plugins/monitoring",
"xpack.rollupJobs": "x-pack/plugins/rollup",
"xpack.security": "x-pack/plugins/security"
"xpack.security": "x-pack/plugins/security",
"xpack.watcher": "x-pack/plugins/watcher"
},
"exclude": [
"src/ui/ui_render/bootstrap/app_bootstrap.js",
Expand Down
11 changes: 9 additions & 2 deletions x-pack/plugins/monitoring/public/components/license/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import {
EuiPanel
} from '@elastic/eui';
import { LicenseStatus, AddLicense } from 'plugins/xpack_main/components';
import { FormattedMessage } from '@kbn/i18n/react';

const LicenseUpdateInfoForPrimary = ({ isPrimaryCluster, uploadLicensePath }) => {
if (!isPrimaryCluster) {
Expand All @@ -32,8 +33,14 @@ const LicenseUpdateInfoForRemote = ({ isPrimaryCluster }) => {
return (
<EuiPanel>
<p>
To update the license for this cluster, provide the license file through
the Elasticsearch API:
<FormattedMessage
id="xpack.monitoring.license.howToUpdateLicenseDescription"
defaultMessage="To update the license for this cluster, provide the license file through
the Elasticsearch {apiText}:"
values={{
apiText: 'API'
}}
/>
</p>
<EuiSpacer />
<EuiCodeBlock>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,27 @@

import React, { Fragment } from 'react';
import { EuiTitle, EuiText, EuiTextColor } from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n/react';

export const ChangesNeeded = () => {
return (
<Fragment>
<EuiTitle size="l">
<h2>You need to make some adjustments</h2>
<h2>
<FormattedMessage
id="xpack.monitoring.noData.blurbs.changesNeededTitle"
defaultMessage="You need to make some adjustments"
/>
</h2>
</EuiTitle>
<EuiTextColor color="subdued">
<EuiText>
<p>To run monitoring please perform the following steps</p>
<p>
<FormattedMessage
id="xpack.monitoring.noData.blurbs.changesNeededDescription"
defaultMessage="To run monitoring please perform the following steps"
/>
</p>
</EuiText>
</EuiTextColor>
</Fragment>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,27 @@

import React, { Fragment } from 'react';
import { EuiTitle, EuiText, EuiTextColor } from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n/react';

export const LookingFor = () => {
return (
<Fragment>
<EuiTitle size="l">
<h2>We&apos;re looking for your monitoring data</h2>
<h2>
<FormattedMessage
id="xpack.monitoring.noData.blurbs.lookingForMonitoringDataTitle"
defaultMessage="We&apos;re looking for your monitoring data"
/>
</h2>
</EuiTitle>
<EuiTextColor color="subdued">
<EuiText>
<p>Monitoring provides insight to your hardware performance and load.</p>
<p>
<FormattedMessage
id="xpack.monitoring.noData.blurbs.lookingForMonitoringDataDescription"
defaultMessage="Monitoring provides insight to your hardware performance and load."
/>
</p>
</EuiText>
</EuiTextColor>
</Fragment>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,26 @@

import React, { Fragment } from 'react';
import { EuiTitle, EuiText, EuiTextColor } from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n/react';

export const WhatIs = () => {
return (
<Fragment>
<EuiTitle size="l">
<h2>Monitoring is currently off</h2>
<h2>
<FormattedMessage
id="xpack.monitoring.noData.blurbs.monitoringIsOffTitle"
defaultMessage="Monitoring is currently off"
/>
</h2>
</EuiTitle>
<EuiTextColor color="subdued">
<EuiText>
<p>
Monitoring provides insight to your hardware performance and load.
<FormattedMessage
id="xpack.monitoring.noData.blurbs.monitoringIsOffDescription"
defaultMessage="Monitoring provides insight to your hardware performance and load."
/>
</p>
</EuiText>
</EuiTextColor>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import {
EuiDescriptionListDescription,
EuiSpacer,
} from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n/react';

const ErrorList = ({ errors }) => {
return errors.map((error, errorIndex) => {
Expand Down Expand Up @@ -44,9 +45,12 @@ export function CheckerErrors(props) {
className="eui-textLeft"
>
<p>
There were some errors encountered in trying to check Elasticsearch
settings. You need administrator rights to check the settings and, if
needed, to enable the monitoring collection setting.
<FormattedMessage
id="xpack.monitoring.noData.checkerErrors.checkEsSettingsErrorMessage"
defaultMessage="There were some errors encountered in trying to check Elasticsearch
settings. You need administrator rights to check the settings and, if
needed, to enable the monitoring collection setting."
/>
</p>

<EuiDescriptionList>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import {
EuiTitle
} from '@elastic/eui';
import { WhatIs } from '../../blurbs';
import { FormattedMessage } from '@kbn/i18n/react';

export class ExplainCollectionEnabled extends React.Component {
constructor(props) {
Expand Down Expand Up @@ -59,11 +60,22 @@ export class ExplainCollectionEnabled extends React.Component {
<EuiHorizontalRule size="half" />
<EuiText>
<p>
We checked the {context} settings and found that <EuiCode>{property}</EuiCode>
is set to <EuiCode>{data}</EuiCode>.
<FormattedMessage
id="xpack.monitoring.noData.explanations.collectionEnabledDescription"
defaultMessage="We checked the {context} settings and found that {property}
is set to {data}."
values={{
context,
property: (<EuiCode>{property}</EuiCode>),
data: (<EuiCode>{data}</EuiCode>)
}}
/>
</p>
<p>
Would you like to turn it on?
<FormattedMessage
id="xpack.monitoring.noData.explanations.collectionEnabled.turnItOnDescription"
defaultMessage="Would you like to turn it on?"
/>
</p>
</EuiText>
<EuiSpacer />
Expand All @@ -80,7 +92,10 @@ export class ExplainCollectionEnabled extends React.Component {
data-test-subj="enableCollectionEnabled"
isLoading={isCollectionEnabledUpdating}
>
Turn on monitoring
<FormattedMessage
id="xpack.monitoring.noData.explanations.collectionEnabled.turnOnMonitoringButtonLabel"
defaultMessage="Turn on monitoring"
/>
</EuiButton>
</EuiFlexItem>
</EuiFlexGroup>
Expand All @@ -89,20 +104,33 @@ export class ExplainCollectionEnabled extends React.Component {

const stillWaiting = this.state.waitedTooLong ? (
<p>
<a href="#/">Still waiting?</a>
<a href="#/">
<FormattedMessage
id="xpack.monitoring.noData.explanations.collectionEnabled.stillWaitingLinkText"
defaultMessage="Still waiting?"
/>
</a>
</p>
) : null;

const renderSuccess = () => (
<Fragment>
<EuiTitle size="l" data-test-subj="monitoringCollectionEnabledMessage">
<h2>Success! Getting your monitoring data.</h2>
<h2>
<FormattedMessage
id="xpack.monitoring.noData.explanations.collectionEnabled.monitoringTurnedOnTitle"
defaultMessage="Success! Getting your monitoring data."
/>
</h2>
</EuiTitle>
<EuiHorizontalRule size="half" />
<EuiText>
<p>
When the data is in your cluster, your monitoring dashboard will
show up here. This might take a few seconds.
<FormattedMessage
id="xpack.monitoring.noData.explanations.collectionEnabled.monitoringTurnedOnDescription"
defaultMessage="When the data is in your cluster, your monitoring dashboard will
show up here. This might take a few seconds."
/>
</p>
</EuiText>
<EuiSpacer />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import {
EuiTitle
} from '@elastic/eui';
import { WhatIs } from '../../blurbs';
import { FormattedMessage } from '@kbn/i18n/react';

export class ExplainCollectionInterval extends React.Component {
constructor(props) {
Expand Down Expand Up @@ -45,15 +46,29 @@ export class ExplainCollectionInterval extends React.Component {
<EuiHorizontalRule size="half" />
<EuiText>
<p>
We checked the {context} settings and found that <EuiCode>{property}</EuiCode>
is set to <EuiCode>{data}</EuiCode>.
<FormattedMessage
id="xpack.monitoring.noData.explanations.collectionIntervalDescription"
defaultMessage="We checked the {context} settings and found that {property}
is set to {data}."
values={{
context,
property: (<EuiCode>{property}</EuiCode>),
data: (<EuiCode>{data}</EuiCode>)
}}
/>
</p>
<p>
The collection interval setting needs to be a positive integer
(10s is recommended) in order for the collection agents to be active.
<FormattedMessage
id="xpack.monitoring.noData.explanations.collectionInterval.wrongIntervalValueDescription"
Nox911 marked this conversation as resolved.
Show resolved Hide resolved
defaultMessage="The collection interval setting needs to be a positive integer
(10s is recommended) in order for the collection agents to be active."
/>
</p>
<p>
Would you like us to change it and enable monitoring?
<FormattedMessage
id="xpack.monitoring.noData.explanations.collectionInterval.changeIntervalDescription"
defaultMessage="Would you like us to change it and enable monitoring?"
/>
</p>
</EuiText>
<EuiSpacer />
Expand All @@ -70,7 +85,10 @@ export class ExplainCollectionInterval extends React.Component {
data-test-subj="enableCollectionInterval"
isLoading={isCollectionIntervalUpdating}
>
Turn on monitoring
<FormattedMessage
id="xpack.monitoring.noData.explanations.collectionInterval.turnOnMonitoringButtonLabel"
defaultMessage="Turn on monitoring"
/>
</EuiButton>
</EuiFlexItem>
</EuiFlexGroup>
Expand All @@ -79,14 +97,22 @@ export class ExplainCollectionInterval extends React.Component {
const renderSuccess = () => (
<Fragment>
<EuiTitle size="l">
<h2>Success! Wait a moment please.</h2>
<h2>
<FormattedMessage
id="xpack.monitoring.noData.explanations.collectionInterval.monitoringTurnedOnTitle"
defaultMessage="Success! Wait a moment please."
/>
</h2>
</EuiTitle>
<EuiHorizontalRule size="half" />
<EuiText>
<p>
As soon as monitoring data appears in your
cluster the page will automatically refresh with your monitoring
dashboard. This only takes only a few seconds.
<FormattedMessage
id="xpack.monitoring.noData.explanations.collectionInterval.monitoringTurnedOnDescription"
defaultMessage="As soon as monitoring data appears in your
cluster the page will automatically refresh with your monitoring
dashboard. This only takes only a few seconds."
/>
</p>
</EuiText>
<EuiSpacer />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import {
EuiHorizontalRule,
} from '@elastic/eui';
import { ChangesNeeded } from '../../blurbs';
import { FormattedMessage } from '@kbn/i18n/react';

export function ExplainExporters({ context, property, data }) {
return (
Expand All @@ -20,28 +21,46 @@ export function ExplainExporters({ context, property, data }) {
<EuiHorizontalRule size="half" />
<EuiText className="eui-textLeft">
<p>
We checked the <EuiCode>{context}</EuiCode> settings for{' '}
<EuiCode>{property}</EuiCode>, and found the reason:{' '}
<EuiCode>{data}</EuiCode>.
<FormattedMessage
id="xpack.monitoring.noData.explanations.exportersDescription"
defaultMessage="We checked the {context} settings for
{property}, and found the reason: {data}."
values={{
context: (<EuiCode>{context}</EuiCode>),
property: (<EuiCode>{property}</EuiCode>),
data: (<EuiCode>{data}</EuiCode>)
}}
/>
</p>

<p>
Using monitoring exporters ship the monitoring data to a remote
monitoring cluster is highly recommended as it keeps the integrity of
the monitoring data safe no matter what the state of the production
cluster. However, as this instance of Kibana could not find any
monitoring data, there seems to be a problem with the{' '}
<EuiCode>{property}</EuiCode> configuration, or the{' '}
<EuiCode>xpack.monitoring.elasticsearch</EuiCode> settings in{' '}
<EuiCode>kibana.yml</EuiCode>.
<FormattedMessage
id="xpack.monitoring.noData.explanations.exporters.problemWithConfigDescription"
defaultMessage="Using monitoring exporters ship the monitoring data to a remote
monitoring cluster is highly recommended as it keeps the integrity of
the monitoring data safe no matter what the state of the production
cluster. However, as this instance of Kibana could not find any
monitoring data, there seems to be a problem with the {property} configuration,
or the {monitoringEs} settings in {kibanaConfig}."
values={{
property: (<EuiCode>{property}</EuiCode>),
monitoringEs: (<EuiCode>xpack.monitoring.elasticsearch</EuiCode>),
kibanaConfig: (<EuiCode>kibana.yml</EuiCode>)
}}
/>
</p>

<p>
Check that the intended exporters are enabled for sending statistics to
the monitoring cluster, and that the monitoring cluster host matches the{' '}
<EuiCode>xpack.monitoring.elasticsearch</EuiCode> setting in{' '}
<EuiCode>kibana.yml</EuiCode> to see monitoring data in this instance of
Kibana.
<FormattedMessage
id="xpack.monitoring.noData.explanations.exporters.checkConfigDescription"
defaultMessage="Check that the intended exporters are enabled for sending statistics to
the monitoring cluster, and that the monitoring cluster host matches the {monitoringEs}
setting in {kibanaConfig} to see monitoring data in this instance of Kibana."
values={{
monitoringEs: (<EuiCode>xpack.monitoring.elasticsearch</EuiCode>),
kibanaConfig: (<EuiCode>kibana.yml</EuiCode>)
}}
/>
</p>
</EuiText>
</Fragment>
Expand Down
Loading