nellemann/hmci
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

More work on multiple samples.

Browse source
This commit is contained in:
Mark Nellemann 2022-12-07 16:12:29 +01:00
parent a0cfff18ef
commit fb5bfd532b
9 changed files with 452 additions and 541 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.md
View file

@ -3,7 +3,8 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
## [1.4.1] - 2011-12-xx ## [1.4.1] - 2011-12-xx
- Retrieve multiple PCM samples and keep track of processed samples. - Retrieve multiple PCM samples and keep track of processing.
- Rename VIOS metric vFC to Virtual.
## [1.4.0] - 2011-12-01 ## [1.4.0] - 2011-12-01
- Rewrite of toml+xml+json de-serialization code (uses jackson now). - Rewrite of toml+xml+json de-serialization code (uses jackson now).

2
build.gradle
View file

@ -39,7 +39,7 @@ dependencies {
application { application {
mainClass.set('biz.nellemann.hmci.Application') mainClass.set('biz.nellemann.hmci.Application')
applicationDefaultJvmArgs = [ "-server", "-Xms64m", "-Xmx64m", "-XX:+UseG1GC", "-XX:+ExitOnOutOfMemoryError", "-XX:+AlwaysPreTouch" ] applicationDefaultJvmArgs = [ "-server", "-Xms64m", "-Xmx256m", "-XX:+UseG1GC", "-XX:+ExitOnOutOfMemoryError", "-XX:+AlwaysPreTouch" ]
} }
java { java {

4
doc/dashboards/HMCi - Power VIO Overview.json
View file

@ -1650,7 +1650,7 @@
} }
], ],
"hide": false, "hide": false,
"measurement": "vios_storage_vFC", "measurement": "vios_storage_virtual",
"orderByTime": "ASC", "orderByTime": "ASC",
"policy": "default", "policy": "default",
"refId": "B", "refId": "B",
@ -1690,7 +1690,7 @@
] ]
} }
], ],
"title": "Virtual Fiber Channel Adapters - $ServerName - $ViosName", "title": "Virtual Adapters - $ServerName - $ViosName",
"type": "timeseries" "type": "timeseries"
} }
], ],

7
src/main/java/biz/nellemann/hmci/InfluxClient.java
View file

