@@ -87,7 +137,7 @@ const nodeRowFactory = (scope, kbnUrl) => {
};
const uiModule = uiModules.get('monitoring/directives', []);
-uiModule.directive('monitoringLogstashNodeListing', kbnUrl => {
+uiModule.directive('monitoringLogstashNodeListing', (kbnUrl, i18n) => {
return {
restrict: 'E',
scope: {
@@ -101,20 +151,23 @@ uiModule.directive('monitoringLogstashNodeListing', kbnUrl => {
link: function (scope, $el) {
scope.$watch('nodes', (nodes = []) => {
+ const filterNodesPlaceholder = i18n('xpack.monitoring.logstash.filterNodesPlaceholder', { defaultMessage: 'Filter Nodes…' });
const nodesTable = (
-
+
+
+
);
render(nodesTable, $el[0]);
});
diff --git a/x-pack/plugins/monitoring/public/directives/logstash/node_summary/index.js b/x-pack/plugins/monitoring/public/directives/logstash/node_summary/index.js
index b7d13f61afaa53..1f3342266608da 100644
--- a/x-pack/plugins/monitoring/public/directives/logstash/node_summary/index.js
+++ b/x-pack/plugins/monitoring/public/directives/logstash/node_summary/index.js
@@ -8,6 +8,7 @@ import React from 'react';
import { render } from 'react-dom';
import { uiModules } from 'ui/modules';
import { DetailStatus } from 'plugins/monitoring/components/logstash/detail_status';
+import { I18nProvider } from '@kbn/i18n/react';
const uiModule = uiModules.get('monitoring/directives', []);
uiModule.directive('monitoringLogstashNodeSummary', () => {
@@ -18,7 +19,7 @@ uiModule.directive('monitoringLogstashNodeSummary', () => {
},
link(scope, $el) {
scope.$watch('logstash', logstash => {
- render(
, $el[0]);
+ render(
, $el[0]);
});
}
};
diff --git a/x-pack/plugins/monitoring/public/directives/logstash/pipeline_listing/index.js b/x-pack/plugins/monitoring/public/directives/logstash/pipeline_listing/index.js
index 0df57bff80de1b..bcb2fedfacc32c 100644
--- a/x-pack/plugins/monitoring/public/directives/logstash/pipeline_listing/index.js
+++ b/x-pack/plugins/monitoring/public/directives/logstash/pipeline_listing/index.js
@@ -24,12 +24,29 @@ import { Sparkline } from 'plugins/monitoring/components/sparkline';
import { SORT_ASCENDING } from '../../../../common/constants';
import { formatMetric } from '../../../lib/format_number';
import { timefilter } from 'ui/timefilter';
+import { i18n } from '@kbn/i18n';
const filterFields = [ 'id' ];
const columns = [
- { title: 'ID', sortKey: 'id', sortOrder: SORT_ASCENDING },
- { title: 'Events Emitted Rate', sortKey: 'latestThroughput' },
- { title: 'Number of Nodes', sortKey: 'latestNodesCount', }
+ {
+ title: i18n.translate('xpack.monitoring.logstash.pipelines.idTitle', {
+ defaultMessage: 'ID'
+ }),
+ sortKey: 'id',
+ sortOrder: SORT_ASCENDING
+ },
+ {
+ title: i18n.translate('xpack.monitoring.logstash.pipelines.eventsEmittedRateTitle', {
+ defaultMessage: 'Events Emitted Rate'
+ }),
+ sortKey: 'latestThroughput'
+ },
+ {
+ title: i18n.translate('xpack.monitoring.logstash.pipelines.numberOfNodesTitle', {
+ defaultMessage: 'Number of Nodes'
+ }),
+ sortKey: 'latestNodesCount',
+ }
];
const pipelineRowFactory = (onPipelineClick, onBrush, tooltipXValueFormatter, tooltipYValueFormatter) => {
@@ -104,7 +121,7 @@ const pipelineRowFactory = (onPipelineClick, onBrush, tooltipXValueFormatter, to
};
const uiModule = uiModules.get('monitoring/directives', []);
-uiModule.directive('monitoringLogstashPipelineListing', ($injector) => {
+uiModule.directive('monitoringLogstashPipelineListing', ($injector, i18n) => {
const kbnUrl = $injector.get('kbnUrl');
const config = $injector.get('config');
@@ -150,6 +167,10 @@ uiModule.directive('monitoringLogstashPipelineListing', ($injector) => {
return;
}
+ const filterPipelinesPlaceholder = i18n('xpack.monitoring.logstash.filterPipelinesPlaceholder', {
+ defaultMessage: 'Filter Pipelines…'
+ });
+
const pipelinesTable = (
{
sortKey={scope.sortKey}
sortOrder={scope.sortOrder}
onNewState={scope.onNewState}
- placeholder="Filter Pipelines..."
+ placeholder={filterPipelinesPlaceholder}
filterFields={filterFields}
columns={columns}
rowComponent={pipelineRowFactory(onPipelineClick, onBrush, tooltipXValueFormatter, tooltipYValueFormatter)}
diff --git a/x-pack/plugins/monitoring/public/directives/logstash/pipeline_viewer/index.js b/x-pack/plugins/monitoring/public/directives/logstash/pipeline_viewer/index.js
index da2d90ab49ac15..fcc143ad29e45c 100644
--- a/x-pack/plugins/monitoring/public/directives/logstash/pipeline_viewer/index.js
+++ b/x-pack/plugins/monitoring/public/directives/logstash/pipeline_viewer/index.js
@@ -12,6 +12,7 @@ import { PipelineViewer } from 'plugins/monitoring/components/logstash/pipeline_
import { Pipeline } from 'plugins/monitoring/components/logstash/pipeline_viewer/models/pipeline';
import { List } from 'plugins/monitoring/components/logstash/pipeline_viewer/models/list';
import { PipelineState } from 'plugins/monitoring/components/logstash/pipeline_viewer/models/pipeline_state';
+import { I18nProvider } from '@kbn/i18n/react';
const uiModule = uiModules.get('monitoring/directives', []);
uiModule.directive('monitoringLogstashPipelineViewer', $injector => {
@@ -33,12 +34,14 @@ uiModule.directive('monitoringLogstashPipelineViewer', $injector => {
pipelineState.update(updatedPipeline);
render(
- ,
+
+
+ ,
$el[0]
);
});
diff --git a/x-pack/plugins/monitoring/public/views/logstash/node/advanced/index.js b/x-pack/plugins/monitoring/public/views/logstash/node/advanced/index.js
index ab530fdaef9c3d..97484bdfe0eaee 100644
--- a/x-pack/plugins/monitoring/public/views/logstash/node/advanced/index.js
+++ b/x-pack/plugins/monitoring/public/views/logstash/node/advanced/index.js
@@ -46,7 +46,7 @@ uiRoutes.when('/logstash/node/:uuid/advanced', {
},
pageData: getPageData
},
- controller($injector, $scope) {
+ controller($injector, $scope, i18n) {
timefilter.enableTimeRangeSelector();
timefilter.enableAutoRefreshSelector();
@@ -56,7 +56,13 @@ uiRoutes.when('/logstash/node/:uuid/advanced', {
$scope.pageData = $route.current.locals.pageData;
const title = $injector.get('title');
- title($scope.cluster, `Logstash - ${$scope.pageData.nodeSummary.name} - Advanced`);
+ const routeTitle = i18n('xpack.monitoring.logstash.node.advanced.routeTitle', {
+ defaultMessage: 'Logstash - {nodeName} - Advanced',
+ values: {
+ nodeName: $scope.pageData.nodeSummary.name
+ }
+ });
+ title($scope.cluster, routeTitle);
const $executor = $injector.get('$executor');
$executor.register({
diff --git a/x-pack/plugins/monitoring/public/views/logstash/node/index.js b/x-pack/plugins/monitoring/public/views/logstash/node/index.js
index fee91294e5a355..f316740d83c118 100644
--- a/x-pack/plugins/monitoring/public/views/logstash/node/index.js
+++ b/x-pack/plugins/monitoring/public/views/logstash/node/index.js
@@ -46,7 +46,7 @@ uiRoutes.when('/logstash/node/:uuid', {
},
pageData: getPageData
},
- controller($injector, $scope) {
+ controller($injector, $scope, i18n) {
timefilter.enableTimeRangeSelector();
timefilter.enableAutoRefreshSelector();
@@ -56,7 +56,13 @@ uiRoutes.when('/logstash/node/:uuid', {
$scope.pageData = $route.current.locals.pageData;
const title = $injector.get('title');
- title($scope.cluster, `Logstash - ${$scope.pageData.nodeSummary.name}`);
+ const routeTitle = i18n('xpack.monitoring.logstash.node.routeTitle', {
+ defaultMessage: 'Logstash - {nodeName}',
+ values: {
+ nodeName: $scope.pageData.nodeSummary.name
+ }
+ });
+ title($scope.cluster, routeTitle);
const $executor = $injector.get('$executor');
$executor.register({
diff --git a/x-pack/plugins/monitoring/public/views/logstash/node/pipelines/index.js b/x-pack/plugins/monitoring/public/views/logstash/node/pipelines/index.js
index f6b55b0cc94c15..e8d59fe9b8b67c 100644
--- a/x-pack/plugins/monitoring/public/views/logstash/node/pipelines/index.js
+++ b/x-pack/plugins/monitoring/public/views/logstash/node/pipelines/index.js
@@ -42,12 +42,18 @@ const getPageData = ($injector) => {
});
};
-function makeUpgradeMessage(logstashVersion) {
+function makeUpgradeMessage(logstashVersion, i18n) {
if (isPipelineMonitoringSupportedInVersion(logstashVersion)) {
return null;
}
- return `Pipeline monitoring is only available in Logstash version 6.0.0 or higher. This node is running version ${logstashVersion}.`;
+ return i18n('xpack.monitoring.logstash.node.pipelines.notAvailableDescription', {
+ defaultMessage:
+ 'Pipeline monitoring is only available in Logstash version 6.0.0 or higher. This node is running version {logstashVersion}.',
+ values: {
+ logstashVersion
+ }
+ });
}
uiRoutes
@@ -60,7 +66,7 @@ uiRoutes
},
pageData: getPageData
},
- controller($injector, $scope) {
+ controller($injector, $scope, i18n) {
const $route = $injector.get('$route');
const globalState = $injector.get('globalState');
const title = $injector.get('title');
@@ -69,11 +75,17 @@ uiRoutes
$scope.cluster = find($route.current.locals.clusters, { cluster_uuid: globalState.cluster_uuid });
$scope.pageData = $route.current.locals.pageData;
- $scope.upgradeMessage = makeUpgradeMessage($scope.pageData.nodeSummary.version);
+ $scope.upgradeMessage = makeUpgradeMessage($scope.pageData.nodeSummary.version, i18n);
timefilter.enableTimeRangeSelector();
timefilter.enableAutoRefreshSelector();
- title($scope.cluster, `Logstash - ${$scope.pageData.nodeSummary.name} - Pipelines`);
+ const routeTitle = i18n('xpack.monitoring.logstash.node.pipelines.routeTitle', {
+ defaultMessage: 'Logstash - {nodeName} - Pipelines',
+ values: {
+ nodeName: $scope.pageData.nodeSummary.name
+ }
+ });
+ title($scope.cluster, routeTitle);
$executor.register({
execute: () => getPageData($injector),
diff --git a/x-pack/plugins/monitoring/public/views/logstash/nodes/index.html b/x-pack/plugins/monitoring/public/views/logstash/nodes/index.html
index 51f75f4f2a9f71..8385a12a92e839 100644
--- a/x-pack/plugins/monitoring/public/views/logstash/nodes/index.html
+++ b/x-pack/plugins/monitoring/public/views/logstash/nodes/index.html
@@ -1,7 +1,12 @@
-
Logstash Nodes
+
+
getPageData($injector),
diff --git a/x-pack/plugins/monitoring/public/views/logstash/pipelines/index.js b/x-pack/plugins/monitoring/public/views/logstash/pipelines/index.js
index 97cda776e87edb..27e68ae56976b8 100644
--- a/x-pack/plugins/monitoring/public/views/logstash/pipelines/index.js
+++ b/x-pack/plugins/monitoring/public/views/logstash/pipelines/index.js
@@ -40,14 +40,16 @@ const getPageData = ($injector) => {
});
};
-function makeUpgradeMessage(logstashVersions) {
+function makeUpgradeMessage(logstashVersions, i18n) {
if (!Array.isArray(logstashVersions)
|| (logstashVersions.length === 0)
|| logstashVersions.some(isPipelineMonitoringSupportedInVersion)) {
return null;
}
- return 'Pipeline monitoring is only available in Logstash version 6.0.0 or higher.';
+ return i18n('xpack.monitoring.logstash.pipelines.notAvalibleDescription', {
+ defaultMessage: 'Pipeline monitoring is only available in Logstash version 6.0.0 or higher.'
+ });
}
uiRoutes
@@ -60,7 +62,7 @@ uiRoutes
},
pageData: getPageData
},
- controller($injector, $scope) {
+ controller($injector, $scope, i18n) {
const $route = $injector.get('$route');
const globalState = $injector.get('globalState');
const title = $injector.get('title');
@@ -69,11 +71,13 @@ uiRoutes
$scope.cluster = find($route.current.locals.clusters, { cluster_uuid: globalState.cluster_uuid });
$scope.pageData = $route.current.locals.pageData;
- $scope.upgradeMessage = makeUpgradeMessage($scope.pageData.clusterStatus.versions);
+ $scope.upgradeMessage = makeUpgradeMessage($scope.pageData.clusterStatus.versions, i18n);
timefilter.enableTimeRangeSelector();
timefilter.enableAutoRefreshSelector();
- title($scope.cluster, 'Logstash Pipelines');
+ title($scope.cluster, i18n('xpack.monitoring.logstash.pipelines.routeTitle', {
+ defaultMessage: 'Logstash Pipelines'
+ }));
$executor.register({
execute: () => getPageData($injector),