From ea6e163670242c65e20e40aad8291e00ae5d7f65 Mon Sep 17 00:00:00 2001
From: Mark Nellemann <mark.nellemann@gmail.com>
Date: Fri, 26 Mar 2021 13:26:03 +0100
Subject: [PATCH] Corrections of influx series names.

---
 src/main/java/biz/nellemann/hmci/InfluxClient.java  | 13 +++++++------
 .../java/biz/nellemann/hmci/LogicalPartition.java   |  4 +++-
 src/main/java/biz/nellemann/hmci/ManagedSystem.java |  5 +++--
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/main/java/biz/nellemann/hmci/InfluxClient.java b/src/main/java/biz/nellemann/hmci/InfluxClient.java
index 61fe8c9..ad32b16 100644
--- a/src/main/java/biz/nellemann/hmci/InfluxClient.java
+++ b/src/main/java/biz/nellemann/hmci/InfluxClient.java
@@ -228,11 +228,10 @@ class InfluxClient {
         return processMeasurementMap(metrics, timestamp, "vios_storage_FC");
     }
 
-    /*
     private static List<Point> getSystemViosSharedStoragePools(ManagedSystem system, Instant timestamp) {
         List<Measurement> metrics = system.getViosStorageSharedStoragePools();
         return processMeasurementMap(metrics, timestamp, "vios_storage_SSP");
-    }*/
+    }
 
     private static List<Point> getSystemViosStoragePhysicalAdapters(ManagedSystem system, Instant timestamp) {
         List<Measurement> metrics = system.getViosStoragePhysicalAdapters();
@@ -241,7 +240,7 @@ class InfluxClient {
 
     private static List<Point> getSystemViosStorageVirtualAdapters(ManagedSystem system, Instant timestamp) {
         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) {
         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) {
         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) {
         List<Measurement> metrics = partition.getVirtualFibreChannelAdapterMetrics();
-        return processMeasurementMap(metrics, timestamp, "lpar_storage_virtual");
+        return processMeasurementMap(metrics, timestamp, "lpar_storage_vFC");
     }
 
 
diff --git a/src/main/java/biz/nellemann/hmci/LogicalPartition.java b/src/main/java/biz/nellemann/hmci/LogicalPartition.java
index 8fb1bcc..4bcc2fb 100644
--- a/src/main/java/biz/nellemann/hmci/LogicalPartition.java
+++ b/src/main/java/biz/nellemann/hmci/LogicalPartition.java
@@ -208,7 +208,9 @@ class LogicalPartition extends MetaSystem {
             fieldsMap.put("numOfWrites", adapter.numOfWrites);
             fieldsMap.put("writeBytes", adapter.writeBytes);
             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("wwpn2", adapter.wwpn2);
             log.trace("getVirtualFibreChannelAdapterMetrics() - fields: " + fieldsMap.toString());
diff --git a/src/main/java/biz/nellemann/hmci/ManagedSystem.java b/src/main/java/biz/nellemann/hmci/ManagedSystem.java
index 5a0d05a..da61972 100644
--- a/src/main/java/biz/nellemann/hmci/ManagedSystem.java
+++ b/src/main/java/biz/nellemann/hmci/ManagedSystem.java
@@ -450,8 +450,8 @@ class ManagedSystem extends MetaSystem {
     List<Measurement> getViosStorageSharedStoragePools() {
 
         List<Measurement> list = new ArrayList<>();
+/*
         metrics.systemUtil.sample.viosUtil.forEach( vios -> {
-            log.trace("getViosStorageSharedStoragePools() - VIOS: " + vios.name);
 
             vios.storage.fiberChannelAdapters.forEach( adapter -> {
 
@@ -474,8 +474,9 @@ class ManagedSystem extends MetaSystem {
                 list.add(new Measurement(tagsMap, fieldsMap));
             });
 
+            log.trace("getViosStorageSharedStoragePools() - VIOS: " + vios.name);
         });
-
+*/
         return list;
     }