maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Minor changes to text on Alerting in Stack Monitoring application (#38388)

Browse source 
* Minor changes to text.

* "Basic" is a proper name, so it should be capatalized.

* Cluster Alerts are plural.

* Fix tests to align with help text changes

* Missed one test file
This commit is contained in:
Mike Place 2019-06-13 14:46:36 +02:00 committed by GitHub
parent 5f3f1966cb
commit 6c0f83a515
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
x-pack/plugins/monitoring/server/cluster_alerts/__tests__/check_license.js
View file

@ -35,7 +35,7 @@ describe('Monitoring Check License', () => {
const result = checkLicense('basic', true, 'test-cluster-ghi'); const result = checkLicense('basic', true, 'test-cluster-ghi');
expect(result).to.eql({ expect(result).to.eql({
clusterAlerts: { enabled: false }, clusterAlerts: { enabled: false },
message: `Cluster Alerts are not displayed if Watcher is disabled or the [test-cluster-ghi] cluster's current license is basic.` message: `Cluster Alerts are not displayed if Watcher is disabled or the [test-cluster-ghi] cluster's current license is Basic.`
}); });
}); });
}); });
@ -67,7 +67,7 @@ describe('Monitoring Check License', () => {
const result = checkLicense('platinum', true, 'test-cluster-pqr', false); const result = checkLicense('platinum', true, 'test-cluster-pqr', false);
expect(result).to.eql({ expect(result).to.eql({
clusterAlerts: { enabled: false }, clusterAlerts: { enabled: false },
message: 'Cluster alerts is not enabled because Watcher is disabled.' message: 'Cluster Alerts are not enabled because Watcher is disabled.'
}); });
}); });
}); });

4
x-pack/plugins/monitoring/server/cluster_alerts/check_license.js
View file

@ -39,7 +39,7 @@ export function checkLicense(type, active, clusterSource, watcher = true) {
return Object.assign(licenseInfo, { return Object.assign(licenseInfo, {
message: i18n.translate('xpack.monitoring.clusterAlerts.checkLicense.licenseIsBasicDescription', { message: i18n.translate('xpack.monitoring.clusterAlerts.checkLicense.licenseIsBasicDescription', {
defaultMessage: defaultMessage:
`Cluster Alerts are not displayed if Watcher is disabled or the [{clusterSource}] cluster's current license is basic.`, `Cluster Alerts are not displayed if Watcher is disabled or the [{clusterSource}] cluster's current license is Basic.`,
values: { values: {
clusterSource clusterSource
} }
@ -64,7 +64,7 @@ export function checkLicense(type, active, clusterSource, watcher = true) {
if (!watcher) { if (!watcher) {
return Object.assign(licenseInfo, { return Object.assign(licenseInfo, {
message: i18n.translate('xpack.monitoring.clusterAlerts.checkLicense.watcherIsDisabledDescription', { message: i18n.translate('xpack.monitoring.clusterAlerts.checkLicense.watcherIsDisabledDescription', {
defaultMessage: 'Cluster alerts is not enabled because Watcher is disabled.' }) defaultMessage: 'Cluster Alerts are not enabled because Watcher is disabled.' })
}); });
} }