diff --git a/marvel/src/main/java/org/elasticsearch/marvel/agent/collector/cluster/ClusterStateCollector.java b/marvel/src/main/java/org/elasticsearch/marvel/agent/collector/cluster/ClusterStateCollector.java index d0226f6d51d..64109bb679e 100644 --- a/marvel/src/main/java/org/elasticsearch/marvel/agent/collector/cluster/ClusterStateCollector.java +++ b/marvel/src/main/java/org/elasticsearch/marvel/agent/collector/cluster/ClusterStateCollector.java @@ -30,7 +30,7 @@ import java.util.List; public class ClusterStateCollector extends AbstractCollector { public static final String NAME = "cluster-state-collector"; - public static final String TYPE = "marvel_cluster_state"; + public static final String TYPE = "cluster_state"; private final Client client; diff --git a/marvel/src/main/java/org/elasticsearch/marvel/agent/collector/cluster/ClusterStatsCollector.java b/marvel/src/main/java/org/elasticsearch/marvel/agent/collector/cluster/ClusterStatsCollector.java index b998b2af202..3395a7ac6c9 100644 --- a/marvel/src/main/java/org/elasticsearch/marvel/agent/collector/cluster/ClusterStatsCollector.java +++ b/marvel/src/main/java/org/elasticsearch/marvel/agent/collector/cluster/ClusterStatsCollector.java @@ -29,7 +29,7 @@ import java.util.List; public class ClusterStatsCollector extends AbstractCollector { public static final String NAME = "cluster-stats-collector"; - public static final String TYPE = "marvel_cluster_stats"; + public static final String TYPE = "cluster_stats"; private final Client client; diff --git a/marvel/src/main/java/org/elasticsearch/marvel/agent/collector/indices/IndexRecoveryCollector.java b/marvel/src/main/java/org/elasticsearch/marvel/agent/collector/indices/IndexRecoveryCollector.java index 191f2d887cb..d6553a35561 100644 --- a/marvel/src/main/java/org/elasticsearch/marvel/agent/collector/indices/IndexRecoveryCollector.java +++ b/marvel/src/main/java/org/elasticsearch/marvel/agent/collector/indices/IndexRecoveryCollector.java @@ -30,7 +30,7 @@ import java.util.List; public class IndexRecoveryCollector extends AbstractCollector { public static final String NAME = "index-recovery-collector"; - public static final String TYPE = "marvel_index_recovery"; + public static final String TYPE = "index_recovery"; private final Client client; diff --git a/marvel/src/main/java/org/elasticsearch/marvel/agent/collector/indices/IndexStatsCollector.java b/marvel/src/main/java/org/elasticsearch/marvel/agent/collector/indices/IndexStatsCollector.java index bdc684c0d6e..9e87ce9ab41 100644 --- a/marvel/src/main/java/org/elasticsearch/marvel/agent/collector/indices/IndexStatsCollector.java +++ b/marvel/src/main/java/org/elasticsearch/marvel/agent/collector/indices/IndexStatsCollector.java @@ -31,7 +31,7 @@ import java.util.List; public class IndexStatsCollector extends AbstractCollector { public static final String NAME = "index-stats-collector"; - public static final String TYPE = "marvel_index_stats"; + public static final String TYPE = "index_stats"; private final Client client; diff --git a/marvel/src/main/java/org/elasticsearch/marvel/agent/collector/indices/IndicesStatsCollector.java b/marvel/src/main/java/org/elasticsearch/marvel/agent/collector/indices/IndicesStatsCollector.java index b3fdf4328ae..a8dcce2a58b 100644 --- a/marvel/src/main/java/org/elasticsearch/marvel/agent/collector/indices/IndicesStatsCollector.java +++ b/marvel/src/main/java/org/elasticsearch/marvel/agent/collector/indices/IndicesStatsCollector.java @@ -26,7 +26,7 @@ import java.util.Collections; public class IndicesStatsCollector extends AbstractCollector { public static final String NAME = "indices-stats-collector"; - public static final String TYPE = "marvel_indices_stats"; + public static final String TYPE = "indices_stats"; private final Client client; diff --git a/marvel/src/main/java/org/elasticsearch/marvel/agent/collector/node/NodeStatsCollector.java b/marvel/src/main/java/org/elasticsearch/marvel/agent/collector/node/NodeStatsCollector.java index c25af1802ac..a80405e07b7 100644 --- a/marvel/src/main/java/org/elasticsearch/marvel/agent/collector/node/NodeStatsCollector.java +++ b/marvel/src/main/java/org/elasticsearch/marvel/agent/collector/node/NodeStatsCollector.java @@ -36,7 +36,7 @@ import java.util.List; public class NodeStatsCollector extends AbstractCollector { public static final String NAME = "node-stats-collector"; - public static final String TYPE = "marvel_node_stats"; + public static final String TYPE = "node_stats"; private final NodeService nodeService; private final DiscoveryService discoveryService; diff --git a/marvel/src/main/java/org/elasticsearch/marvel/agent/collector/shards/ShardsCollector.java b/marvel/src/main/java/org/elasticsearch/marvel/agent/collector/shards/ShardsCollector.java index 48a9c2924b3..6529708802f 100644 --- a/marvel/src/main/java/org/elasticsearch/marvel/agent/collector/shards/ShardsCollector.java +++ b/marvel/src/main/java/org/elasticsearch/marvel/agent/collector/shards/ShardsCollector.java @@ -32,7 +32,7 @@ import java.util.List; public class ShardsCollector extends AbstractCollector { public static final String NAME = "shards-collector"; - public static final String TYPE = "marvel_shards"; + public static final String TYPE = "shards"; @Inject public ShardsCollector(Settings settings, ClusterService clusterService, MarvelSettings marvelSettings, LicenseService licenseService) { diff --git a/marvel/src/main/resources/marvel_index_template.json b/marvel/src/main/resources/marvel_index_template.json index 8d85ac75c3a..b3283832c88 100644 --- a/marvel/src/main/resources/marvel_index_template.json +++ b/marvel/src/main/resources/marvel_index_template.json @@ -24,7 +24,7 @@ } } }, - "marvel_indices_stats": { + "indices_stats": { "properties": { "indices_stats": { "properties": { @@ -58,7 +58,7 @@ } } }, - "marvel_index_stats": { + "index_stats": { "properties": { "index_stats": { "properties": { @@ -146,7 +146,7 @@ } } }, - "marvel_cluster_stats": { + "cluster_stats": { "properties": { "cluster_stats": { "properties": { @@ -160,7 +160,7 @@ } } }, - "marvel_cluster_state": { + "cluster_state": { "properties": { "cluster_state": { "properties": { @@ -188,7 +188,7 @@ "cluster_info": { "enabled": false }, - "marvel_node_stats": { + "node_stats": { "properties": { "node_stats": { "properties": { @@ -227,14 +227,14 @@ } } }, - "marvel_index_recovery": { + "index_recovery": { "properties": { "shards": { "type": "object" } } }, - "marvel_shards": { + "shards": { "properties": { "state_uuid": { "type": "string", diff --git a/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/cluster/ClusterStateIT.java b/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/cluster/ClusterStateIT.java index ce09abb9ffe..7e57614b2cd 100644 --- a/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/cluster/ClusterStateIT.java +++ b/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/cluster/ClusterStateIT.java @@ -53,7 +53,7 @@ public class ClusterStateIT extends AbstractRendererTestCase { /** * This test should fail if the mapping for the 'nodes' attribute - * in the 'marvel_cluster_state' document is NOT set to 'enable: false' + * in the 'cluster_state' document is NOT set to 'enable: false' * * See */ diff --git a/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/cluster/ClusterStateRendererTests.java b/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/cluster/ClusterStateRendererTests.java index da4c35807f1..e5f6d97e6b4 100644 --- a/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/cluster/ClusterStateRendererTests.java +++ b/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/cluster/ClusterStateRendererTests.java @@ -20,7 +20,7 @@ import org.junit.Test; public class ClusterStateRendererTests extends ESSingleNodeTestCase { - private static final String SAMPLE_FILE = "/samples/marvel_cluster_state.json"; + private static final String SAMPLE_FILE = "/samples/cluster_state.json"; @Test public void testClusterStateRenderer() throws Exception { @@ -36,7 +36,7 @@ public class ClusterStateRendererTests extends ESSingleNodeTestCase { ClusterHealthResponse clusterHealth = client().admin().cluster().prepareHealth().get(); logger.debug("--> creating the cluster state marvel document"); - ClusterStateMarvelDoc marvelDoc = new ClusterStateMarvelDoc("test", "marvel_cluster_state", 1437580442979L, + ClusterStateMarvelDoc marvelDoc = new ClusterStateMarvelDoc("test", "cluster_state", 1437580442979L, clusterState, clusterHealth.getStatus()); logger.debug("--> rendering the document"); diff --git a/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/cluster/ClusterStatsRendererTests.java b/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/cluster/ClusterStatsRendererTests.java index f9197699988..3257fa15440 100644 --- a/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/cluster/ClusterStatsRendererTests.java +++ b/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/cluster/ClusterStatsRendererTests.java @@ -15,7 +15,7 @@ import org.junit.Test; public class ClusterStatsRendererTests extends ESSingleNodeTestCase { - private static final String SAMPLE_FILE = "/samples/marvel_cluster_stats.json"; + private static final String SAMPLE_FILE = "/samples/cluster_stats.json"; @Test public void testClusterStatsRenderer() throws Exception { @@ -25,7 +25,7 @@ public class ClusterStatsRendererTests extends ESSingleNodeTestCase { ClusterStatsResponse clusterStats = client().admin().cluster().prepareClusterStats().get(); logger.debug("--> creating the cluster stats marvel document"); - ClusterStatsMarvelDoc marvelDoc = new ClusterStatsMarvelDoc("test", "marvel_cluster_stats", 1437580442979L, clusterStats); + ClusterStatsMarvelDoc marvelDoc = new ClusterStatsMarvelDoc("test", "cluster_stats", 1437580442979L, clusterStats); logger.debug("--> rendering the document"); Renderer renderer = new ClusterStatsRenderer(); diff --git a/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/indices/IndexRecoveryRendererTests.java b/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/indices/IndexRecoveryRendererTests.java index 1bc493c92d4..657184f69d9 100644 --- a/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/indices/IndexRecoveryRendererTests.java +++ b/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/indices/IndexRecoveryRendererTests.java @@ -25,7 +25,7 @@ import java.util.Map; public class IndexRecoveryRendererTests extends ESTestCase { - private static final String SAMPLE_FILE = "/samples/marvel_index_recovery.json"; + private static final String SAMPLE_FILE = "/samples/index_recovery.json"; @Test public void testIndexRecoveryRenderer() throws Exception { @@ -50,7 +50,7 @@ public class IndexRecoveryRendererTests extends ESTestCase { RecoveryResponse recoveryResponse = new RecoveryResponse(2, 2, 2, false, shardResponses, null); - IndexRecoveryMarvelDoc marvelDoc = new IndexRecoveryMarvelDoc("test", "marvel_index_recovery", 1437580442979L, recoveryResponse); + IndexRecoveryMarvelDoc marvelDoc = new IndexRecoveryMarvelDoc("test", "index_recovery", 1437580442979L, recoveryResponse); logger.debug("--> rendering the document"); Renderer renderer = new IndexRecoveryRenderer(); diff --git a/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/indices/IndexStatsRendererTests.java b/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/indices/IndexStatsRendererTests.java index 88af1efa1a6..ac72247f8c3 100644 --- a/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/indices/IndexStatsRendererTests.java +++ b/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/indices/IndexStatsRendererTests.java @@ -24,12 +24,12 @@ import org.junit.Test; public class IndexStatsRendererTests extends ESTestCase { - private static final String SAMPLE_FILE = "/samples/marvel_index_stats.json"; + private static final String SAMPLE_FILE = "/samples/index_stats.json"; @Test public void testIndexStatsRenderer() throws Exception { logger.debug("--> creating the index stats marvel document"); - IndexStatsMarvelDoc marvelDoc = new IndexStatsMarvelDoc("test", "marvel_index_stats", 1437580442979L, + IndexStatsMarvelDoc marvelDoc = new IndexStatsMarvelDoc("test", "index_stats", 1437580442979L, new IndexStats("index-0", new ShardStats[0]) { @Override public CommonStats getTotal() { diff --git a/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/indices/IndicesStatsRendererTests.java b/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/indices/IndicesStatsRendererTests.java index 6a6bb5bc079..ed06c7e5536 100644 --- a/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/indices/IndicesStatsRendererTests.java +++ b/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/indices/IndicesStatsRendererTests.java @@ -17,7 +17,7 @@ import org.junit.Test; public class IndicesStatsRendererTests extends ESSingleNodeTestCase { - private static final String SAMPLE_FILE = "/samples/marvel_indices_stats.json"; + private static final String SAMPLE_FILE = "/samples/indices_stats.json"; @Test public void testIndexStatsRenderer() throws Exception { @@ -27,7 +27,7 @@ public class IndicesStatsRendererTests extends ESSingleNodeTestCase { IndicesStatsResponse indicesStats = client().admin().indices().prepareStats().get(); logger.debug("--> creating the indices stats marvel document"); - IndicesStatsMarvelDoc marvelDoc = new IndicesStatsMarvelDoc("test", "marvel_indices_stats", 1437580442979L, indicesStats); + IndicesStatsMarvelDoc marvelDoc = new IndicesStatsMarvelDoc("test", "indices_stats", 1437580442979L, indicesStats); logger.debug("--> rendering the document"); Renderer renderer = new IndicesStatsRenderer(); diff --git a/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/node/NodeStatsRendererTests.java b/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/node/NodeStatsRendererTests.java index a4e997aa846..7b8588f0c8b 100644 --- a/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/node/NodeStatsRendererTests.java +++ b/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/node/NodeStatsRendererTests.java @@ -16,7 +16,7 @@ import org.junit.Test; public class NodeStatsRendererTests extends ESSingleNodeTestCase { - private static final String SAMPLE_FILE = "/samples/marvel_node_stats.json"; + private static final String SAMPLE_FILE = "/samples/node_stats.json"; @Test public void testNodeStatsRenderer() throws Exception { @@ -26,7 +26,7 @@ public class NodeStatsRendererTests extends ESSingleNodeTestCase { NodeStats nodeStats = getInstanceFromNode(NodeService.class).stats(); logger.debug("--> creating the node stats marvel document"); - NodeStatsMarvelDoc marvelDoc = new NodeStatsMarvelDoc("test", "marvel_node_stats", 1437580442979L, + NodeStatsMarvelDoc marvelDoc = new NodeStatsMarvelDoc("test", "node_stats", 1437580442979L, "node-0", true, nodeStats, false, 90.0, true); logger.debug("--> rendering the document"); diff --git a/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/shards/ShardsRendererTests.java b/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/shards/ShardsRendererTests.java index 255987a0aa3..39be1bfc1cb 100644 --- a/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/shards/ShardsRendererTests.java +++ b/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/shards/ShardsRendererTests.java @@ -20,7 +20,7 @@ import java.io.IOException; public class ShardsRendererTests extends ESSingleNodeTestCase { - private static final String SAMPLE_FILE = "/samples/marvel_shards.json"; + private static final String SAMPLE_FILE = "/samples/shards.json"; @Test public void testShardsRenderer() throws Exception { @@ -33,7 +33,7 @@ public class ShardsRendererTests extends ESSingleNodeTestCase { ClusterState clusterState = getInstanceFromNode(ClusterService.class).state(); logger.debug("--> creating the shard marvel document"); - ShardMarvelDoc marvelDoc = new ShardMarvelDoc("my-index", "marvel_shards", "my-id", + ShardMarvelDoc marvelDoc = new ShardMarvelDoc("my-index", "shards", "my-id", clusterState.metaData().clusterUUID(), 1437580442979L, clusterState.routingTable().allShards().iterator().next(), clusterState.stateUUID()); logger.debug("--> rendering the document"); @@ -49,7 +49,7 @@ public class ShardsRendererTests extends ESSingleNodeTestCase { @Test public void testNoShard() throws IOException { - String result = RendererTestUtils.renderAsJSON(new ShardMarvelDoc("my-index", "marvel_shards", "my-id", "cluster-uuid", 1437580442979L, null, "my-state-uuid"), new ShardsRenderer()); + String result = RendererTestUtils.renderAsJSON(new ShardMarvelDoc("my-index", "shards", "my-id", "cluster-uuid", 1437580442979L, null, "my-state-uuid"), new ShardsRenderer()); RendererTestUtils.assertJSONStructureAndValues(result, "{\"cluster_uuid\":\"my-cluster-uuid\",\"timestamp\":\"2015-07-22T15:54:02.979Z\",\"state_uuid\":\"my-state-uuid\"}"); } } diff --git a/marvel/src/test/resources/samples/marvel_cluster_state.json b/marvel/src/test/resources/samples/cluster_state.json similarity index 100% rename from marvel/src/test/resources/samples/marvel_cluster_state.json rename to marvel/src/test/resources/samples/cluster_state.json diff --git a/marvel/src/test/resources/samples/marvel_cluster_stats.json b/marvel/src/test/resources/samples/cluster_stats.json similarity index 100% rename from marvel/src/test/resources/samples/marvel_cluster_stats.json rename to marvel/src/test/resources/samples/cluster_stats.json diff --git a/marvel/src/test/resources/samples/marvel_index_recovery.json b/marvel/src/test/resources/samples/index_recovery.json similarity index 100% rename from marvel/src/test/resources/samples/marvel_index_recovery.json rename to marvel/src/test/resources/samples/index_recovery.json diff --git a/marvel/src/test/resources/samples/marvel_index_stats.json b/marvel/src/test/resources/samples/index_stats.json similarity index 100% rename from marvel/src/test/resources/samples/marvel_index_stats.json rename to marvel/src/test/resources/samples/index_stats.json diff --git a/marvel/src/test/resources/samples/marvel_indices_stats.json b/marvel/src/test/resources/samples/indices_stats.json similarity index 100% rename from marvel/src/test/resources/samples/marvel_indices_stats.json rename to marvel/src/test/resources/samples/indices_stats.json diff --git a/marvel/src/test/resources/samples/marvel_node_stats.json b/marvel/src/test/resources/samples/node_stats.json similarity index 100% rename from marvel/src/test/resources/samples/marvel_node_stats.json rename to marvel/src/test/resources/samples/node_stats.json diff --git a/marvel/src/test/resources/samples/marvel_shards.json b/marvel/src/test/resources/samples/shards.json similarity index 100% rename from marvel/src/test/resources/samples/marvel_shards.json rename to marvel/src/test/resources/samples/shards.json