[Stack Monitoring] Fix displaying ES version for external collection (#…

…131194) * [Stack Monitoring] Fix displaying ES version for external collection (#126741) * Sort node versions and join into display string * Update test fixture * Update second test fixture Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
elastic · May 16, 2022 · aefb58d · aefb58d
1 parent 8f4f4cd
commit aefb58d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/x-pack/plugins/monitoring/server/lib/cluster/get_clusters_summary.ts b/x-pack/plugins/monitoring/server/lib/cluster/get_clusters_summary.ts
@@ -10,6 +10,7 @@ import {
   ElasticsearchModifiedSource,
   ElasticsearchLegacySource,
   ElasticsearchSourceKibanaStats,
+  ElasticsearchMetricbeatSource,
 } from '../../../common/types/es';
 // @ts-ignore
 import { calculateOverallStatus } from '../calculate_overall_status';
@@ -47,7 +48,7 @@ export function getClustersSummary(
     } = cluster;
 
     const license = cluster.license || cluster.elasticsearch?.cluster?.stats?.license;
-    const version = cluster.version || cluster.elasticsearch?.version;
+    const version = cluster.version || ecsFormatVersion(cluster);
     const clusterUuid = cluster.cluster_uuid || cluster.elasticsearch?.cluster?.id;
     const clusterStatsLegacy = cluster.cluster_stats;
     const clusterStatsMB = cluster.elasticsearch?.cluster?.stats;
@@ -161,3 +162,9 @@ export function getClustersSummary(
     };
   });
 }
+
+function ecsFormatVersion(cluster: ElasticsearchMetricbeatSource) {
+  const versions = cluster.elasticsearch?.cluster?.stats?.nodes?.versions || [];
+  const sortedVersions = [...versions].sort().reverse();
+  return sortedVersions.join('/');
+}
diff --git a/x-pack/test/api_integration/apis/monitoring/standalone_cluster/fixtures/cluster.json b/x-pack/test/api_integration/apis/monitoring/standalone_cluster/fixtures/cluster.json
@@ -1,6 +1,7 @@
 [
   {
     "cluster_uuid": "__standalone_cluster__",
+    "version": "",
     "license": {},
     "elasticsearch": {
       "cluster_stats": {

diff --git a/x-pack/test/api_integration/apis/monitoring/standalone_cluster/fixtures/clusters.json b/x-pack/test/api_integration/apis/monitoring/standalone_cluster/fixtures/clusters.json
@@ -112,6 +112,7 @@
   {
     "isSupported": true,
     "cluster_uuid": "__standalone_cluster__",
+    "version": "",
     "license": {},
     "elasticsearch": {
       "cluster_stats": {