honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-23 21:38:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Monitoring] Removing unused version.* fields (#33584)

Browse Source 
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).
This commit is contained in:
Shaunak Kashyap 2018-09-17 18:29:30 -07:00 committed by GitHub
parent 012b9c7539
commit a95226bdae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,13 +69,6 @@ public class IndexStatsMonitoringDoc extends FilteredMonitoringDoc {
builder.field("created", metaData.getCreationDate()); builder.field("created", metaData.getCreationDate());
builder.field("status", health.getStatus().name().toLowerCase(Locale.ROOT)); 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"); builder.startObject("shards");
{ {
final int total = metaData.getTotalNumberOfShards(); final int total = metaData.getTotalNumberOfShards();
@ -128,8 +121,6 @@ public class IndexStatsMonitoringDoc extends FilteredMonitoringDoc {
"index_stats.uuid", "index_stats.uuid",
"index_stats.created", "index_stats.created",
"index_stats.status", "index_stats.status",
"index_stats.version.created",
"index_stats.version.upgraded",
"index_stats.shards.total", "index_stats.shards.total",
"index_stats.shards.primaries", "index_stats.shards.primaries",
"index_stats.shards.replicas", "index_stats.shards.replicas",

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

@ -290,10 +290,6 @@ public class IndexStatsMonitoringDocTests extends BaseFilteredMonitoringDocTestC
"\"uuid\":\"" + index.getUUID() + "\"," + "\"uuid\":\"" + index.getUUID() + "\"," +
"\"created\":" + metaData.getCreationDate() + "," + "\"created\":" + metaData.getCreationDate() + "," +
"\"status\":\"" + indexHealth.getStatus().name().toLowerCase(Locale.ROOT) + "\"," + "\"status\":\"" + indexHealth.getStatus().name().toLowerCase(Locale.ROOT) + "\"," +
"\"version\":{" +
"\"created\":\"" + metaData.getCreationVersion() + "\"," +
"\"upgraded\":\"" + metaData.getUpgradedVersion() + "\"" +
"}," +
"\"shards\":{" + "\"shards\":{" +
"\"total\":" + total + "," + "\"total\":" + total + "," +
"\"primaries\":" + primaries + "," + "\"primaries\":" + primaries + "," +

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

@ -417,7 +417,7 @@ public class MonitoringIT extends ESSingleNodeTestCase {
// particular field values checked in the index stats tests // particular field values checked in the index stats tests
final Map<String, Object> indexStats = (Map<String, Object>) source.get(IndexStatsMonitoringDoc.TYPE); final Map<String, Object> indexStats = (Map<String, Object>) source.get(IndexStatsMonitoringDoc.TYPE);
assertEquals(8, indexStats.size()); assertEquals(7, indexStats.size());
assertThat((String) indexStats.get("index"), not(isEmptyOrNullString())); assertThat((String) indexStats.get("index"), not(isEmptyOrNullString()));
assertThat((String) indexStats.get("uuid"), not(isEmptyOrNullString())); assertThat((String) indexStats.get("uuid"), not(isEmptyOrNullString()));
assertThat(indexStats.get("created"), notNullValue()); assertThat(indexStats.get("created"), notNullValue());