Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add human readable start_time and refresh_interval #5544

Closed
wants to merge 1 commit into from
Closed

Add human readable start_time and refresh_interval #5544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/main/java/org/elasticsearch/common/xcontent/XContentBuilder.java
View file
Open in desktop
Expand Up @@ -858,6 +858,14 @@ public XContentBuilder timeValueField(XContentBuilderString rawFieldName, XConte
return this;
}

public XContentBuilder dateValueField(XContentBuilderString rawFieldName, XContentBuilderString readableFieldName, long rawTimestamp) throws IOException {
if (humanReadable) {
field(readableFieldName, defaultDatePrinter.print(rawTimestamp));
}
field(rawFieldName, rawTimestamp);
return this;
}

public XContentBuilder byteSizeField(XContentBuilderString rawFieldName, XContentBuilderString readableFieldName, ByteSizeValue byteSizeValue) throws IOException {
if (humanReadable) {
field(readableFieldName, byteSizeValue.toString());
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/org/elasticsearch/monitor/jvm/JvmInfo.java
View file
Open in desktop
Expand Up @@ -288,7 +288,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
builder.field(Fields.VM_NAME, vmName);
builder.field(Fields.VM_VERSION, vmVersion);
builder.field(Fields.VM_VENDOR, vmVendor);
builder.field(Fields.START_TIME, startTime);
builder.dateValueField(Fields.START_TIME_IN_MILLIS, Fields.START_TIME, startTime);

builder.startObject(Fields.MEM);
builder.byteSizeField(Fields.HEAP_INIT_IN_BYTES, Fields.HEAP_INIT, mem.heapInit);
Expand All @@ -313,6 +313,7 @@ static final class Fields {
static final XContentBuilderString VM_VERSION = new XContentBuilderString("vm_version");
static final XContentBuilderString VM_VENDOR = new XContentBuilderString("vm_vendor");
static final XContentBuilderString START_TIME = new XContentBuilderString("start_time");
static final XContentBuilderString START_TIME_IN_MILLIS = new XContentBuilderString("start_time_in_millis");

static final XContentBuilderString MEM = new XContentBuilderString("mem");
static final XContentBuilderString HEAP_INIT = new XContentBuilderString("heap_init");
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/org/elasticsearch/monitor/network/NetworkInfo.java
View file
Open in desktop
Expand Up @@ -59,6 +59,7 @@ public Interface getPrimaryInterface() {
static final class Fields {
static final XContentBuilderString NETWORK = new XContentBuilderString("network");
static final XContentBuilderString REFRESH_INTERVAL = new XContentBuilderString("refresh_interval");
static final XContentBuilderString REFRESH_INTERVAL_IN_MILLIS = new XContentBuilderString("refresh_interval_in_millis");
static final XContentBuilderString PRIMARY_INTERFACE = new XContentBuilderString("primary_interface");
static final XContentBuilderString ADDRESS = new XContentBuilderString("address");
static final XContentBuilderString NAME = new XContentBuilderString("name");
Expand All @@ -68,7 +69,7 @@ static final class Fields {
@Override
public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
builder.startObject(Fields.NETWORK);
builder.field(Fields.REFRESH_INTERVAL, refreshInterval);
builder.timeValueField(Fields.REFRESH_INTERVAL_IN_MILLIS, Fields.REFRESH_INTERVAL, refreshInterval);
if (primary != NA_INTERFACE) {
builder.startObject(Fields.PRIMARY_INTERFACE);
builder.field(Fields.ADDRESS, primary.address());
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/org/elasticsearch/monitor/os/OsInfo.java
View file
Open in desktop
Expand Up @@ -91,6 +91,7 @@ public Swap getSwap() {
static final class Fields {
static final XContentBuilderString OS = new XContentBuilderString("os");
static final XContentBuilderString REFRESH_INTERVAL = new XContentBuilderString("refresh_interval");
static final XContentBuilderString REFRESH_INTERVAL_IN_MILLIS = new XContentBuilderString("refresh_interval_in_millis");
static final XContentBuilderString AVAILABLE_PROCESSORS = new XContentBuilderString("available_processors");
static final XContentBuilderString CPU = new XContentBuilderString("cpu");
static final XContentBuilderString VENDOR = new XContentBuilderString("vendor");
Expand All @@ -111,7 +112,7 @@ static final class Fields {
@Override
public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
builder.startObject(Fields.OS);
builder.field(Fields.REFRESH_INTERVAL, refreshInterval);
builder.timeValueField(Fields.REFRESH_INTERVAL_IN_MILLIS, Fields.REFRESH_INTERVAL, refreshInterval);
builder.field(Fields.AVAILABLE_PROCESSORS, availableProcessors);
if (cpu != null) {
builder.startObject(Fields.CPU);
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/org/elasticsearch/monitor/process/ProcessInfo.java
View file
Open in desktop
Expand Up @@ -94,6 +94,7 @@ public boolean isMlockall() {
static final class Fields {
static final XContentBuilderString PROCESS = new XContentBuilderString("process");
static final XContentBuilderString REFRESH_INTERVAL = new XContentBuilderString("refresh_interval");
static final XContentBuilderString REFRESH_INTERVAL_IN_MILLIS = new XContentBuilderString("refresh_interval_in_millis");
static final XContentBuilderString ID = new XContentBuilderString("id");
static final XContentBuilderString MAX_FILE_DESCRIPTORS = new XContentBuilderString("max_file_descriptors");
static final XContentBuilderString MLOCKALL = new XContentBuilderString("mlockall");
Expand All @@ -102,7 +103,7 @@ static final class Fields {
@Override
public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
builder.startObject(Fields.PROCESS);
builder.field(Fields.REFRESH_INTERVAL, refreshInterval);
builder.timeValueField(Fields.REFRESH_INTERVAL_IN_MILLIS, Fields.REFRESH_INTERVAL, refreshInterval);
builder.field(Fields.ID, id);
builder.field(Fields.MAX_FILE_DESCRIPTORS, maxFileDescriptors);
builder.field(Fields.MLOCKALL, mlockall);
Expand Down