From a95226bdaeaf13347d1bbd2761e3eeaead47c145 Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Mon, 17 Sep 2018 18:29:30 -0700 Subject: [PATCH] [Monitoring] Removing unused version.* fields (#33584) This PR removes fields that are not actually used by the Monitoring UI. This will greatly simplify the eventual migration to using Metricbeat for monitoring Elasticsearch (see https://github.com/elastic/beats/pull/8260#discussion_r215885868 for more context and discussion around removing these fields from ES collection). --- .../collector/indices/IndexStatsMonitoringDoc.java | 9 --------- .../collector/indices/IndexStatsMonitoringDocTests.java | 4 ---- .../xpack/monitoring/integration/MonitoringIT.java | 2 +- 3 files changed, 1 insertion(+), 14 deletions(-) diff --git a/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/indices/IndexStatsMonitoringDoc.java b/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/indices/IndexStatsMonitoringDoc.java index f90abb1639d..c72e645dfd0 100644 --- a/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/indices/IndexStatsMonitoringDoc.java +++ b/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/indices/IndexStatsMonitoringDoc.java @@ -69,13 +69,6 @@ public class IndexStatsMonitoringDoc extends FilteredMonitoringDoc { builder.field("created", metaData.getCreationDate()); builder.field("status", health.getStatus().name().toLowerCase(Locale.ROOT)); - builder.startObject("version"); - { - builder.field("created", metaData.getCreationVersion()); - builder.field("upgraded", metaData.getUpgradedVersion()); - } - builder.endObject(); - builder.startObject("shards"); { final int total = metaData.getTotalNumberOfShards(); @@ -128,8 +121,6 @@ public class IndexStatsMonitoringDoc extends FilteredMonitoringDoc { "index_stats.uuid", "index_stats.created", "index_stats.status", - "index_stats.version.created", - "index_stats.version.upgraded", "index_stats.shards.total", "index_stats.shards.primaries", "index_stats.shards.replicas", diff --git a/x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/collector/indices/IndexStatsMonitoringDocTests.java b/x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/collector/indices/IndexStatsMonitoringDocTests.java index 278af123625..da9063507da 100644 --- a/x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/collector/indices/IndexStatsMonitoringDocTests.java +++ b/x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/collector/indices/IndexStatsMonitoringDocTests.java @@ -290,10 +290,6 @@ public class IndexStatsMonitoringDocTests extends BaseFilteredMonitoringDocTestC "\"uuid\":\"" + index.getUUID() + "\"," + "\"created\":" + metaData.getCreationDate() + "," + "\"status\":\"" + indexHealth.getStatus().name().toLowerCase(Locale.ROOT) + "\"," + - "\"version\":{" + - "\"created\":\"" + metaData.getCreationVersion() + "\"," + - "\"upgraded\":\"" + metaData.getUpgradedVersion() + "\"" + - "}," + "\"shards\":{" + "\"total\":" + total + "," + "\"primaries\":" + primaries + "," + diff --git a/x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/integration/MonitoringIT.java b/x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/integration/MonitoringIT.java index 77a70f5da57..a6f9a14f28b 100644 --- a/x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/integration/MonitoringIT.java +++ b/x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/integration/MonitoringIT.java @@ -417,7 +417,7 @@ public class MonitoringIT extends ESSingleNodeTestCase { // particular field values checked in the index stats tests final Map indexStats = (Map) source.get(IndexStatsMonitoringDoc.TYPE); - assertEquals(8, indexStats.size()); + assertEquals(7, indexStats.size()); assertThat((String) indexStats.get("index"), not(isEmptyOrNullString())); assertThat((String) indexStats.get("uuid"), not(isEmptyOrNullString())); assertThat(indexStats.get("created"), notNullValue());