diff --git a/gradle.properties b/gradle.properties index 4a8b07b..6d5273d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,9 +1,9 @@ -version = 1.0.24 +version = 1.0.25 pf4jVersion = 3.7.0 -slf4jVersion = 2.0.3 +slf4jVersion = 2.0.4 camelVersion = 3.14.5 groovyVersion = 3.0.13 picocliVersion = 4.7.0 -oshiVersion = 6.3.1 +oshiVersion = 6.3.2 spockVersion = 2.3-groovy-3.0 tomljVersion = 1.1.0 diff --git a/plugins/os-base/src/main/java/sysmon/plugins/os_base/BaseNetworkExtension.java b/plugins/os-base/src/main/java/sysmon/plugins/os_base/BaseNetworkExtension.java index 5fd444d..d9b84c3 100644 --- a/plugins/os-base/src/main/java/sysmon/plugins/os_base/BaseNetworkExtension.java +++ b/plugins/os-base/src/main/java/sysmon/plugins/os_base/BaseNetworkExtension.java @@ -27,6 +27,8 @@ public class BaseNetworkExtension implements MetricExtension { private String interval = "10s"; private HardwareAbstractionLayer hardwareAbstractionLayer; + private List interfaces; + private int refreshCounter = 0; @Override @@ -82,8 +84,12 @@ public class BaseNetworkExtension implements MetricExtension { public MetricResult getMetrics() { ArrayList measurementList = new ArrayList<>(); + if(interfaces == null || refreshCounter++ > 360) { + log.info("getMetrics() - refreshing list of network interfaces"); + interfaces = hardwareAbstractionLayer.getNetworkIFs(); + refreshCounter = 0; + } - List interfaces = hardwareAbstractionLayer.getNetworkIFs(); for(NetworkIF netif : interfaces) { TreeMap tagsMap = new TreeMap() {{ diff --git a/server/src/main/java/sysmon/server/ComboResultToPointProcessor.java b/server/src/main/java/sysmon/server/ComboResultToPointProcessor.java index 39f3afb..b9c3eee 100644 --- a/server/src/main/java/sysmon/server/ComboResultToPointProcessor.java +++ b/server/src/main/java/sysmon/server/ComboResultToPointProcessor.java @@ -38,25 +38,6 @@ public class ComboResultToPointProcessor implements Processor { .tag(measurement.getTags()) .fields(measurement.getFields()); - /* - for (Map.Entry entry : measurement.getTags().entrySet()) { - //log.info("process() - tag: " + entry.getKey() + "=" + entry.getValue()); - point.tag(entry.getKey(), entry.getValue()); - } - - for (Map.Entry entry : measurement.getFields().entrySet()) { - //log.info("process() - field: " + entry.getKey() + "=" + entry.getValue()); - if(entry.getValue() instanceof Number) { - Number num = (Number) entry.getValue(); - point.addField(entry.getKey(), num); - } else if(entry.getValue() instanceof Boolean) { - Boolean bol = (Boolean) entry.getValue(); - point.addField(entry.getKey(), bol); - } else { - String str = (String) entry.getValue(); - point.addField(entry.getKey(), str); - } - }*/ batchPoints.point(point.build()); }