[Monitoring] Use the cluster name from metadata if it exists (#24495)

* Use the cluster name from metadata if it exists * PR comments
elastic · Oct 29, 2018 · 460a297 · 460a297
1 parent 1018947
commit 460a297
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/...ns/monitoring/server/lib/cluster/__test__/__snapshots__/get_clusters_summary.test.js.snap b/...ns/monitoring/server/lib/cluster/__test__/__snapshots__/get_clusters_summary.test.js.snap
@@ -18,7 +18,7 @@ Array [
       "totalEvents": null,
     },
     "ccs": "proddy1",
-    "cluster_name": "proddy1",
+    "cluster_name": "Custom name",
     "cluster_uuid": "fOt6KT9KTICAMm2ncRhsMg",
     "elasticsearch": Object {
       "cluster_stats": Object {
@@ -227,7 +227,7 @@ Array [
       "totalEvents": null,
     },
     "ccs": "proddy1",
-    "cluster_name": "proddy1",
+    "cluster_name": "Custom name",
     "cluster_uuid": "fOt6KT9KTICAMm2ncRhsMg",
     "elasticsearch": Object {
       "cluster_stats": Object {

diff --git a/x-pack/plugins/monitoring/server/lib/cluster/__test__/fixtures/clusters.json b/x-pack/plugins/monitoring/server/lib/cluster/__test__/fixtures/clusters.json
@@ -304,6 +304,13 @@
         }
       }
     },
+    "cluster_settings": {
+      "cluster": {
+        "metadata": {
+          "display_name": "Custom name"
+        }
+      }
+    },
     "isSupported": true,
     "alerts": {
       "alertsMeta": {

diff --git a/x-pack/plugins/monitoring/server/lib/cluster/get_clusters_stats.js b/x-pack/plugins/monitoring/server/lib/cluster/get_clusters_stats.js
@@ -57,7 +57,8 @@ function fetchClusterStats(req, esIndexPattern, clusterUuid) {
       'hits.hits._source.license.expiry_date',
       'hits.hits._source.license.expiry_date_in_millis',
       'hits.hits._source.cluster_stats',
-      'hits.hits._source.cluster_state'
+      'hits.hits._source.cluster_state',
+      'hits.hits._source.cluster_settings.cluster.metadata.display_name'
     ],
     body: {
       query: createQuery({ type: 'cluster_stats', start, end, metric, clusterUuid }),

diff --git a/x-pack/plugins/monitoring/server/lib/cluster/get_clusters_summary.js b/x-pack/plugins/monitoring/server/lib/cluster/get_clusters_summary.js
@@ -4,15 +4,14 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { pick, omit } from 'lodash';
+import { pick, omit, get } from 'lodash';
 import { calculateOverallStatus } from '../calculate_overall_status';
 
 export function getClustersSummary(clusters, kibanaUuid) {
   return clusters.map(cluster => {
     const {
       isSupported,
       cluster_uuid: clusterUuid,
-      cluster_name: clusterName,
       version,
       license,
       cluster_stats: clusterStats,
@@ -22,9 +21,12 @@ export function getClustersSummary(clusters, kibanaUuid) {
       beats,
       apm,
       alerts,
-      ccs
+      ccs,
+      cluster_settings: clusterSettings
     } = cluster;
 
+    const clusterName = get(clusterSettings, 'cluster.metadata.display_name', cluster.cluster_name);
+
     const {
       status: licenseStatus,
       type: licenseType,