@ -66,6 +66,7 @@ public final class InfluxClient {
influxDB.enableBatch( influxDB.enableBatch(
BatchOptions.DEFAULTS BatchOptions.DEFAULTS
.flushDuration(5000)
.threadFactory(runnable -> { .threadFactory(runnable -> {
Thread thread = new Thread(runnable); Thread thread = new Thread(runnable);
thread.setDaemon(true); thread.setDaemon(true);
@ -97,10 +98,11 @@ public final class InfluxClient {
} }
/*
public void write(List<Measurement> measurements, Instant timestamp, String name) { public void write(List<Measurement> measurements, Instant timestamp, String name) {
log.debug("write() - measurement: {} {}", name, measurements.size()); log.debug("write() - measurement: {} {}", name, measurements.size());
processMeasurementMap(measurements, timestamp, name).forEach( (point) -> { influxDB.write(point); }); processMeasurementMap(measurements, timestamp, name).forEach( (point) -> { influxDB.write(point); });
} }*/
public void write(List<Measurement> measurements, String name) { public void write(List<Measurement> measurements, String name) {
@ -109,6 +111,7 @@ public final class InfluxClient {
} }
/*
private List<Point> processMeasurementMap(List<Measurement> measurements, Instant timestamp, String name) { private List<Point> processMeasurementMap(List<Measurement> measurements, Instant timestamp, String name) {
List<Point> listOfPoints = new ArrayList<>(); List<Point> listOfPoints = new ArrayList<>();
measurements.forEach( (m) -> { measurements.forEach( (m) -> {
@ -122,7 +125,7 @@ public final class InfluxClient {
}); });
return listOfPoints; return listOfPoints;
} }*/
private List<Point> processMeasurementMap(List<Measurement> measurements, String name) { private List<Point> processMeasurementMap(List<Measurement> measurements, String name) {

296
src/main/java/biz/nellemann/hmci/LogicalPartition.java
View file

@ -19,7 +19,6 @@ import biz.nellemann.hmci.dto.xml.Link;
import biz.nellemann.hmci.dto.xml.LogicalPartitionEntry; import biz.nellemann.hmci.dto.xml.LogicalPartitionEntry;
import biz.nellemann.hmci.dto.xml.XmlEntry; import biz.nellemann.hmci.dto.xml.XmlEntry;
import biz.nellemann.hmci.dto.xml.XmlFeed; import biz.nellemann.hmci.dto.xml.XmlFeed;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.dataformat.xml.XmlMapper; import com.fasterxml.jackson.dataformat.xml.XmlMapper;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -28,8 +27,6 @@ import java.io.IOException;
import java.net.URI; import java.net.URI;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.util.*; import java.util.*;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeoutException;
class LogicalPartition extends Resource { class LogicalPartition extends Resource {
@ -104,7 +101,7 @@ class LogicalPartition extends Resource {
log.debug("refresh() - {}", name); log.debug("refresh() - {}", name);
try { try {
String xml = restClient.getRequest(String.format("/rest/api/pcm/ManagedSystem/%s/LogicalPartition/%s/ProcessedMetrics?NoOfSamples=%d", managedSystem.id, id, currentNumberOfSamples)); String xml = restClient.getRequest(String.format("/rest/api/pcm/ManagedSystem/%s/LogicalPartition/%s/ProcessedMetrics?NoOfSamples=%d", managedSystem.id, id, noOfSamples));
// Do not try to parse empty response // Do not try to parse empty response
if(xml == null || xml.length() <= 1) { if(xml == null || xml.length() <= 1) {
@ -138,7 +135,7 @@ class LogicalPartition extends Resource {
@Override @Override
public void process(int sample) { public void process(int sample) throws NullPointerException {
log.debug("process() - {} - sample: {}", name, sample); log.debug("process() - {} - sample: {}", name, sample);
influxClient.write(getDetails(sample),"lpar_details"); influxClient.write(getDetails(sample),"lpar_details");
@ -152,244 +149,217 @@ class LogicalPartition extends Resource {
// LPAR Details // LPAR Details
List<Measurement> getDetails(int sample) { List<Measurement> getDetails(int sample) throws NullPointerException {
List<Measurement> list = new ArrayList<>(); List<Measurement> list = new ArrayList<>();
try { Map<String, String> tagsMap = new HashMap<>();
Map<String, String> tagsMap = new HashMap<>(); TreeMap<String, Object> fieldsMap = new TreeMap<>();
TreeMap<String, Object> fieldsMap = new TreeMap<>();
tagsMap.put("servername", managedSystem.entry.getName()); tagsMap.put("servername", managedSystem.entry.getName());
tagsMap.put("lparname", entry.getName()); tagsMap.put("lparname", entry.getName());
log.trace("getDetails() - tags: " + tagsMap); log.trace("getDetails() - tags: " + tagsMap);
fieldsMap.put("id", metric.getSample(sample).lparsUtil.id); fieldsMap.put("id", metric.getSample(sample).lparsUtil.id);
fieldsMap.put("type", metric.getSample(sample).lparsUtil.type); fieldsMap.put("type", metric.getSample(sample).lparsUtil.type);
fieldsMap.put("state", metric.getSample(sample).lparsUtil.state); fieldsMap.put("state", metric.getSample(sample).lparsUtil.state);
fieldsMap.put("osType", metric.getSample(sample).lparsUtil.osType); fieldsMap.put("osType", metric.getSample(sample).lparsUtil.osType);
fieldsMap.put("affinityScore", metric.getSample(sample).lparsUtil.affinityScore); fieldsMap.put("affinityScore", metric.getSample(sample).lparsUtil.affinityScore);
log.trace("getDetails() - fields: " + fieldsMap); log.trace("getDetails() - fields: " + fieldsMap);
list.add(new Measurement(getTimestamp(sample), tagsMap, fieldsMap)); list.add(new Measurement(getTimestamp(sample), tagsMap, fieldsMap));
} catch (Exception e) {
log.warn("getDetails() - error: {}", e.getMessage());
}
return list; return list;
} }
// LPAR Memory // LPAR Memory
List<Measurement> getMemoryMetrics(int sample) { List<Measurement> getMemoryMetrics(int sample) throws NullPointerException {
List<Measurement> list = new ArrayList<>(); List<Measurement> list = new ArrayList<>();
try { Map<String, String> tagsMap = new HashMap<>();
Map<String, String> tagsMap = new HashMap<>(); TreeMap<String, Object> fieldsMap = new TreeMap<>();
TreeMap<String, Object> fieldsMap = new TreeMap<>();
tagsMap.put("servername", managedSystem.entry.getName()); tagsMap.put("servername", managedSystem.entry.getName());
tagsMap.put("lparname", entry.getName()); tagsMap.put("lparname", entry.getName());
log.trace("getMemoryMetrics() - tags: " + tagsMap); log.trace("getMemoryMetrics() - tags: " + tagsMap);
fieldsMap.put("logicalMem", metric.getSample(sample).lparsUtil.memory.logicalMem); fieldsMap.put("logicalMem", metric.getSample(sample).lparsUtil.memory.logicalMem);
fieldsMap.put("backedPhysicalMem", metric.getSample(sample).lparsUtil.memory.backedPhysicalMem); fieldsMap.put("backedPhysicalMem", metric.getSample(sample).lparsUtil.memory.backedPhysicalMem);
log.trace("getMemoryMetrics() - fields: " + fieldsMap); log.trace("getMemoryMetrics() - fields: " + fieldsMap);
list.add(new Measurement(getTimestamp(sample), tagsMap, fieldsMap));
list.add(new Measurement(getTimestamp(sample), tagsMap, fieldsMap));
} catch (Exception e) {
log.warn("getMemoryMetrics() - error: {}", e.getMessage());
}
return list; return list;
} }
// LPAR Processor // LPAR Processor
List<Measurement> getProcessorMetrics(int sample) { List<Measurement> getProcessorMetrics(int sample) throws NullPointerException {
List<Measurement> list = new ArrayList<>(); List<Measurement> list = new ArrayList<>();
try { HashMap<String, String> tagsMap = new HashMap<>();
HashMap<String, String> tagsMap = new HashMap<>(); HashMap<String, Object> fieldsMap = new HashMap<>();
HashMap<String, Object> fieldsMap = new HashMap<>();
tagsMap.put("servername", managedSystem.entry.getName()); tagsMap.put("servername", managedSystem.entry.getName());
tagsMap.put("lparname", entry.getName()); tagsMap.put("lparname", entry.getName());
log.trace("getProcessorMetrics() - tags: " + tagsMap); log.trace("getProcessorMetrics() - tags: " + tagsMap);
fieldsMap.put("utilizedProcUnits", metric.getSample(sample).lparsUtil.processor.utilizedProcUnits); fieldsMap.put("utilizedProcUnits", metric.getSample(sample).lparsUtil.processor.utilizedProcUnits);
fieldsMap.put("entitledProcUnits", metric.getSample(sample).lparsUtil.processor.entitledProcUnits); fieldsMap.put("entitledProcUnits", metric.getSample(sample).lparsUtil.processor.entitledProcUnits);
fieldsMap.put("donatedProcUnits", metric.getSample(sample).lparsUtil.processor.donatedProcUnits); fieldsMap.put("donatedProcUnits", metric.getSample(sample).lparsUtil.processor.donatedProcUnits);
fieldsMap.put("idleProcUnits", metric.getSample(sample).lparsUtil.processor.idleProcUnits); fieldsMap.put("idleProcUnits", metric.getSample(sample).lparsUtil.processor.idleProcUnits);
fieldsMap.put("maxProcUnits", metric.getSample(sample).lparsUtil.processor.maxProcUnits); fieldsMap.put("maxProcUnits", metric.getSample(sample).lparsUtil.processor.maxProcUnits);
fieldsMap.put("maxVirtualProcessors", metric.getSample(sample).lparsUtil.processor.maxVirtualProcessors); fieldsMap.put("maxVirtualProcessors", metric.getSample(sample).lparsUtil.processor.maxVirtualProcessors);
fieldsMap.put("currentVirtualProcessors", metric.getSample(sample).lparsUtil.processor.currentVirtualProcessors); fieldsMap.put("currentVirtualProcessors", metric.getSample(sample).lparsUtil.processor.currentVirtualProcessors);
fieldsMap.put("utilizedCappedProcUnits", metric.getSample(sample).lparsUtil.processor.utilizedCappedProcUnits); fieldsMap.put("utilizedCappedProcUnits", metric.getSample(sample).lparsUtil.processor.utilizedCappedProcUnits);
fieldsMap.put("utilizedUncappedProcUnits", metric.getSample(sample).lparsUtil.processor.utilizedUncappedProcUnits); fieldsMap.put("utilizedUncappedProcUnits", metric.getSample(sample).lparsUtil.processor.utilizedUncappedProcUnits);
fieldsMap.put("timePerInstructionExecution", metric.getSample(sample).lparsUtil.processor.timeSpentWaitingForDispatch); fieldsMap.put("timePerInstructionExecution", metric.getSample(sample).lparsUtil.processor.timeSpentWaitingForDispatch);
fieldsMap.put("timeSpentWaitingForDispatch", metric.getSample(sample).lparsUtil.processor.timePerInstructionExecution); fieldsMap.put("timeSpentWaitingForDispatch", metric.getSample(sample).lparsUtil.processor.timePerInstructionExecution);
fieldsMap.put("mode", metric.getSample(sample).lparsUtil.processor.mode); fieldsMap.put("mode", metric.getSample(sample).lparsUtil.processor.mode);
fieldsMap.put("weight", metric.getSample(sample).lparsUtil.processor.weight); fieldsMap.put("weight", metric.getSample(sample).lparsUtil.processor.weight);
fieldsMap.put("poolId", metric.getSample(sample).lparsUtil.processor.poolId); fieldsMap.put("poolId", metric.getSample(sample).lparsUtil.processor.poolId);
log.trace("getProcessorMetrics() - fields: " + fieldsMap); log.trace("getProcessorMetrics() - fields: " + fieldsMap);
list.add(new Measurement(getTimestamp(sample), tagsMap, fieldsMap)); list.add(new Measurement(getTimestamp(sample), tagsMap, fieldsMap));
} catch (Exception e) {
log.warn("getProcessorMetrics() - error: {}", e.getMessage());
}
return list; return list;
} }
// LPAR Network - Virtual // LPAR Network - Virtual
List<Measurement> getVirtualEthernetAdapterMetrics(int sample) { List<Measurement> getVirtualEthernetAdapterMetrics(int sample) throws NullPointerException {
List<Measurement> list = new ArrayList<>(); List<Measurement> list = new ArrayList<>();
try { metric.getSample(sample).lparsUtil.network.virtualEthernetAdapters.forEach(adapter -> {
metric.getSample(sample).lparsUtil.network.virtualEthernetAdapters.forEach(adapter -> {
HashMap<String, String> tagsMap = new HashMap<>(); HashMap<String, String> tagsMap = new HashMap<>();
HashMap<String, Object> fieldsMap = new HashMap<>(); HashMap<String, Object> fieldsMap = new HashMap<>();
tagsMap.put("servername", managedSystem.entry.getName()); tagsMap.put("servername", managedSystem.entry.getName());
tagsMap.put("lparname", entry.getName()); tagsMap.put("lparname", entry.getName());
tagsMap.put("location", adapter.physicalLocation); tagsMap.put("location", adapter.physicalLocation);
tagsMap.put("viosId", adapter.viosId.toString()); tagsMap.put("viosId", adapter.viosId.toString());
tagsMap.put("vlanId", adapter.vlanId.toString()); tagsMap.put("vlanId", adapter.vlanId.toString());
tagsMap.put("vswitchId", adapter.vswitchId.toString()); tagsMap.put("vswitchId", adapter.vswitchId.toString());
log.trace("getVirtualEthernetAdapterMetrics() - tags: " + tagsMap); log.trace("getVirtualEthernetAdapterMetrics() - tags: " + tagsMap);
fieldsMap.put("droppedPackets", adapter.droppedPackets); fieldsMap.put("droppedPackets", adapter.droppedPackets);
fieldsMap.put("droppedPhysicalPackets", adapter.droppedPhysicalPackets); fieldsMap.put("droppedPhysicalPackets", adapter.droppedPhysicalPackets);
fieldsMap.put("isPortVlanId", adapter.isPortVlanId); fieldsMap.put("isPortVlanId", adapter.isPortVlanId);
fieldsMap.put("receivedPhysicalBytes", adapter.receivedPhysicalBytes); fieldsMap.put("receivedPhysicalBytes", adapter.receivedPhysicalBytes);
fieldsMap.put("receivedPhysicalPackets", adapter.receivedPhysicalPackets); fieldsMap.put("receivedPhysicalPackets", adapter.receivedPhysicalPackets);
fieldsMap.put("sentPhysicalBytes", adapter.sentPhysicalBytes); fieldsMap.put("sentPhysicalBytes", adapter.sentPhysicalBytes);
fieldsMap.put("sentPhysicalPackets", adapter.sentPhysicalPackets); fieldsMap.put("sentPhysicalPackets", adapter.sentPhysicalPackets);
fieldsMap.put("receivedBytes", adapter.receivedBytes); fieldsMap.put("receivedBytes", adapter.receivedBytes);
fieldsMap.put("receivedPackets", adapter.receivedPackets); fieldsMap.put("receivedPackets", adapter.receivedPackets);
fieldsMap.put("sentBytes", adapter.sentBytes); fieldsMap.put("sentBytes", adapter.sentBytes);
fieldsMap.put("sentPackets", adapter.sentPackets); fieldsMap.put("sentPackets", adapter.sentPackets);
fieldsMap.put("transferredBytes", adapter.transferredBytes); fieldsMap.put("transferredBytes", adapter.transferredBytes);
fieldsMap.put("transferredPhysicalBytes", adapter.transferredPhysicalBytes); fieldsMap.put("transferredPhysicalBytes", adapter.transferredPhysicalBytes);
fieldsMap.put("sharedEthernetAdapterId", adapter.sharedEthernetAdapterId); fieldsMap.put("sharedEthernetAdapterId", adapter.sharedEthernetAdapterId);
log.trace("getVirtualEthernetAdapterMetrics() - fields: " + fieldsMap); log.trace("getVirtualEthernetAdapterMetrics() - fields: " + fieldsMap);
list.add(new Measurement(getTimestamp(sample), tagsMap, fieldsMap)); list.add(new Measurement(getTimestamp(sample), tagsMap, fieldsMap));
}); });
} catch (Exception e) {
log.warn("getVirtualEthernetAdapterMetrics() - error: {}", e.getMessage());
}
return list; return list;
} }
// LPAR Storage - Virtual Generic // LPAR Storage - Virtual Generic
List<Measurement> getVirtualGenericAdapterMetrics(int sample) { List<Measurement> getVirtualGenericAdapterMetrics(int sample) throws NullPointerException {
List<Measurement> list = new ArrayList<>(); List<Measurement> list = new ArrayList<>();
try { metric.getSample(sample).lparsUtil.storage.genericVirtualAdapters.forEach(adapter -> {
metric.getSample(sample).lparsUtil.storage.genericVirtualAdapters.forEach(adapter -> {
HashMap<String, String> tagsMap = new HashMap<>(); HashMap<String, String> tagsMap = new HashMap<>();
HashMap<String, Object> fieldsMap = new HashMap<>(); HashMap<String, Object> fieldsMap = new HashMap<>();
tagsMap.put("servername", managedSystem.entry.getName()); tagsMap.put("servername", managedSystem.entry.getName());
tagsMap.put("lparname", entry.getName()); tagsMap.put("lparname", entry.getName());
tagsMap.put("viosId", adapter.viosId.toString()); tagsMap.put("viosId", adapter.viosId.toString());
tagsMap.put("location", adapter.physicalLocation); tagsMap.put("location", adapter.physicalLocation);
tagsMap.put("id", adapter.id); tagsMap.put("id", adapter.id);
log.trace("getVirtualGenericAdapterMetrics() - tags: " + tagsMap); log.trace("getVirtualGenericAdapterMetrics() - tags: " + tagsMap);
fieldsMap.put("numOfReads", adapter.numOfReads); fieldsMap.put("numOfReads", adapter.numOfReads);
fieldsMap.put("numOfWrites", adapter.numOfWrites); fieldsMap.put("numOfWrites", adapter.numOfWrites);
fieldsMap.put("writeBytes", adapter.writeBytes); fieldsMap.put("writeBytes", adapter.writeBytes);
fieldsMap.put("readBytes", adapter.readBytes); fieldsMap.put("readBytes", adapter.readBytes);
fieldsMap.put("type", adapter.type); fieldsMap.put("type", adapter.type);
log.trace("getVirtualGenericAdapterMetrics() - fields: " + fieldsMap); log.trace("getVirtualGenericAdapterMetrics() - fields: " + fieldsMap);
list.add(new Measurement(getTimestamp(sample), tagsMap, fieldsMap));
});
} catch (Exception e) {
log.warn("getVirtualGenericAdapterMetrics() - error: {}", e.getMessage());
}
list.add(new Measurement(getTimestamp(sample), tagsMap, fieldsMap));
});
return list; return list;
} }
// LPAR Storage - Virtual FC // LPAR Storage - Virtual FC
List<Measurement> getVirtualFibreChannelAdapterMetrics(int sample) { List<Measurement> getVirtualFibreChannelAdapterMetrics(int sample) throws NullPointerException {
List<Measurement> list = new ArrayList<>(); List<Measurement> list = new ArrayList<>();
try { metric.getSample(sample).lparsUtil.storage.virtualFiberChannelAdapters.forEach(adapter -> {
metric.getSample(sample).lparsUtil.storage.virtualFiberChannelAdapters.forEach(adapter -> {
HashMap<String, String> tagsMap = new HashMap<>(); HashMap<String, String> tagsMap = new HashMap<>();
HashMap<String, Object> fieldsMap = new HashMap<>(); HashMap<String, Object> fieldsMap = new HashMap<>();
tagsMap.put("servername", managedSystem.entry.getName()); tagsMap.put("servername", managedSystem.entry.getName());
tagsMap.put("lparname", entry.getName()); tagsMap.put("lparname", entry.getName());
tagsMap.put("viosId", adapter.viosId.toString()); tagsMap.put("viosId", adapter.viosId.toString());
tagsMap.put("location", adapter.physicalLocation); tagsMap.put("location", adapter.physicalLocation);
log.trace("getVirtualFibreChannelAdapterMetrics() - tags: " + tagsMap); log.trace("getVirtualFibreChannelAdapterMetrics() - tags: " + tagsMap);
fieldsMap.put("numOfReads", adapter.numOfReads); fieldsMap.put("numOfReads", adapter.numOfReads);
fieldsMap.put("numOfWrites", adapter.numOfWrites); fieldsMap.put("numOfWrites", adapter.numOfWrites);
fieldsMap.put("writeBytes", adapter.writeBytes); fieldsMap.put("writeBytes", adapter.writeBytes);
fieldsMap.put("readBytes", adapter.readBytes); fieldsMap.put("readBytes", adapter.readBytes);
fieldsMap.put("runningSpeed", adapter.runningSpeed); fieldsMap.put("runningSpeed", adapter.runningSpeed);
fieldsMap.put("transmittedBytes", adapter.transmittedBytes); fieldsMap.put("transmittedBytes", adapter.transmittedBytes);
log.trace("getVirtualFibreChannelAdapterMetrics() - fields: " + fieldsMap); log.trace("getVirtualFibreChannelAdapterMetrics() - fields: " + fieldsMap);
list.add(new Measurement(getTimestamp(sample), tagsMap, fieldsMap)); list.add(new Measurement(getTimestamp(sample), tagsMap, fieldsMap));
}); });
} catch (Exception e) {
log.warn("getVirtualFibreChannelAdapterMetrics() - error: {}", e.getMessage());
}
return list; return list;
} }
// LPAR Network - SR-IOV Logical Ports // LPAR Network - SR-IOV Logical Ports
List<Measurement> getSriovLogicalPorts(int sample) { List<Measurement> getSriovLogicalPorts(int sample) throws NullPointerException {
List<Measurement> list = new ArrayList<>(); List<Measurement> list = new ArrayList<>();
try { metric.getSample(sample).lparsUtil.network.sriovLogicalPorts.forEach(port -> {
metric.getSample(sample).lparsUtil.network.sriovLogicalPorts.forEach(port -> {
HashMap<String, String> tagsMap = new HashMap<>(); HashMap<String, String> tagsMap = new HashMap<>();
HashMap<String, Object> fieldsMap = new HashMap<>(); HashMap<String, Object> fieldsMap = new HashMap<>();
tagsMap.put("servername", managedSystem.entry.getName()); tagsMap.put("servername", managedSystem.entry.getName());
tagsMap.put("lparname", entry.getName()); tagsMap.put("lparname", entry.getName());
tagsMap.put("location", port.physicalLocation); tagsMap.put("location", port.physicalLocation);
tagsMap.put("type", port.configurationType); tagsMap.put("type", port.configurationType);
log.trace("getSriovLogicalPorts() - tags: " + tagsMap); log.trace("getSriovLogicalPorts() - tags: " + tagsMap);
fieldsMap.put("sentBytes", port.sentBytes); fieldsMap.put("sentBytes", port.sentBytes);
fieldsMap.put("receivedBytes", port.receivedBytes); fieldsMap.put("receivedBytes", port.receivedBytes);
fieldsMap.put("transferredBytes", port.transferredBytes); fieldsMap.put("transferredBytes", port.transferredBytes);
fieldsMap.put("sentPackets", port.sentPackets); fieldsMap.put("sentPackets", port.sentPackets);
fieldsMap.put("receivedPackets", port.receivedPackets); fieldsMap.put("receivedPackets", port.receivedPackets);
fieldsMap.put("droppedPackets", port.droppedPackets); fieldsMap.put("droppedPackets", port.droppedPackets);
fieldsMap.put("errorIn", port.errorIn); fieldsMap.put("errorIn", port.errorIn);
fieldsMap.put("errorOut", port.errorOut); fieldsMap.put("errorOut", port.errorOut);
log.trace("getSriovLogicalPorts() - fields: " + fieldsMap); log.trace("getSriovLogicalPorts() - fields: " + fieldsMap);
list.add(new Measurement(getTimestamp(sample), tagsMap, fieldsMap)); list.add(new Measurement(getTimestamp(sample), tagsMap, fieldsMap));
}); });
} catch (Exception e) {
log.warn("getSriovLogicalPorts() - error: {}", e.getMessage());
}
return list; return list;
} }

643
src/main/java/biz/nellemann/hmci/ManagedSystem.java
View file

@ -156,7 +156,7 @@ class ManagedSystem extends Resource {
log.debug("refresh() - {}", name); log.debug("refresh() - {}", name);
try { try {
String xml = restClient.getRequest(String.format("/rest/api/pcm/ManagedSystem/%s/ProcessedMetrics?NoOfSamples=%d", id, currentNumberOfSamples)); String xml = restClient.getRequest(String.format("/rest/api/pcm/ManagedSystem/%s/ProcessedMetrics?NoOfSamples=%d", id, noOfSamples));
// Do not try to parse empty response // Do not try to parse empty response
if(xml == null || xml.length() <= 1) { if(xml == null || xml.length() <= 1) {
@ -200,7 +200,7 @@ class ManagedSystem extends Resource {
@Override @Override
public void process(int sample) { public void process(int sample) throws NullPointerException {
log.debug("process() - {} - sample: {}", name, sample); log.debug("process() - {} - sample: {}", name, sample);
@ -222,7 +222,7 @@ class ManagedSystem extends Resource {
influxClient.write(getVioNetworkGenericAdapters(sample),"vios_network_generic"); influxClient.write(getVioNetworkGenericAdapters(sample),"vios_network_generic");
influxClient.write(getVioStorageLpars(sample),"vios_storage_lpars"); influxClient.write(getVioStorageLpars(sample),"vios_storage_lpars");
influxClient.write(getVioStorageFiberChannelAdapters(sample),"vios_storage_FC"); influxClient.write(getVioStorageFiberChannelAdapters(sample),"vios_storage_FC");
influxClient.write(getVioStorageVirtualAdapters(sample),"vios_storage_vFC"); influxClient.write(getVioStorageVirtualAdapters(sample),"vios_storage_virtual");
influxClient.write(getVioStoragePhysicalAdapters(sample),"vios_storage_physical"); influxClient.write(getVioStoragePhysicalAdapters(sample),"vios_storage_physical");
// Missing: vios_storage_SSP // Missing: vios_storage_SSP
@ -290,145 +290,124 @@ class ManagedSystem extends Resource {
// System details // System details
List<Measurement> getDetails(int sample) { List<Measurement> getDetails(int sample) throws NullPointerException {
List<Measurement> list = new ArrayList<>(); List<Measurement> list = new ArrayList<>();
try { Map<String, String> tagsMap = new TreeMap<>();
Map<String, String> tagsMap = new TreeMap<>(); Map<String, Object> fieldsMap = new TreeMap<>();
Map<String, Object> fieldsMap = new TreeMap<>();
tagsMap.put("servername", entry.getName()); tagsMap.put("servername", entry.getName());
log.trace("getDetails() - tags: " + tagsMap); log.trace("getDetails() - tags: " + tagsMap);
fieldsMap.put("mtm", String.format("%s-%s %s", fieldsMap.put("mtm", String.format("%s-%s %s",
entry.getMachineTypeModelAndSerialNumber().getMachineType(), entry.getMachineTypeModelAndSerialNumber().getMachineType(),
entry.getMachineTypeModelAndSerialNumber().getModel(), entry.getMachineTypeModelAndSerialNumber().getModel(),
entry.getMachineTypeModelAndSerialNumber().getSerialNumber()) entry.getMachineTypeModelAndSerialNumber().getSerialNumber())
); );
fieldsMap.put("APIversion", metric.getUtilInfo().version); fieldsMap.put("APIversion", metric.getUtilInfo().version);
fieldsMap.put("metric", metric.utilInfo.metricType); fieldsMap.put("metric", metric.utilInfo.metricType);
fieldsMap.put("frequency", metric.getUtilInfo().frequency); fieldsMap.put("frequency", metric.getUtilInfo().frequency);
fieldsMap.put("nextract", "HMCi"); fieldsMap.put("nextract", "HMCi");
fieldsMap.put("name", entry.getName()); fieldsMap.put("name", entry.getName());
fieldsMap.put("utilizedProcUnits", metric.getSample(sample).systemFirmwareUtil.utilizedProcUnits); fieldsMap.put("utilizedProcUnits", metric.getSample(sample).systemFirmwareUtil.utilizedProcUnits);
fieldsMap.put("assignedMem", metric.getSample(sample).systemFirmwareUtil.assignedMem); fieldsMap.put("assignedMem", metric.getSample(sample).systemFirmwareUtil.assignedMem);
log.trace("getDetails() - fields: " + fieldsMap); log.trace("getDetails() - fields: " + fieldsMap);
list.add(new Measurement(getTimestamp(sample), tagsMap, fieldsMap));
list.add(new Measurement(getTimestamp(sample), tagsMap, fieldsMap));
} catch (Exception e) {
log.warn("getDetails() - error: {}", e.getMessage());
}
return list; return list;
} }
// System Memory // System Memory
List<Measurement> getMemoryMetrics(int sample) { List<Measurement> getMemoryMetrics(int sample) throws NullPointerException {
List<Measurement> list = new ArrayList<>(); List<Measurement> list = new ArrayList<>();
try { HashMap<String, String> tagsMap = new HashMap<>();
HashMap<String, String> tagsMap = new HashMap<>(); Map<String, Object> fieldsMap = new HashMap<>();
Map<String, Object> fieldsMap = new HashMap<>();
tagsMap.put("servername", entry.getName()); tagsMap.put("servername", entry.getName());
log.trace("getMemoryMetrics() - tags: " + tagsMap); log.trace("getMemoryMetrics() - tags: " + tagsMap);
fieldsMap.put("totalMem", metric.getSample(sample).serverUtil.memory.totalMem); fieldsMap.put("totalMem", metric.getSample(sample).serverUtil.memory.totalMem);
fieldsMap.put("availableMem", metric.getSample(sample).serverUtil.memory.availableMem); fieldsMap.put("availableMem", metric.getSample(sample).serverUtil.memory.availableMem);
fieldsMap.put("configurableMem", metric.getSample(sample).serverUtil.memory.configurableMem); fieldsMap.put("configurableMem", metric.getSample(sample).serverUtil.memory.configurableMem);
fieldsMap.put("assignedMemToLpars", metric.getSample(sample).serverUtil.memory.assignedMemToLpars); fieldsMap.put("assignedMemToLpars", metric.getSample(sample).serverUtil.memory.assignedMemToLpars);
fieldsMap.put("virtualPersistentMem", metric.getSample(sample).serverUtil.memory.virtualPersistentMem); fieldsMap.put("virtualPersistentMem", metric.getSample(sample).serverUtil.memory.virtualPersistentMem);
log.trace("getMemoryMetrics() - fields: " + fieldsMap); log.trace("getMemoryMetrics() - fields: " + fieldsMap);
list.add(new Measurement(getTimestamp(sample), tagsMap, fieldsMap)); list.add(new Measurement(getTimestamp(sample), tagsMap, fieldsMap));
} catch (Exception e) {
log.warn("getMemoryMetrics() - error: {}", e.getMessage());
}
return list; return list;
} }
// System Processor // System Processor
List<Measurement> getProcessorMetrics(int sample) { List<Measurement> getProcessorMetrics(int sample) throws NullPointerException {
List<Measurement> list = new ArrayList<>(); List<Measurement> list = new ArrayList<>();
try { HashMap<String, String> tagsMap = new HashMap<>();
HashMap<String, String> tagsMap = new HashMap<>(); HashMap<String, Object> fieldsMap = new HashMap<>();
HashMap<String, Object> fieldsMap = new HashMap<>();
tagsMap.put("servername", entry.getName()); tagsMap.put("servername", entry.getName());
log.trace("getProcessorMetrics() - tags: " + tagsMap); log.trace("getProcessorMetrics() - tags: " + tagsMap);
fieldsMap.put("totalProcUnits", metric.getSample(sample).serverUtil.processor.totalProcUnits); fieldsMap.put("totalProcUnits", metric.getSample(sample).serverUtil.processor.totalProcUnits);
fieldsMap.put("utilizedProcUnits", metric.getSample(sample).serverUtil.processor.utilizedProcUnits); fieldsMap.put("utilizedProcUnits", metric.getSample(sample).serverUtil.processor.utilizedProcUnits);
fieldsMap.put("availableProcUnits", metric.getSample(sample).serverUtil.processor.availableProcUnits); fieldsMap.put("availableProcUnits", metric.getSample(sample).serverUtil.processor.availableProcUnits);
fieldsMap.put("configurableProcUnits", metric.getSample(sample).serverUtil.processor.configurableProcUnits); fieldsMap.put("configurableProcUnits", metric.getSample(sample).serverUtil.processor.configurableProcUnits);
log.trace("getProcessorMetrics() - fields: " + fieldsMap); log.trace("getProcessorMetrics() - fields: " + fieldsMap);
list.add(new Measurement(getTimestamp(sample), tagsMap, fieldsMap)); list.add(new Measurement(getTimestamp(sample), tagsMap, fieldsMap));
} catch (Exception e) {
log.warn("getProcessorMetrics() - error: {}", e.getMessage());
}
return list; return list;
} }
// Sytem Shared ProcessorPools // Sytem Shared ProcessorPools
List<Measurement> getSharedProcessorPools(int sample) { List<Measurement> getSharedProcessorPools(int sample) throws NullPointerException {
List<Measurement> list = new ArrayList<>(); List<Measurement> list = new ArrayList<>();
try { metric.getSample(sample).serverUtil.sharedProcessorPool.forEach(sharedProcessorPool -> {
metric.getSample(sample).serverUtil.sharedProcessorPool.forEach(sharedProcessorPool -> {
HashMap<String, String> tagsMap = new HashMap<>();
HashMap<String, Object> fieldsMap = new HashMap<>();
tagsMap.put("servername", entry.getName());
tagsMap.put("pool", String.valueOf(sharedProcessorPool.id));
tagsMap.put("poolname", sharedProcessorPool.name);
log.trace("getSharedProcessorPools() - tags: " + tagsMap);
fieldsMap.put("assignedProcUnits", sharedProcessorPool.assignedProcUnits);
fieldsMap.put("availableProcUnits", sharedProcessorPool.availableProcUnits);
fieldsMap.put("utilizedProcUnits", sharedProcessorPool.utilizedProcUnits);
fieldsMap.put("borrowedProcUnits", sharedProcessorPool.borrowedProcUnits);
fieldsMap.put("configuredProcUnits", sharedProcessorPool.configuredProcUnits);
log.trace("getSharedProcessorPools() - fields: " + fieldsMap);
list.add(new Measurement(getTimestamp(sample), tagsMap, fieldsMap));
});
} catch (Exception e) {
log.warn("getSharedProcessorPools() - error: {}", e.getMessage());
}
return list;
}
// System Physical ProcessorPool
List<Measurement> getPhysicalProcessorPool(int sample) {
List<Measurement> list = new ArrayList<>();
try {
HashMap<String, String> tagsMap = new HashMap<>(); HashMap<String, String> tagsMap = new HashMap<>();
HashMap<String, Object> fieldsMap = new HashMap<>(); HashMap<String, Object> fieldsMap = new HashMap<>();
tagsMap.put("servername", entry.getName()); tagsMap.put("servername", entry.getName());
log.trace("getPhysicalProcessorPool() - tags: " + tagsMap); tagsMap.put("pool", String.valueOf(sharedProcessorPool.id));
tagsMap.put("poolname", sharedProcessorPool.name);
log.trace("getSharedProcessorPools() - tags: " + tagsMap);
fieldsMap.put("assignedProcUnits", metric.getSample(sample).serverUtil.physicalProcessorPool.assignedProcUnits); fieldsMap.put("assignedProcUnits", sharedProcessorPool.assignedProcUnits);
fieldsMap.put("availableProcUnits", metric.getSample(sample).serverUtil.physicalProcessorPool.availableProcUnits); fieldsMap.put("availableProcUnits", sharedProcessorPool.availableProcUnits);
fieldsMap.put("utilizedProcUnits", metric.getSample(sample).serverUtil.physicalProcessorPool.utilizedProcUnits); fieldsMap.put("utilizedProcUnits", sharedProcessorPool.utilizedProcUnits);
fieldsMap.put("configuredProcUnits", metric.getSample(sample).serverUtil.physicalProcessorPool.configuredProcUnits); fieldsMap.put("borrowedProcUnits", sharedProcessorPool.borrowedProcUnits);
fieldsMap.put("borrowedProcUnits", metric.getSample(sample).serverUtil.physicalProcessorPool.borrowedProcUnits); fieldsMap.put("configuredProcUnits", sharedProcessorPool.configuredProcUnits);
log.trace("getPhysicalProcessorPool() - fields: " + fieldsMap); log.trace("getSharedProcessorPools() - fields: " + fieldsMap);
list.add(new Measurement(getTimestamp(sample), tagsMap, fieldsMap)); list.add(new Measurement(getTimestamp(sample), tagsMap, fieldsMap));
} catch (Exception e) { });
log.warn("getPhysicalProcessorPool() - error: {}", e.getMessage());
} return list;
}
// System Physical ProcessorPool
List<Measurement> getPhysicalProcessorPool(int sample) throws NullPointerException {
List<Measurement> list = new ArrayList<>();
HashMap<String, String> tagsMap = new HashMap<>();
HashMap<String, Object> fieldsMap = new HashMap<>();
tagsMap.put("servername", entry.getName());
log.trace("getPhysicalProcessorPool() - tags: " + tagsMap);
fieldsMap.put("assignedProcUnits", metric.getSample(sample).serverUtil.physicalProcessorPool.assignedProcUnits);
fieldsMap.put("availableProcUnits", metric.getSample(sample).serverUtil.physicalProcessorPool.availableProcUnits);
fieldsMap.put("utilizedProcUnits", metric.getSample(sample).serverUtil.physicalProcessorPool.utilizedProcUnits);
fieldsMap.put("configuredProcUnits", metric.getSample(sample).serverUtil.physicalProcessorPool.configuredProcUnits);
fieldsMap.put("borrowedProcUnits", metric.getSample(sample).serverUtil.physicalProcessorPool.borrowedProcUnits);
log.trace("getPhysicalProcessorPool() - fields: " + fieldsMap);
list.add(new Measurement(getTimestamp(sample), tagsMap, fieldsMap));
return list; return list;
} }
@ -440,383 +419,339 @@ class ManagedSystem extends Resource {
// VIO Details // VIO Details
List<Measurement> getVioDetails(int sample) { List<Measurement> getVioDetails(int sample) throws NullPointerException {
List<Measurement> list = new ArrayList<>(); List<Measurement> list = new ArrayList<>();
try { metric.getSample(sample).viosUtil.forEach(vio -> {
metric.getSample(sample).viosUtil.forEach(vio -> {
HashMap<String, String> tagsMap = new HashMap<>(); HashMap<String, String> tagsMap = new HashMap<>();
HashMap<String, Object> fieldsMap = new HashMap<>(); HashMap<String, Object> fieldsMap = new HashMap<>();
tagsMap.put("servername", entry.getName()); tagsMap.put("servername", entry.getName());
tagsMap.put("viosname", vio.name); tagsMap.put("viosname", vio.name);
log.trace("getVioDetails() - tags: " + tagsMap); log.trace("getVioDetails() - tags: " + tagsMap);
fieldsMap.put("viosid", vio.id); fieldsMap.put("viosid", vio.id);
fieldsMap.put("viosstate", vio.state); fieldsMap.put("viosstate", vio.state);
fieldsMap.put("viosname", vio.name); fieldsMap.put("viosname", vio.name);
fieldsMap.put("affinityScore", vio.affinityScore); fieldsMap.put("affinityScore", vio.affinityScore);
log.trace("getVioDetails() - fields: " + fieldsMap); log.trace("getVioDetails() - fields: " + fieldsMap);
list.add(new Measurement(getTimestamp(sample), tagsMap, fieldsMap)); list.add(new Measurement(getTimestamp(sample), tagsMap, fieldsMap));
}); });
} catch (Exception e) {
log.warn("getVioDetails() - error: {}", e.getMessage());
}
return list; return list;
} }
// VIO Memory // VIO Memory
List<Measurement> getVioMemoryMetrics(int sample) { List<Measurement> getVioMemoryMetrics(int sample) throws NullPointerException {
List<Measurement> list = new ArrayList<>(); List<Measurement> list = new ArrayList<>();
try { metric.getSample(sample).viosUtil.forEach(vio -> {
metric.getSample(sample).viosUtil.forEach(vio -> {
HashMap<String, String> tagsMap = new HashMap<>(); HashMap<String, String> tagsMap = new HashMap<>();
HashMap<String, Object> fieldsMap = new HashMap<>(); HashMap<String, Object> fieldsMap = new HashMap<>();
tagsMap.put("servername", entry.getName()); tagsMap.put("servername", entry.getName());
tagsMap.put("viosname", vio.name); tagsMap.put("viosname", vio.name);
log.trace("getVioMemoryMetrics() - tags: " + tagsMap); log.trace("getVioMemoryMetrics() - tags: " + tagsMap);
Number assignedMem = vio.memory.assignedMem; Number assignedMem = vio.memory.assignedMem;
Number utilizedMem = vio.memory.utilizedMem; Number utilizedMem = vio.memory.utilizedMem;
Number usedMemPct = (utilizedMem.intValue() * 100 ) / assignedMem.intValue(); Number usedMemPct = (utilizedMem.intValue() * 100 ) / assignedMem.intValue();
fieldsMap.put("assignedMem", vio.memory.assignedMem); fieldsMap.put("assignedMem", vio.memory.assignedMem);
fieldsMap.put("utilizedMem", vio.memory.utilizedMem); fieldsMap.put("utilizedMem", vio.memory.utilizedMem);
fieldsMap.put("utilizedPct", usedMemPct.floatValue()); fieldsMap.put("utilizedPct", usedMemPct.floatValue());
log.trace("getVioMemoryMetrics() - fields: " + fieldsMap); log.trace("getVioMemoryMetrics() - fields: " + fieldsMap);
list.add(new Measurement(getTimestamp(sample), tagsMap, fieldsMap)); list.add(new Measurement(getTimestamp(sample), tagsMap, fieldsMap));
}); });
} catch (Exception e) {
log.warn("getVioMemoryMetrics() - error: {}", e.getMessage());
}
return list; return list;
} }
// VIO Processor // VIO Processor
List<Measurement> getVioProcessorMetrics(int sample) { List<Measurement> getVioProcessorMetrics(int sample) throws NullPointerException {
List<Measurement> list = new ArrayList<>(); List<Measurement> list = new ArrayList<>();
try { metric.getSample(sample).viosUtil.forEach(vio -> {
metric.getSample(sample).viosUtil.forEach(vio -> {
HashMap<String, String> tagsMap = new HashMap<>(); HashMap<String, String> tagsMap = new HashMap<>();
HashMap<String, Object> fieldsMap = new HashMap<>(); HashMap<String, Object> fieldsMap = new HashMap<>();
tagsMap.put("servername", entry.getName()); tagsMap.put("servername", entry.getName());
tagsMap.put("viosname", vio.name); tagsMap.put("viosname", vio.name);
log.trace("getVioProcessorMetrics() - tags: " + tagsMap); log.trace("getVioProcessorMetrics() - tags: " + tagsMap);
fieldsMap.put("utilizedProcUnits", vio.processor.utilizedProcUnits); fieldsMap.put("utilizedProcUnits", vio.processor.utilizedProcUnits);
fieldsMap.put("utilizedCappedProcUnits", vio.processor.utilizedCappedProcUnits); fieldsMap.put("utilizedCappedProcUnits", vio.processor.utilizedCappedProcUnits);
fieldsMap.put("utilizedUncappedProcUnits", vio.processor.utilizedUncappedProcUnits); fieldsMap.put("utilizedUncappedProcUnits", vio.processor.utilizedUncappedProcUnits);
fieldsMap.put("currentVirtualProcessors", vio.processor.currentVirtualProcessors); fieldsMap.put("currentVirtualProcessors", vio.processor.currentVirtualProcessors);
fieldsMap.put("maxVirtualProcessors", vio.processor.maxVirtualProcessors); fieldsMap.put("maxVirtualProcessors", vio.processor.maxVirtualProcessors);
fieldsMap.put("maxProcUnits", vio.processor.maxProcUnits); fieldsMap.put("maxProcUnits", vio.processor.maxProcUnits);
fieldsMap.put("entitledProcUnits", vio.processor.entitledProcUnits); fieldsMap.put("entitledProcUnits", vio.processor.entitledProcUnits);
fieldsMap.put("donatedProcUnits", vio.processor.donatedProcUnits); fieldsMap.put("donatedProcUnits", vio.processor.donatedProcUnits);
fieldsMap.put("idleProcUnits", vio.processor.idleProcUnits); fieldsMap.put("idleProcUnits", vio.processor.idleProcUnits);
fieldsMap.put("timeSpentWaitingForDispatch", vio.processor.timePerInstructionExecution); fieldsMap.put("timeSpentWaitingForDispatch", vio.processor.timePerInstructionExecution);
fieldsMap.put("timePerInstructionExecution", vio.processor.timeSpentWaitingForDispatch); fieldsMap.put("timePerInstructionExecution", vio.processor.timeSpentWaitingForDispatch);
fieldsMap.put("weight", vio.processor.weight); fieldsMap.put("weight", vio.processor.weight);
fieldsMap.put("mode", vio.processor.mode); fieldsMap.put("mode", vio.processor.mode);
log.trace("getVioProcessorMetrics() - fields: " + fieldsMap); log.trace("getVioProcessorMetrics() - fields: " + fieldsMap);
list.add(new Measurement(getTimestamp(sample), tagsMap, fieldsMap)); list.add(new Measurement(getTimestamp(sample), tagsMap, fieldsMap));
}); });
} catch (Exception e) {
log.warn("getVioProcessorMetrics() - error: {}", e.getMessage());
}
return list; return list;
} }
// VIOs - Network // VIOs - Network
List<Measurement> getVioNetworkLpars(int sample) { List<Measurement> getVioNetworkLpars(int sample) throws NullPointerException {
List<Measurement> list = new ArrayList<>(); List<Measurement> list = new ArrayList<>();
try { metric.getSample(sample).viosUtil.forEach(vio -> {
metric.getSample(sample).viosUtil.forEach(vio -> {
HashMap<String, String> tagsMap = new HashMap<>(); HashMap<String, String> tagsMap = new HashMap<>();
HashMap<String, Object> fieldsMap = new HashMap<>(); HashMap<String, Object> fieldsMap = new HashMap<>();
tagsMap.put("servername", entry.getName()); tagsMap.put("servername", entry.getName());
tagsMap.put("viosname", vio.name); tagsMap.put("viosname", vio.name);
log.trace("getVioNetworkLpars() - tags: " + tagsMap); log.trace("getVioNetworkLpars() - tags: " + tagsMap);
fieldsMap.put("clientlpars", vio.network.clientLpars.size()); fieldsMap.put("clientlpars", vio.network.clientLpars.size());
log.trace("getVioNetworkLpars() - fields: " + fieldsMap); log.trace("getVioNetworkLpars() - fields: " + fieldsMap);
list.add(new Measurement(getTimestamp(sample), tagsMap, fieldsMap)); list.add(new Measurement(getTimestamp(sample), tagsMap, fieldsMap));
}); });
} catch (Exception e) {
log.warn("getVioNetworkLpars() - error: {}", e.getMessage());
}
return list; return list;
} }
// VIO Network - Shared // VIO Network - Shared
List<Measurement> getVioNetworkSharedAdapters(int sample) { List<Measurement> getVioNetworkSharedAdapters(int sample) throws NullPointerException {
List<Measurement> list = new ArrayList<>(); List<Measurement> list = new ArrayList<>();
try { metric.getSample(sample).viosUtil.forEach(vio -> {
metric.getSample(sample).viosUtil.forEach(vio -> { vio.network.sharedAdapters.forEach(adapter -> {
vio.network.sharedAdapters.forEach(adapter -> { HashMap<String, String> tagsMap = new HashMap<>();
HashMap<String, String> tagsMap = new HashMap<>(); HashMap<String, Object> fieldsMap = new HashMap<>();
HashMap<String, Object> fieldsMap = new HashMap<>();
tagsMap.put("servername", entry.getName()); tagsMap.put("servername", entry.getName());
tagsMap.put("viosname", vio.name); tagsMap.put("viosname", vio.name);
//tagsMap.put("id", adapter.id); //tagsMap.put("id", adapter.id);
tagsMap.put("location", adapter.physicalLocation); tagsMap.put("location", adapter.physicalLocation);
log.trace("getVioNetworkSharedAdapters() - tags: " + tagsMap); log.trace("getVioNetworkSharedAdapters() - tags: " + tagsMap);
fieldsMap.put("id", adapter.id); fieldsMap.put("id", adapter.id);
fieldsMap.put("type", adapter.type); fieldsMap.put("type", adapter.type);
fieldsMap.put("sentBytes", adapter.sentBytes); fieldsMap.put("sentBytes", adapter.sentBytes);
fieldsMap.put("sentPackets", adapter.sentPackets); fieldsMap.put("sentPackets", adapter.sentPackets);
fieldsMap.put("receivedBytes", adapter.receivedBytes); fieldsMap.put("receivedBytes", adapter.receivedBytes);
fieldsMap.put("receivedPackets", adapter.receivedPackets); fieldsMap.put("receivedPackets", adapter.receivedPackets);
fieldsMap.put("droppedPackets", adapter.droppedPackets); fieldsMap.put("droppedPackets", adapter.droppedPackets);
fieldsMap.put("transferredBytes", adapter.transferredBytes); fieldsMap.put("transferredBytes", adapter.transferredBytes);
log.trace("getVioNetworkSharedAdapters() - fields: " + fieldsMap); log.trace("getVioNetworkSharedAdapters() - fields: " + fieldsMap);
list.add(new Measurement(getTimestamp(sample), tagsMap, fieldsMap)); list.add(new Measurement(getTimestamp(sample), tagsMap, fieldsMap));
});
}); });
} catch (Exception e) { });
log.warn("getVioNetworkSharedAdapters() - error: {}", e.getMessage());
}
return list; return list;
} }
// VIO Network - Virtual // VIO Network - Virtual
List<Measurement> getVioNetworkVirtualAdapters(int sample) { List<Measurement> getVioNetworkVirtualAdapters(int sample) throws NullPointerException {
List<Measurement> list = new ArrayList<>(); List<Measurement> list = new ArrayList<>();
try { metric.getSample(sample).viosUtil.forEach( vio -> {
metric.getSample(sample).viosUtil.forEach( vio -> { vio.network.virtualEthernetAdapters.forEach( adapter -> {
vio.network.virtualEthernetAdapters.forEach( adapter -> {
HashMap<String, String> tagsMap = new HashMap<>(); HashMap<String, String> tagsMap = new HashMap<>();
HashMap<String, Object> fieldsMap = new HashMap<>(); HashMap<String, Object> fieldsMap = new HashMap<>();
tagsMap.put("vlanid", String.valueOf(adapter.vlanId)); tagsMap.put("vlanid", String.valueOf(adapter.vlanId));
tagsMap.put("vswitchid", String.valueOf(adapter.vswitchId)); tagsMap.put("vswitchid", String.valueOf(adapter.vswitchId));
tagsMap.put("servername", entry.getName()); tagsMap.put("servername", entry.getName());
tagsMap.put("viosname", vio.name); tagsMap.put("viosname", vio.name);
tagsMap.put("location", adapter.physicalLocation); tagsMap.put("location", adapter.physicalLocation);
log.trace("getVioNetworkVirtualAdapters() - tags: " + tagsMap); log.trace("getVioNetworkVirtualAdapters() - tags: " + tagsMap);
fieldsMap.put("droppedPackets", adapter.droppedPackets); fieldsMap.put("droppedPackets", adapter.droppedPackets);
fieldsMap.put("droppedPhysicalPackets", adapter.droppedPhysicalPackets); fieldsMap.put("droppedPhysicalPackets", adapter.droppedPhysicalPackets);
fieldsMap.put("isPortVlanId", adapter.isPortVlanId); fieldsMap.put("isPortVlanId", adapter.isPortVlanId);
fieldsMap.put("receivedBytes", adapter.receivedBytes); fieldsMap.put("receivedBytes", adapter.receivedBytes);
fieldsMap.put("receivedPackets", adapter.receivedPackets); fieldsMap.put("receivedPackets", adapter.receivedPackets);
fieldsMap.put("receivedPhysicalBytes", adapter.receivedPhysicalBytes); fieldsMap.put("receivedPhysicalBytes", adapter.receivedPhysicalBytes);
fieldsMap.put("receivedPhysicalPackets", adapter.receivedPhysicalPackets); fieldsMap.put("receivedPhysicalPackets", adapter.receivedPhysicalPackets);
fieldsMap.put("sentBytes", adapter.sentBytes); fieldsMap.put("sentBytes", adapter.sentBytes);
fieldsMap.put("sentPackets", adapter.sentPackets); fieldsMap.put("sentPackets", adapter.sentPackets);
fieldsMap.put("sentPhysicalBytes", adapter.sentPhysicalBytes); fieldsMap.put("sentPhysicalBytes", adapter.sentPhysicalBytes);
fieldsMap.put("sentPhysicalPackets", adapter.sentPhysicalPackets); fieldsMap.put("sentPhysicalPackets", adapter.sentPhysicalPackets);
fieldsMap.put("transferredBytes", adapter.transferredBytes); fieldsMap.put("transferredBytes", adapter.transferredBytes);
fieldsMap.put("transferredPhysicalBytes", adapter.transferredPhysicalBytes); fieldsMap.put("transferredPhysicalBytes", adapter.transferredPhysicalBytes);
log.trace("getVioNetworkVirtualAdapters() - fields: " + fieldsMap); log.trace("getVioNetworkVirtualAdapters() - fields: " + fieldsMap);
list.add(new Measurement(getTimestamp(sample), tagsMap, fieldsMap)); list.add(new Measurement(getTimestamp(sample), tagsMap, fieldsMap));
});
}); });
} catch (Exception e) { });
log.warn("getVioNetworkVirtualAdapters() - error: {}", e.getMessage());
}
return list; return list;
} }
// VIO Network - Generic // VIO Network - Generic
List<Measurement> getVioNetworkGenericAdapters(int sample) { List<Measurement> getVioNetworkGenericAdapters(int sample) throws NullPointerException {
List<Measurement> list = new ArrayList<>(); List<Measurement> list = new ArrayList<>();
try { metric.getSample(sample).viosUtil.forEach( vio -> {
metric.getSample(sample).viosUtil.forEach( vio -> { vio.network.genericAdapters.forEach( adapter -> {
vio.network.genericAdapters.forEach( adapter -> {
HashMap<String, String> tagsMap = new HashMap<>();
HashMap<String, Object> fieldsMap = new HashMap<>();
tagsMap.put("id", adapter.id);
tagsMap.put("servername", entry.getName());
tagsMap.put("viosname", vio.name);
tagsMap.put("location", adapter.physicalLocation);
log.trace("getVioNetworkGenericAdapters() - tags: " + tagsMap);
fieldsMap.put("sentBytes", adapter.sentBytes);
fieldsMap.put("sentPackets", adapter.sentPackets);
fieldsMap.put("receivedBytes", adapter.receivedBytes);
fieldsMap.put("receivedPackets", adapter.receivedPackets);
fieldsMap.put("droppedPackets", adapter.droppedPackets);
fieldsMap.put("transferredBytes", adapter.transferredBytes);
log.trace("getVioNetworkGenericAdapters() - fields: " + fieldsMap);
list.add(new Measurement(getTimestamp(sample), tagsMap, fieldsMap));
});
});
} catch (Exception e) {
log.warn("getVioNetworkGenericAdapters() - error: {}", e.getMessage());
}
return list;
}
// VIOs - Storage
List<Measurement> getVioStorageLpars(int sample) {
List<Measurement> list = new ArrayList<>();
try {
metric.getSample(sample).viosUtil.forEach(vio -> {
HashMap<String, String> tagsMap = new HashMap<>(); HashMap<String, String> tagsMap = new HashMap<>();
HashMap<String, Object> fieldsMap = new HashMap<>(); HashMap<String, Object> fieldsMap = new HashMap<>();
tagsMap.put("id", adapter.id);
tagsMap.put("servername", entry.getName()); tagsMap.put("servername", entry.getName());
tagsMap.put("viosname", vio.name); tagsMap.put("viosname", vio.name);
log.trace("getVioStorageLpars() - tags: " + tagsMap); tagsMap.put("location", adapter.physicalLocation);
log.trace("getVioNetworkGenericAdapters() - tags: " + tagsMap);
fieldsMap.put("clientlpars", vio.storage.clientLpars.size()); fieldsMap.put("sentBytes", adapter.sentBytes);
log.trace("getVioStorageLpars() - fields: " + fieldsMap); fieldsMap.put("sentPackets", adapter.sentPackets);
fieldsMap.put("receivedBytes", adapter.receivedBytes);
fieldsMap.put("receivedPackets", adapter.receivedPackets);
fieldsMap.put("droppedPackets", adapter.droppedPackets);
fieldsMap.put("transferredBytes", adapter.transferredBytes);
log.trace("getVioNetworkGenericAdapters() - fields: " + fieldsMap);
list.add(new Measurement(getTimestamp(sample), tagsMap, fieldsMap)); list.add(new Measurement(getTimestamp(sample), tagsMap, fieldsMap));
}); });
} catch (Exception e) { });
log.warn("getVioStorageLpars() - error: {}", e.getMessage());
}
return list; return list;
} }
// VIO Storage FC
List<Measurement> getVioStorageFiberChannelAdapters(int sample) { // VIOs - Storage
List<Measurement> getVioStorageLpars(int sample) throws NullPointerException {
List<Measurement> list = new ArrayList<>(); List<Measurement> list = new ArrayList<>();
try { metric.getSample(sample).viosUtil.forEach(vio -> {
metric.getSample(sample).viosUtil.forEach( vio -> {
log.trace("getVioStorageFiberChannelAdapters() - VIO: " + vio.name);
vio.storage.fiberChannelAdapters.forEach( adapter -> { HashMap<String, String> tagsMap = new HashMap<>();
HashMap<String, Object> fieldsMap = new HashMap<>();
HashMap<String, String> tagsMap = new HashMap<>(); tagsMap.put("servername", entry.getName());
HashMap<String, Object> fieldsMap = new HashMap<>(); tagsMap.put("viosname", vio.name);
log.trace("getVioStorageLpars() - tags: " + tagsMap);
tagsMap.put("id", adapter.id); fieldsMap.put("clientlpars", vio.storage.clientLpars.size());
tagsMap.put("servername", entry.getName()); log.trace("getVioStorageLpars() - fields: " + fieldsMap);
tagsMap.put("viosname", vio.name);
tagsMap.put("location", adapter.physicalLocation);
log.trace("getVioStorageFiberChannelAdapters() - tags: " + tagsMap);
fieldsMap.put("numOfReads", adapter.numOfReads); list.add(new Measurement(getTimestamp(sample), tagsMap, fieldsMap));
fieldsMap.put("numOfWrites", adapter.numOfWrites); });
fieldsMap.put("readBytes", adapter.readBytes);
fieldsMap.put("writeBytes", adapter.writeBytes);
fieldsMap.put("transmittedBytes", adapter.transmittedBytes);
log.trace("getVioStorageFiberChannelAdapters() - fields: " + fieldsMap);
list.add(new Measurement(getTimestamp(sample), tagsMap, fieldsMap)); return list;
}); }
// VIO Storage FC
List<Measurement> getVioStorageFiberChannelAdapters(int sample) throws NullPointerException {
List<Measurement> list = new ArrayList<>();
metric.getSample(sample).viosUtil.forEach( vio -> {
log.trace("getVioStorageFiberChannelAdapters() - VIO: " + vio.name);
vio.storage.fiberChannelAdapters.forEach( adapter -> {
HashMap<String, String> tagsMap = new HashMap<>();
HashMap<String, Object> fieldsMap = new HashMap<>();
tagsMap.put("id", adapter.id);
tagsMap.put("servername", entry.getName());
tagsMap.put("viosname", vio.name);
tagsMap.put("location", adapter.physicalLocation);
log.trace("getVioStorageFiberChannelAdapters() - tags: " + tagsMap);
fieldsMap.put("numOfReads", adapter.numOfReads);
fieldsMap.put("numOfWrites", adapter.numOfWrites);
fieldsMap.put("readBytes", adapter.readBytes);
fieldsMap.put("writeBytes", adapter.writeBytes);
fieldsMap.put("transmittedBytes", adapter.transmittedBytes);
log.trace("getVioStorageFiberChannelAdapters() - fields: " + fieldsMap);
list.add(new Measurement(getTimestamp(sample), tagsMap, fieldsMap));
}); });
} catch (Exception e) { });
log.warn("getVioStorageFiberChannelAdapters() - error: {}", e.getMessage());
}
return list; return list;
} }
// VIO Storage - Physical // VIO Storage - Physical
List<Measurement> getVioStoragePhysicalAdapters(int sample) { List<Measurement> getVioStoragePhysicalAdapters(int sample) throws NullPointerException {
List<Measurement> list = new ArrayList<>(); List<Measurement> list = new ArrayList<>();
try { metric.getSample(sample).viosUtil.forEach( vio -> {
metric.getSample(sample).viosUtil.forEach( vio -> { log.trace("getVioStoragePhysicalAdapters() - VIO: " + vio.name);
log.trace("getVioStoragePhysicalAdapters() - VIO: " + vio.name);
vio.storage.genericPhysicalAdapters.forEach( adapter -> { vio.storage.genericPhysicalAdapters.forEach( adapter -> {
HashMap<String, String> tagsMap = new HashMap<>(); HashMap<String, String> tagsMap = new HashMap<>();
HashMap<String, Object> fieldsMap = new HashMap<>(); HashMap<String, Object> fieldsMap = new HashMap<>();
tagsMap.put("servername", entry.getName()); tagsMap.put("servername", entry.getName());
tagsMap.put("viosname", vio.name); tagsMap.put("viosname", vio.name);
tagsMap.put("id", adapter.id); tagsMap.put("id", adapter.id);
tagsMap.put("location", adapter.physicalLocation); tagsMap.put("location", adapter.physicalLocation);
log.trace("getVioStoragePhysicalAdapters() - tags: " + tagsMap); log.trace("getVioStoragePhysicalAdapters() - tags: " + tagsMap);
fieldsMap.put("numOfReads", adapter.numOfReads); fieldsMap.put("numOfReads", adapter.numOfReads);
fieldsMap.put("numOfWrites", adapter.numOfWrites); fieldsMap.put("numOfWrites", adapter.numOfWrites);
fieldsMap.put("readBytes", adapter.readBytes); fieldsMap.put("readBytes", adapter.readBytes);
fieldsMap.put("writeBytes", adapter.writeBytes); fieldsMap.put("writeBytes", adapter.writeBytes);
fieldsMap.put("transmittedBytes", adapter.transmittedBytes); fieldsMap.put("transmittedBytes", adapter.transmittedBytes);
fieldsMap.put("type", adapter.type); fieldsMap.put("type", adapter.type);
log.trace("getVioStoragePhysicalAdapters() - fields: " + fieldsMap); log.trace("getVioStoragePhysicalAdapters() - fields: " + fieldsMap);
list.add(new Measurement(getTimestamp(sample), tagsMap, fieldsMap)); list.add(new Measurement(getTimestamp(sample), tagsMap, fieldsMap));
});
}); });
} catch (Exception e) { });
log.warn("getVioStoragePhysicalAdapters() - error: {}", e.getMessage());
}
return list; return list;
} }
// VIO Storage - Virtual // VIO Storage - Virtual
List<Measurement> getVioStorageVirtualAdapters(int sample) { List<Measurement> getVioStorageVirtualAdapters(int sample) throws NullPointerException {
List<Measurement> list = new ArrayList<>(); List<Measurement> list = new ArrayList<>();
try { metric.getSample(sample).viosUtil.forEach( (vio) -> {
metric.getSample(sample).viosUtil.forEach( (vio) -> { vio.storage.genericVirtualAdapters.forEach( (adapter) -> {
vio.storage.genericVirtualAdapters.forEach( (adapter) -> { HashMap<String, String> tagsMap = new HashMap<>();
HashMap<String, String> tagsMap = new HashMap<>(); HashMap<String, Object> fieldsMap = new HashMap<>();
HashMap<String, Object> fieldsMap = new HashMap<>();
tagsMap.put("servername", entry.getName()); tagsMap.put("servername", entry.getName());
tagsMap.put("viosname", vio.name); tagsMap.put("viosname", vio.name);
tagsMap.put("location", adapter.physicalLocation); tagsMap.put("location", adapter.physicalLocation);
tagsMap.put("id", adapter.id); tagsMap.put("id", adapter.id);
log.debug("getVioStorageVirtualAdapters() - tags: " + tagsMap); log.debug("getVioStorageVirtualAdapters() - tags: " + tagsMap);
fieldsMap.put("numOfReads", adapter.numOfReads); fieldsMap.put("numOfReads", adapter.numOfReads);
fieldsMap.put("numOfWrites", adapter.numOfWrites); fieldsMap.put("numOfWrites", adapter.numOfWrites);
fieldsMap.put("readBytes", adapter.readBytes); fieldsMap.put("readBytes", adapter.readBytes);
fieldsMap.put("writeBytes", adapter.writeBytes); fieldsMap.put("writeBytes", adapter.writeBytes);
fieldsMap.put("transmittedBytes", adapter.transmittedBytes); fieldsMap.put("transmittedBytes", adapter.transmittedBytes);
fieldsMap.put("type", adapter.type); fieldsMap.put("type", adapter.type);
log.debug("getVioStorageVirtualAdapters() - fields: " + fieldsMap); log.debug("getVioStorageVirtualAdapters() - fields: " + fieldsMap);
list.add(new Measurement(getTimestamp(sample), tagsMap, fieldsMap)); list.add(new Measurement(getTimestamp(sample), tagsMap, fieldsMap));
});
}); });
} catch (Exception e) { });
log.warn("getVioStorageVirtualAdapters() - error: {}", e.getMessage());
}
return list; return list;
} }
@ -824,7 +759,7 @@ class ManagedSystem extends Resource {
/* /*
// VIO Storage SSP TODO // VIO Storage SSP TODO
List<Measurement> getViosStorageSharedStoragePools(int sample) { List<Measurement> getViosStorageSharedStoragePools(int sample) throws NullPointerException {
List<Measurement> list = new ArrayList<>(); List<Measurement> list = new ArrayList<>();
metrics.systemUtil.getSample(sample).viosUtil.forEach( vios -> { metrics.systemUtil.getSample(sample).viosUtil.forEach( vios -> {

34
src/main/java/biz/nellemann/hmci/Resource.java
View file

@ -21,9 +21,9 @@ public abstract class Resource {
private final ArrayList<String> sampleHistory = new ArrayList<>(); private final ArrayList<String> sampleHistory = new ArrayList<>();
protected SystemUtil metric; protected SystemUtil metric;
protected final int maxNumberOfSamples = 120; protected final int maxNumberOfSamples = 60;
protected final int minNumberOfSamples = 5; protected final int minNumberOfSamples = 5;
protected int currentNumberOfSamples = 15; protected int noOfSamples = maxNumberOfSamples;
@ -97,9 +97,10 @@ public abstract class Resource {
return; return;
} }
int samples = metric.samples.size(); int processed = 0;
//log.info("process() - Samples to process: {}, Samples in History: {}, Current Counter: {}", samples, sampleHistory.size(), currentNumberOfSamples); int sampleSize = metric.samples.size();
for(int i = 0; i<samples; i++) { log.debug("process() - Samples Returned: {}, Samples in History: {}, Fetch Next Counter: {}", sampleSize, sampleHistory.size(), noOfSamples);
for(int i = 0; i<sampleSize; i++) {
UtilSample sample = metric.getSample(i); UtilSample sample = metric.getSample(i);
String timestamp = sample.getInfo().timestamp; String timestamp = sample.getInfo().timestamp;
@ -108,27 +109,28 @@ public abstract class Resource {
continue; // Already processed continue; // Already processed
} }
// Process try {
//log.info("process() - Sample: {}", timestamp); process(i);
process(i); processed++;
sampleHistory.add(timestamp); // Add to processed history
// Add to end of history } catch (NullPointerException e) {
sampleHistory.add(timestamp); log.warn("process() - error: {}", e.getMessage());
}
} }
// Remove old elements from history // Remove old elements from history
for(int n = currentNumberOfSamples; n < sampleHistory.size(); n++) { for(int n = noOfSamples; n < sampleHistory.size(); n++) {
//log.info("process() - Removing element no. {} from sampleHistory: {}", n, sampleHistory.get(0)); //log.info("process() - Removing element no. {} from sampleHistory: {}", n, sampleHistory.get(0));
sampleHistory.remove(0); sampleHistory.remove(0);
} }
// Slowly decrease until we reach minSamples // Decrease until we reach minSamples
if(currentNumberOfSamples > minNumberOfSamples) { if(noOfSamples > minNumberOfSamples) {
currentNumberOfSamples--; noOfSamples = Math.min( (noOfSamples - 1), Math.max( (noOfSamples - processed), minNumberOfSamples));
} }
} }
public abstract void process(int sample); public abstract void process(int sample) throws NullPointerException;
} }

2
src/main/java/biz/nellemann/hmci/SystemEnergy.java
View file

@ -34,7 +34,7 @@ class SystemEnergy extends Resource {
log.debug("refresh()"); log.debug("refresh()");
try { try {
String xml = restClient.getRequest(String.format("/rest/api/pcm/ManagedSystem/%s/ProcessedMetrics?Type=Energy&NoOfSamples=%d", managedSystem.id, currentNumberOfSamples)); String xml = restClient.getRequest(String.format("/rest/api/pcm/ManagedSystem/%s/ProcessedMetrics?Type=Energy&NoOfSamples=%d", managedSystem.id, noOfSamples));
// Do not try to parse empty response // Do not try to parse empty response
if(xml == null || xml.length() <= 1) { if(xml == null || xml.length() <= 1) {

2
src/main/java/biz/nellemann/hmci/dto/toml/HmcConfiguration.java
View file

@ -13,7 +13,7 @@ public class HmcConfiguration {
public String username; public String username;
public String password; public String password;
public Integer refresh = 60; public Integer refresh = 30;
public Integer discover = 120; public Integer discover = 120;
public String trace; public String trace;