Skip to content

Commit 5c4b716

Browse files
committed
[Monitoring] Removing unused version.* fields (elastic#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 elastic/beats#8260 (comment) for more context and discussion around removing these fields from ES collection).
1 parent cdde837 commit 5c4b716

File tree

3 files changed

+1
-14
lines changed

3 files changed

+1
-14
lines changed

x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/collector/indices/IndexStatsMonitoringDoc.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,6 @@ protected void innerToXContent(XContentBuilder builder, Params params) throws IO
6969
builder.field("created", metaData.getCreationDate());
7070
builder.field("status", health.getStatus().name().toLowerCase(Locale.ROOT));
7171

72-
builder.startObject("version");
73-
{
74-
builder.field("created", metaData.getCreationVersion());
75-
builder.field("upgraded", metaData.getUpgradedVersion());
76-
}
77-
builder.endObject();
78-
7972
builder.startObject("shards");
8073
{
8174
final int total = metaData.getTotalNumberOfShards();
@@ -128,8 +121,6 @@ protected void innerToXContent(XContentBuilder builder, Params params) throws IO
128121
"index_stats.uuid",
129122
"index_stats.created",
130123
"index_stats.status",
131-
"index_stats.version.created",
132-
"index_stats.version.upgraded",
133124
"index_stats.shards.total",
134125
"index_stats.shards.primaries",
135126
"index_stats.shards.replicas",

x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/collector/indices/IndexStatsMonitoringDocTests.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -290,10 +290,6 @@ private String indexStatsSummary() {
290290
"\"uuid\":\"" + index.getUUID() + "\"," +
291291
"\"created\":" + metaData.getCreationDate() + "," +
292292
"\"status\":\"" + indexHealth.getStatus().name().toLowerCase(Locale.ROOT) + "\"," +
293-
"\"version\":{" +
294-
"\"created\":\"" + metaData.getCreationVersion() + "\"," +
295-
"\"upgraded\":\"" + metaData.getUpgradedVersion() + "\"" +
296-
"}," +
297293
"\"shards\":{" +
298294
"\"total\":" + total + "," +
299295
"\"primaries\":" + primaries + "," +

x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/integration/MonitoringIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@ private void assertIndexStatsMonitoringDoc(final Map<String, Object> document) {
419419

420420
// particular field values checked in the index stats tests
421421
final Map<String, Object> indexStats = (Map<String, Object>) source.get(IndexStatsMonitoringDoc.TYPE);
422-
assertEquals(8, indexStats.size());
422+
assertEquals(7, indexStats.size());
423423
assertThat((String) indexStats.get("index"), not(isEmptyOrNullString()));
424424
assertThat((String) indexStats.get("uuid"), not(isEmptyOrNullString()));
425425
assertThat(indexStats.get("created"), notNullValue());

0 commit comments

Comments
 (0)