github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 17:28:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

Added the cluster name to all exported data.

Browse source
This commit is contained in:
Boaz Leskes 2013-12-17 16:25:03 +01:00
parent 8c9cb28dce
commit ced5b97969
2 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
exporter/src/main/java/org/elasticsearch/marvel/monitor/ExportersService.java
View file

@ -28,6 +28,7 @@ import org.elasticsearch.action.admin.indices.stats.ShardStats;
import org.elasticsearch.action.support.IgnoreIndices;
import org.elasticsearch.client.Client;
import org.elasticsearch.cluster.ClusterChangedEvent;
import org.elasticsearch.cluster.ClusterName;
import org.elasticsearch.cluster.ClusterService;
import org.elasticsearch.cluster.block.ClusterBlock;
import org.elasticsearch.cluster.node.DiscoveryNode;
@ -83,8 +84,7 @@ public class ExportersService extends AbstractLifecycleComponent<ExportersServic
@Inject
public ExportersService(Settings settings, IndicesService indicesService,
NodeService nodeService, ClusterService clusterService,
Client client,
Discovery discovery) {
Client client, Discovery discovery, ClusterName clusterName) {
super(settings);
this.indicesService = (InternalIndicesService) indicesService;
this.clusterService = clusterService;
@ -98,7 +98,7 @@ public class ExportersService extends AbstractLifecycleComponent<ExportersServic
pendingEventsQueue = ConcurrentCollections.newBlockingQueue();
if (componentSettings.getAsBoolean("enabled", true)) {
StatsExporter esExporter = new ESExporter(settings.getComponentSettings(ESExporter.class), discovery);
StatsExporter esExporter = new ESExporter(settings.getComponentSettings(ESExporter.class), discovery, clusterName);
this.exporters = ImmutableSet.of(esExporter);
} else {
this.exporters = ImmutableSet.of();

10
exporter/src/main/java/org/elasticsearch/marvel/monitor/exporter/ESExporter.java
View file

@ -26,6 +26,7 @@ import org.elasticsearch.action.admin.indices.stats.CommonStats;
import org.elasticsearch.action.admin.indices.stats.IndexStats;
import org.elasticsearch.action.admin.indices.stats.IndicesStatsResponse;
import org.elasticsearch.action.admin.indices.stats.ShardStats;
import org.elasticsearch.cluster.ClusterName;
import org.elasticsearch.cluster.routing.ShardRouting;
import org.elasticsearch.common.collect.ImmutableMap;
import org.elasticsearch.common.component.AbstractLifecycleComponent;
@ -58,6 +59,7 @@ public class ESExporter extends AbstractLifecycleComponent<ESExporter> implement
final int timeout;
final Discovery discovery;
final ClusterName clusterName;
public final static DateTimeFormatter defaultDatePrinter = Joda.forPattern("date_time").printer();
@ -70,10 +72,11 @@ public class ESExporter extends AbstractLifecycleComponent<ESExporter> implement
final ClusterStatsRenderer clusterStatsRenderer;
final EventsRenderer eventsRenderer;
public ESExporter(Settings settings, Discovery discovery) {
public ESExporter(Settings settings, Discovery discovery, ClusterName clusterName) {
super(settings);
this.discovery = discovery;
this.clusterName = clusterName;
hosts = settings.getAsArray("es.hosts", new String[]{"localhost:9200"});
indexPrefix = settings.get("es.index.prefix", ".marvel");
@ -362,6 +365,7 @@ public class ESExporter extends AbstractLifecycleComponent<ESExporter> implement
public void render(int index, XContentBuilder builder) throws IOException {
builder.startObject();
builder.field("@timestamp", defaultDatePrinter.print(stats.getTimestamp()));
builder.field("cluster_name", clusterName.value());
addNodeInfo(builder);
stats.toXContent(builder, xContentParams);
builder.endObject();
@ -393,6 +397,7 @@ public class ESExporter extends AbstractLifecycleComponent<ESExporter> implement
public void render(int index, XContentBuilder builder) throws IOException {
builder.startObject();
builder.field("@timestamp", defaultDatePrinter.print(collectionTime));
builder.field("cluster_name", clusterName.value());
ShardRouting shardRouting = stats[index].getShardRouting();
builder.field("index", shardRouting.index());
builder.field("shard_id", shardRouting.id());
@ -429,6 +434,7 @@ public class ESExporter extends AbstractLifecycleComponent<ESExporter> implement
public void render(int index, XContentBuilder builder) throws IOException {
builder.startObject();
builder.field("@timestamp", defaultDatePrinter.print(collectionTime));
builder.field("cluster_name", clusterName.value());
IndexStats indexStats = stats[index];
builder.field("index", indexStats.getIndex());
addNodeInfo(builder, "_source_node");
@ -470,6 +476,7 @@ public class ESExporter extends AbstractLifecycleComponent<ESExporter> implement
assert index == 0;
builder.startObject();
builder.field("@timestamp", defaultDatePrinter.print(collectionTime));
builder.field("cluster_name", clusterName.value());
addNodeInfo(builder, "_source_node");
builder.startObject("primaries");
primariesStats.toXContent(builder, xContentParams);
@ -505,6 +512,7 @@ public class ESExporter extends AbstractLifecycleComponent<ESExporter> implement
@Override
public void render(int index, XContentBuilder builder) throws IOException {
builder.startObject();
builder.field("cluster_name", clusterName.value());
addNodeInfo(builder, "_source_node");
events[index].addXContentBody(builder, xContentParams);
builder.endObject();