From 6c0f83a515947e545e27397cbe9e53202895dc02 Mon Sep 17 00:00:00 2001 From: Mike Place Date: Thu, 13 Jun 2019 14:46:36 +0200 Subject: [PATCH] Minor changes to text on Alerting in Stack Monitoring application (#38388) * 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 --- .../server/cluster_alerts/__tests__/check_license.js | 4 ++-- .../plugins/monitoring/server/cluster_alerts/check_license.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/x-pack/plugins/monitoring/server/cluster_alerts/__tests__/check_license.js b/x-pack/plugins/monitoring/server/cluster_alerts/__tests__/check_license.js index ec18d85752a6..f8dd7a65a184 100644 --- a/x-pack/plugins/monitoring/server/cluster_alerts/__tests__/check_license.js +++ b/x-pack/plugins/monitoring/server/cluster_alerts/__tests__/check_license.js @@ -35,7 +35,7 @@ describe('Monitoring Check License', () => { const result = checkLicense('basic', true, 'test-cluster-ghi'); expect(result).to.eql({ 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); expect(result).to.eql({ clusterAlerts: { enabled: false }, - message: 'Cluster alerts is not enabled because Watcher is disabled.' + message: 'Cluster Alerts are not enabled because Watcher is disabled.' }); }); }); diff --git a/x-pack/plugins/monitoring/server/cluster_alerts/check_license.js b/x-pack/plugins/monitoring/server/cluster_alerts/check_license.js index 8bc15c8cc3e8..71f5624e4147 100644 --- a/x-pack/plugins/monitoring/server/cluster_alerts/check_license.js +++ b/x-pack/plugins/monitoring/server/cluster_alerts/check_license.js @@ -39,7 +39,7 @@ export function checkLicense(type, active, clusterSource, watcher = true) { return Object.assign(licenseInfo, { message: i18n.translate('xpack.monitoring.clusterAlerts.checkLicense.licenseIsBasicDescription', { 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: { clusterSource } @@ -64,7 +64,7 @@ export function checkLicense(type, active, clusterSource, watcher = true) { if (!watcher) { return Object.assign(licenseInfo, { 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.' }) }); }