diff --git a/elasticsearch/x-pack/marvel/src/test/java/org/elasticsearch/marvel/agent/resolver/MonitoringIndexNameResolverTestCase.java b/elasticsearch/x-pack/marvel/src/test/java/org/elasticsearch/marvel/agent/resolver/MonitoringIndexNameResolverTestCase.java index 1f3f2cded5a..1d913098310 100644 --- a/elasticsearch/x-pack/marvel/src/test/java/org/elasticsearch/marvel/agent/resolver/MonitoringIndexNameResolverTestCase.java +++ b/elasticsearch/x-pack/marvel/src/test/java/org/elasticsearch/marvel/agent/resolver/MonitoringIndexNameResolverTestCase.java @@ -151,8 +151,7 @@ public abstract class MonitoringIndexNameResolverTestCase sourceFields) { + assertNotNull("source must contain field [" + field + "] with a non-null value", + XContentMapValues.extractValue(field, sourceFields)); + } + protected static String randomMonitoringId() { return randomFrom(MonitoringIds.values()).getId(); } diff --git a/elasticsearch/x-pack/marvel/src/test/java/org/elasticsearch/marvel/agent/resolver/node/NodeStatsResolverTests.java b/elasticsearch/x-pack/marvel/src/test/java/org/elasticsearch/marvel/agent/resolver/node/NodeStatsResolverTests.java index a7e9b2a0eba..e41cba268da 100644 --- a/elasticsearch/x-pack/marvel/src/test/java/org/elasticsearch/marvel/agent/resolver/node/NodeStatsResolverTests.java +++ b/elasticsearch/x-pack/marvel/src/test/java/org/elasticsearch/marvel/agent/resolver/node/NodeStatsResolverTests.java @@ -5,6 +5,7 @@ */ package org.elasticsearch.marvel.agent.resolver.node; +import org.apache.lucene.util.Constants; import org.elasticsearch.Version; import org.elasticsearch.action.admin.cluster.node.stats.NodeStats; import org.elasticsearch.action.admin.indices.stats.CommonStats; @@ -77,6 +78,15 @@ public class NodeStatsResolverTests extends MonitoringIndexNameResolverTestCase< return false; } + @Override + protected void assertSourceField(String field, Map sourceFields) { + // Assertions on node stats fields that are not reported on Windows platforms + if (Constants.WINDOWS && field.startsWith("node_stats.os.cpu.load_average")) { + return; + } + super.assertSourceField(field, sourceFields); + } + public void testNodeStatsResolver() throws IOException { NodeStatsMonitoringDoc doc = newMarvelDoc(); doc.setTimestamp(1437580442979L);