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

add refresh interval to os/process/network info api which represents the refresh interval of their respective stats

This commit is contained in:
kimchy 2011-01-16 12:33:23 +02:00
parent c0e2e14c36
commit 285afe8053
6 changed files with 44 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
modules/elasticsearch/src/main/java/org/elasticsearch/monitor/network/NetworkInfo.java
View File

@ -35,8 +35,18 @@ public class NetworkInfo implements Streamable, Serializable, ToXContent {
public static final Interface NA_INTERFACE = new Interface();
long refreshInterval;
Interface primary = NA_INTERFACE;
public long refreshInterval() {
return this.refreshInterval;
}
public long getRefreshInterval() {
return this.refreshInterval;
}
public Interface primaryInterface() {
return primary;
}
@ -47,6 +57,7 @@ public class NetworkInfo implements Streamable, Serializable, ToXContent {
@Override public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
builder.startObject("network");
builder.field("refresh_interval", refreshInterval);
if (primary != NA_INTERFACE) {
builder.startObject("primary_interface");
builder.field("address", primary.address());
@ -65,10 +76,12 @@ public class NetworkInfo implements Streamable, Serializable, ToXContent {
}
@Override public void readFrom(StreamInput in) throws IOException {
refreshInterval = in.readLong();
primary = Interface.readNetworkInterface(in);
}
@Override public void writeTo(StreamOutput out) throws IOException {
out.writeLong(refreshInterval);
primary.writeTo(out);
}

1
modules/elasticsearch/src/main/java/org/elasticsearch/monitor/network/NetworkService.java
View File

@ -54,6 +54,7 @@ public class NetworkService extends AbstractComponent {
logger.debug("Using probe [{}] with refresh_interval [{}]", probe, refreshInterval);
this.info = probe.networkInfo();
this.info.refreshInterval = refreshInterval.millis();
this.cachedStats = probe.networkStats();
if (logger.isDebugEnabled()) {

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

@ -34,6 +34,8 @@ import java.io.Serializable;
*/
public class OsInfo implements Streamable, Serializable, ToXContent {
long refreshInterval;
Cpu cpu = null;
Mem mem = null;
@ -43,6 +45,14 @@ public class OsInfo implements Streamable, Serializable, ToXContent {
OsInfo() {
}
public long refreshInterval() {
return this.refreshInterval;
}
public long getRefreshInterval() {
return this.refreshInterval;
}
public Cpu cpu() {
return this.cpu;
}
@ -69,6 +79,7 @@ public class OsInfo implements Streamable, Serializable, ToXContent {
@Override public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
builder.startObject("os");
builder.field("refresh_interval", refreshInterval);
if (cpu != null) {
builder.startObject("cpu");
builder.field("vendor", cpu.vendor());
@ -104,6 +115,7 @@ public class OsInfo implements Streamable, Serializable, ToXContent {
}
@Override public void readFrom(StreamInput in) throws IOException {
refreshInterval = in.readLong();
if (in.readBoolean()) {
cpu = Cpu.readCpu(in);
}
@ -116,6 +128,7 @@ public class OsInfo implements Streamable, Serializable, ToXContent {
}
@Override public void writeTo(StreamOutput out) throws IOException {
out.writeLong(refreshInterval);
if (cpu == null) {
out.writeBoolean(false);
} else {

5
modules/elasticsearch/src/main/java/org/elasticsearch/monitor/os/OsService.java
View File

@ -45,9 +45,10 @@ public class OsService extends AbstractComponent {
this.probe = probe;
this.timerService = timerService;
this.info = probe.osInfo();
this.refreshInterval = componentSettings.getAsTime("refresh_interval", TimeValue.timeValueSeconds(5));
this.info = probe.osInfo();
this.info.refreshInterval = refreshInterval.millis();
this.cachedStats = probe.osStats();
logger.debug("Using probe [{}] with refresh_interval [{}]", probe, refreshInterval);

13
modules/elasticsearch/src/main/java/org/elasticsearch/monitor/process/ProcessInfo.java
View File

@ -33,6 +33,8 @@ import java.io.Serializable;
*/
public class ProcessInfo implements Streamable, Serializable, ToXContent {
long refreshInterval;
private long id;
ProcessInfo() {
@ -43,6 +45,14 @@ public class ProcessInfo implements Streamable, Serializable, ToXContent {
this.id = id;
}
public long refreshInterval() {
return this.refreshInterval;
}
public long getRefreshInterval() {
return this.refreshInterval;
}
/**
* The process id.
*/
@ -59,6 +69,7 @@ public class ProcessInfo implements Streamable, Serializable, ToXContent {
@Override public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
builder.startObject("process");
builder.field("refresh_interval", refreshInterval);
builder.field("id", id);
builder.endObject();
return builder;
@ -71,10 +82,12 @@ public class ProcessInfo implements Streamable, Serializable, ToXContent {
}
@Override public void readFrom(StreamInput in) throws IOException {
refreshInterval = in.readLong();
id = in.readLong();
}
@Override public void writeTo(StreamOutput out) throws IOException {
out.writeLong(refreshInterval);
out.writeLong(id);
}
}

1
modules/elasticsearch/src/main/java/org/elasticsearch/monitor/process/ProcessService.java
View File

@ -48,6 +48,7 @@ public class ProcessService extends AbstractComponent {
this.refreshInterval = componentSettings.getAsTime("refresh_interval", TimeValue.timeValueSeconds(5));
this.info = probe.processInfo();
this.info.refreshInterval = refreshInterval.millis();
this.cachedStats = probe.processStats();
logger.debug("Using probe [{}] with refresh_interval [{}]", probe, refreshInterval);