honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

move to constant fields names

This commit is contained in:
Shay Banon 2012-02-06 00:49:46 +02:00
parent 2a4ebca0be
commit 7df2819549
2 changed files with 91 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/main/java/org/elasticsearch/monitor/os/OsInfo.java
View File

@ -25,6 +25,7 @@ import org.elasticsearch.common.io.stream.Streamable;
import org.elasticsearch.common.unit.ByteSizeValue; import org.elasticsearch.common.unit.ByteSizeValue;
import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.ToXContent;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentBuilderString;
import java.io.IOException; import java.io.IOException;
import java.io.Serializable; import java.io.Serializable;
@ -77,32 +78,51 @@ public class OsInfo implements Streamable, Serializable, ToXContent {
return swap(); return swap();
} }
static final class Fields {
static final XContentBuilderString OS = new XContentBuilderString("os");
static final XContentBuilderString REFRESH_INTERVAL = new XContentBuilderString("refresh_interval");
static final XContentBuilderString CPU = new XContentBuilderString("cpu");
static final XContentBuilderString VENDOR = new XContentBuilderString("vendor");
static final XContentBuilderString MODEL = new XContentBuilderString("model");
static final XContentBuilderString MHZ = new XContentBuilderString("mhz");
static final XContentBuilderString TOTAL_CORES = new XContentBuilderString("total_cores");
static final XContentBuilderString TOTAL_SOCKETS = new XContentBuilderString("total_sockets");
static final XContentBuilderString CORES_PER_SOCKET = new XContentBuilderString("cores_per_socket");
static final XContentBuilderString CACHE_SIZE = new XContentBuilderString("cache_size");
static final XContentBuilderString CACHE_SIZE_IN_BYTES = new XContentBuilderString("cache_size_in_bytes");
static final XContentBuilderString MEM = new XContentBuilderString("mem");
static final XContentBuilderString SWAP = new XContentBuilderString("swap");
static final XContentBuilderString TOTAL = new XContentBuilderString("total");
static final XContentBuilderString TOTAL_IN_BYTES = new XContentBuilderString("total_in_bytes");
}
@Override @Override
public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException { public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
builder.startObject("os"); builder.startObject(Fields.OS);
builder.field("refresh_interval", refreshInterval); builder.field(Fields.REFRESH_INTERVAL, refreshInterval);
if (cpu != null) { if (cpu != null) {
builder.startObject("cpu"); builder.startObject(Fields.CPU);
builder.field("vendor", cpu.vendor()); builder.field(Fields.VENDOR, cpu.vendor());
builder.field("model", cpu.model()); builder.field(Fields.MODEL, cpu.model());
builder.field("mhz", cpu.mhz()); builder.field(Fields.MHZ, cpu.mhz());
builder.field("total_cores", cpu.totalCores()); builder.field(Fields.TOTAL_CORES, cpu.totalCores());
builder.field("total_sockets", cpu.totalSockets()); builder.field(Fields.TOTAL_SOCKETS, cpu.totalSockets());
builder.field("cores_per_socket", cpu.coresPerSocket()); builder.field(Fields.CORES_PER_SOCKET, cpu.coresPerSocket());
builder.field("cache_size", cpu.cacheSize().toString()); builder.field(Fields.CACHE_SIZE, cpu.cacheSize().toString());
builder.field("cache_size_in_bytes", cpu.cacheSize().bytes()); builder.field(Fields.CACHE_SIZE_IN_BYTES, cpu.cacheSize().bytes());
builder.endObject(); builder.endObject();
} }
if (mem != null) { if (mem != null) {
builder.startObject("mem"); builder.startObject(Fields.MEM);
builder.field("total", mem.total().toString()); builder.field(Fields.TOTAL, mem.total().toString());
builder.field("total_in_bytes", mem.total().bytes()); builder.field(Fields.TOTAL_IN_BYTES, mem.total);
builder.endObject(); builder.endObject();
} }
if (swap != null) { if (swap != null) {
builder.startObject("swap"); builder.startObject(Fields.SWAP);
builder.field("total", swap.total().toString()); builder.field(Fields.TOTAL, swap.total().toString());
builder.field("total_in_bytes", swap.total().bytes()); builder.field(Fields.TOTAL_IN_BYTES, swap.total);
builder.endObject(); builder.endObject();
} }
builder.endObject(); builder.endObject();

79
src/main/java/org/elasticsearch/monitor/os/OsStats.java
View File

@ -26,6 +26,7 @@ import org.elasticsearch.common.unit.ByteSizeValue;
import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.ToXContent;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentBuilderString;
import java.io.IOException; import java.io.IOException;
import java.io.Serializable; import java.io.Serializable;
@ -102,52 +103,80 @@ public class OsStats implements Streamable, Serializable, ToXContent {
return swap(); return swap();
} }
static final class Fields {
static final XContentBuilderString OS = new XContentBuilderString("os");
static final XContentBuilderString TIMESTAMP = new XContentBuilderString("timestamp");
static final XContentBuilderString UPTIME = new XContentBuilderString("uptime");
static final XContentBuilderString UPTIME_IN_MILLIS = new XContentBuilderString("uptime_in_millis");
static final XContentBuilderString LOAD_AVERAGE = new XContentBuilderString("load_average");
static final XContentBuilderString CPU = new XContentBuilderString("cpu");
static final XContentBuilderString SYS = new XContentBuilderString("sys");
static final XContentBuilderString USER = new XContentBuilderString("user");
static final XContentBuilderString IDLE = new XContentBuilderString("idle");
static final XContentBuilderString MEM = new XContentBuilderString("mem");
static final XContentBuilderString SWAP = new XContentBuilderString("swap");
static final XContentBuilderString FREE = new XContentBuilderString("free");
static final XContentBuilderString FREE_IN_BYTES = new XContentBuilderString("free_in_bytes");
static final XContentBuilderString USED = new XContentBuilderString("free");
static final XContentBuilderString USED_IN_BYTES = new XContentBuilderString("free_in_bytes");
static final XContentBuilderString FREE_PERCENT = new XContentBuilderString("free_percent");
static final XContentBuilderString USED_PERCENT = new XContentBuilderString("used_percent");
static final XContentBuilderString ACTUAL_FREE = new XContentBuilderString("actual_free");
static final XContentBuilderString ACTUAL_FREE_IN_BYTES = new XContentBuilderString("actual_free_in_bytes");
static final XContentBuilderString ACTUAL_USED = new XContentBuilderString("actual_used");
static final XContentBuilderString ACTUAL_USED_IN_BYTES = new XContentBuilderString("actual_used_in_bytes");
}
@Override @Override
public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException { public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
builder.startObject("os"); builder.startObject(Fields.OS);
builder.field("timestamp", timestamp); builder.field(Fields.TIMESTAMP, timestamp);
builder.field("uptime", uptime().format()); builder.field(Fields.UPTIME, uptime().format());
builder.field("uptime_in_millis", uptime().millis()); builder.field(Fields.UPTIME_IN_MILLIS, uptime().millis());
builder.startArray("load_average"); builder.startArray(Fields.LOAD_AVERAGE);
for (double value : loadAverage) { for (double value : loadAverage) {
builder.value(value); builder.value(value);
} }
builder.endArray(); builder.endArray();
if (cpu != null) { if (cpu != null) {
builder.startObject("cpu"); builder.startObject(Fields.CPU);
builder.field("sys", cpu.sys()); builder.field(Fields.SYS, cpu.sys());
builder.field("user", cpu.user()); builder.field(Fields.USER, cpu.user());
builder.field("idle", cpu.idle()); builder.field(Fields.IDLE, cpu.idle());
builder.endObject(); builder.endObject();
} }
if (mem != null) { if (mem != null) {
builder.startObject("mem"); builder.startObject(Fields.MEM);
builder.field("free", mem.free().toString()); builder.field(Fields.FREE, mem.free().toString());
builder.field("free_in_bytes", mem.free().bytes()); builder.field(Fields.FREE_IN_BYTES, mem.free);
builder.field("used", mem.used().toString()); builder.field(Fields.USED, mem.used().toString());
builder.field("used_in_bytes", mem.used().bytes()); builder.field(Fields.USED_IN_BYTES, mem.used);
builder.field("free_percent", mem.freePercent()); builder.field(Fields.FREE_PERCENT, mem.freePercent());
builder.field("used_percent", mem.usedPercent()); builder.field(Fields.USED_PERCENT, mem.usedPercent());
builder.field("actual_free", mem.actualFree().toString()); builder.field(Fields.ACTUAL_FREE, mem.actualFree().toString());
builder.field("actual_free_in_bytes", mem.actualFree().bytes()); builder.field(Fields.ACTUAL_FREE_IN_BYTES, mem.actualFree);
builder.field("actual_used", mem.actualUsed().toString()); builder.field(Fields.ACTUAL_USED, mem.actualUsed().toString());
builder.field("actual_used_in_bytes", mem.actualUsed().bytes()); builder.field(Fields.ACTUAL_USED_IN_BYTES, mem.actualUsed);
builder.endObject(); builder.endObject();
} }
if (swap != null) { if (swap != null) {
builder.startObject("swap"); builder.startObject(Fields.SWAP);
builder.field("used", swap.used().toString()); builder.field(Fields.USED, swap.used().toString());
builder.field("used_in_bytes", swap.used().bytes()); builder.field(Fields.USED_IN_BYTES, swap.used);
builder.field("free", swap.free().toString()); builder.field(Fields.FREE, swap.free().toString());
builder.field("free_in_bytes", swap.free().bytes()); builder.field(Fields.FREE_IN_BYTES, swap.free);
builder.endObject(); builder.endObject();
} }