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

Corrections of influx series names.

Browse source
This commit is contained in:
Mark Nellemann 2021-03-26 13:26:03 +01:00
parent 2157ee477b
commit ea6e163670
3 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -228,11 +228,10 @@ class InfluxClient {
return processMeasurementMap(metrics, timestamp, "vios_storage_FC"); return processMeasurementMap(metrics, timestamp, "vios_storage_FC");
} }
/*
private static List<Point> getSystemViosSharedStoragePools(ManagedSystem system, Instant timestamp) { private static List<Point> getSystemViosSharedStoragePools(ManagedSystem system, Instant timestamp) {
List<Measurement> metrics = system.getViosStorageSharedStoragePools(); List<Measurement> metrics = system.getViosStorageSharedStoragePools();
return processMeasurementMap(metrics, timestamp, "vios_storage_SSP"); return processMeasurementMap(metrics, timestamp, "vios_storage_SSP");
}*/ }
private static List<Point> getSystemViosStoragePhysicalAdapters(ManagedSystem system, Instant timestamp) { private static List<Point> getSystemViosStoragePhysicalAdapters(ManagedSystem system, Instant timestamp) {
List<Measurement> metrics = system.getViosStoragePhysicalAdapters(); List<Measurement> metrics = system.getViosStoragePhysicalAdapters();
@ -241,7 +240,7 @@ class InfluxClient {
private static List<Point> getSystemViosStorageVirtualAdapters(ManagedSystem system, Instant timestamp) { private static List<Point> getSystemViosStorageVirtualAdapters(ManagedSystem system, Instant timestamp) {
List<Measurement> metrics = system.getViosStorageVirtualAdapters(); List<Measurement> metrics = system.getViosStorageVirtualAdapters();
return processMeasurementMap(metrics, timestamp, "vios_storage_virtual"); return processMeasurementMap(metrics, timestamp, "vios_storage_vFC");
} }
@ -290,17 +289,19 @@ class InfluxClient {
private static List<Point> getPartitionNetworkVirtual(LogicalPartition partition, Instant timestamp) { private static List<Point> getPartitionNetworkVirtual(LogicalPartition partition, Instant timestamp) {
List<Measurement> metrics = partition.getVirtualEthernetAdapterMetrics(); List<Measurement> metrics = partition.getVirtualEthernetAdapterMetrics();
return processMeasurementMap(metrics, timestamp, "lpar_network_virtual"); return processMeasurementMap(metrics, timestamp, "lpar_net_virtual"); // Not 'network'
} }
// TODO: lpar_net_sriov
private static List<Point> getPartitionStorageVirtualGeneric(LogicalPartition partition, Instant timestamp) { private static List<Point> getPartitionStorageVirtualGeneric(LogicalPartition partition, Instant timestamp) {
List<Measurement> metrics = partition.getVirtualGenericAdapterMetrics(); List<Measurement> metrics = partition.getVirtualGenericAdapterMetrics();
return processMeasurementMap(metrics, timestamp, "lpar_storage_generic"); return processMeasurementMap(metrics, timestamp, "lpar_storage_virtual");
} }
private static List<Point> getPartitionStorageVirtualFibreChannel(LogicalPartition partition, Instant timestamp) { private static List<Point> getPartitionStorageVirtualFibreChannel(LogicalPartition partition, Instant timestamp) {
List<Measurement> metrics = partition.getVirtualFibreChannelAdapterMetrics(); List<Measurement> metrics = partition.getVirtualFibreChannelAdapterMetrics();
return processMeasurementMap(metrics, timestamp, "lpar_storage_virtual"); return processMeasurementMap(metrics, timestamp, "lpar_storage_vFC");
} }

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

@ -208,7 +208,9 @@ class LogicalPartition extends MetaSystem {
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("transmittedBytes", adapter.transmittedBytes); fieldsMap.put("runningSpeed", adapter.runningSpeed);
fieldsMap.put("transmittedBytes", adapter.transmittedBytes);
fieldsMap.put("transferredByte", adapter.transmittedBytes); // TODO: Must be error in dashboard, remove when checked.
//fieldsMap.put("wwpn", adapter.wwpn); //fieldsMap.put("wwpn", adapter.wwpn);
//fieldsMap.put("wwpn2", adapter.wwpn2); //fieldsMap.put("wwpn2", adapter.wwpn2);
log.trace("getVirtualFibreChannelAdapterMetrics() - fields: " + fieldsMap.toString()); log.trace("getVirtualFibreChannelAdapterMetrics() - fields: " + fieldsMap.toString());

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

@ -450,8 +450,8 @@ class ManagedSystem extends MetaSystem {
List<Measurement> getViosStorageSharedStoragePools() { List<Measurement> getViosStorageSharedStoragePools() {
List<Measurement> list = new ArrayList<>(); List<Measurement> list = new ArrayList<>();
/*
metrics.systemUtil.sample.viosUtil.forEach( vios -> { metrics.systemUtil.sample.viosUtil.forEach( vios -> {
log.trace("getViosStorageSharedStoragePools() - VIOS: " + vios.name);
vios.storage.fiberChannelAdapters.forEach( adapter -> { vios.storage.fiberChannelAdapters.forEach( adapter -> {
@ -474,8 +474,9 @@ class ManagedSystem extends MetaSystem {
list.add(new Measurement(tagsMap, fieldsMap)); list.add(new Measurement(tagsMap, fieldsMap));
}); });
log.trace("getViosStorageSharedStoragePools() - VIOS: " + vios.name);
}); });
*/
return list; return list;
} }