From e4689df54a2a691b51c7cc990eba7a345e3517f6 Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Thu, 1 Nov 2018 13:51:27 -0700 Subject: [PATCH] Only collect display name (for now) --- .../cluster/ClusterStatsMonitoringDoc.java | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/cluster/ClusterStatsMonitoringDoc.java b/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/cluster/ClusterStatsMonitoringDoc.java index 75c0ba6b81c7d..8653d3a0cd35d 100644 --- a/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/cluster/ClusterStatsMonitoringDoc.java +++ b/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/cluster/ClusterStatsMonitoringDoc.java @@ -47,7 +47,7 @@ public class ClusterStatsMonitoringDoc extends MonitoringDoc { ClusterState.Metric.NODES)); public static final String TYPE = "cluster_stats"; - protected static final String SETTING_CLUSTER_METADATA = "cluster.metadata"; + protected static final String SETTING_DISPLAY_NAME = "cluster.metadata.display_name"; private final String clusterName; private final String version; @@ -121,12 +121,12 @@ boolean getClusterNeedsTLSEnabled() { return clusterNeedsTLSEnabled; } - Settings getClusterMetaDataSettings() { + String getClusterDisplayName() { MetaData metaData = this.clusterState.getMetaData(); if (metaData == null) { - return Settings.EMPTY; + return null; } - return metaData.settings().getAsSettings(SETTING_CLUSTER_METADATA); + return metaData.settings().get(SETTING_DISPLAY_NAME); } @Override @@ -167,21 +167,19 @@ protected void innerToXContent(XContentBuilder builder, Params params) throws IO builder.endObject(); } - Settings clusterMetaDataSettings = getClusterMetaDataSettings(); - if (clusterMetaDataSettings != null) { + String displayName = getClusterDisplayName(); + if (displayName != null) { builder.startObject("cluster_settings"); { - if (clusterMetaDataSettings.size() > 0) { builder.startObject("cluster"); { builder.startObject("metadata"); { - clusterMetaDataSettings.toXContent(builder, params); + builder.field("display_name", displayName); } builder.endObject(); } builder.endObject(); - } } builder.endObject(); }