From 9b4a5a07d80a20b05dbbaf9ae826974628bba806 Mon Sep 17 00:00:00 2001 From: Pete Harverson Date: Fri, 21 Dec 2018 09:13:30 +0000 Subject: [PATCH] [ML] Handle removal of backend ml.enabled node attribute (#27604) --- x-pack/plugins/ml/server/routes/system.js | 3 ++- .../nodes/get_nodes/__test__/map_nodes_info.test.js | 3 +-- .../monitoring/server/lib/logstash/__tests__/get_pipeline.js | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/x-pack/plugins/ml/server/routes/system.js b/x-pack/plugins/ml/server/routes/system.js index e723defdabf0..65cf88cba581 100644 --- a/x-pack/plugins/ml/server/routes/system.js +++ b/x-pack/plugins/ml/server/routes/system.js @@ -26,7 +26,8 @@ export function systemRoutes(server, commonRouteConfig) { if (typeof resp.nodes === 'object') { Object.keys(resp.nodes).forEach((k) => { if (resp.nodes[k].attributes !== undefined) { - if (resp.nodes[k].attributes['ml.enabled'] === 'true') { + const maxOpenJobs = resp.nodes[k].attributes['ml.max_open_jobs']; + if (maxOpenJobs !== null && maxOpenJobs > 0) { count++; } } diff --git a/x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/map_nodes_info.test.js b/x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/map_nodes_info.test.js index da3d65b28b1f..4b471e747a53 100644 --- a/x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/map_nodes_info.test.js +++ b/x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/map_nodes_info.test.js @@ -51,8 +51,7 @@ describe('map nodes info', () => { transport_address: '127.0.0.1:9300', attributes: { 'ml.machine_memory': '17179869184', - 'ml.max_open_jobs': '20', - 'ml.enabled': 'true' + 'ml.max_open_jobs': '20' } } } diff --git a/x-pack/plugins/monitoring/server/lib/logstash/__tests__/get_pipeline.js b/x-pack/plugins/monitoring/server/lib/logstash/__tests__/get_pipeline.js index e2be73d10df8..97a4610a8831 100644 --- a/x-pack/plugins/monitoring/server/lib/logstash/__tests__/get_pipeline.js +++ b/x-pack/plugins/monitoring/server/lib/logstash/__tests__/get_pipeline.js @@ -108,7 +108,8 @@ describe('get_pipeline', () => { ip: '127.0.0.1', name: 'B0buMd-', attributes: { - 'ml.enabled': 'true' + 'ml.machine_memory': '17179869184', + 'ml.max_open_jobs': '20' } }, logstash_state: {