Fix error in sriov type being null.
This commit is contained in:
parent
985b9100c3
commit
5952a21714
|
@ -2,11 +2,14 @@
|
||||||
|
|
||||||
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-15
|
## [1.4.2] - 2023-01-05
|
||||||
|
- Fix error in sriov type being null.
|
||||||
|
|
||||||
|
## [1.4.1] - 2022-12-15
|
||||||
- Retrieve multiple PCM samples and keep track of processing.
|
- Retrieve multiple PCM samples and keep track of processing.
|
||||||
- Rename VIOS metric 'vFC' (storage adapter) to 'virtual'.
|
- Rename VIOS metric 'vFC' (storage adapter) to 'virtual'.
|
||||||
|
|
||||||
## [1.4.0] - 2011-12-01
|
## [1.4.0] - 2022-12-01
|
||||||
- Rewrite of toml+xml+json de-serialization code (uses jackson now).
|
- Rewrite of toml+xml+json de-serialization code (uses jackson now).
|
||||||
- Changes to configuration file format - please look at [doc/hmci.toml](doc/hmci.toml) as example.
|
- Changes to configuration file format - please look at [doc/hmci.toml](doc/hmci.toml) as example.
|
||||||
- Logging (write to file) JSON output from HMC is currently not possible.
|
- Logging (write to file) JSON output from HMC is currently not possible.
|
||||||
|
@ -28,6 +31,7 @@ All notable changes to this project will be documented in this file.
|
||||||
## [1.2.7] - 2022-02-24
|
## [1.2.7] - 2022-02-24
|
||||||
- Options to include/exclude Managed Systems and/or Logical Partitions.
|
- Options to include/exclude Managed Systems and/or Logical Partitions.
|
||||||
|
|
||||||
|
[1.4.2]: https://bitbucket.org/mnellemann/hmci/branches/compare/v1.4.2%0Dv1.4.1
|
||||||
[1.4.1]: https://bitbucket.org/mnellemann/hmci/branches/compare/v1.4.1%0Dv1.4.0
|
[1.4.1]: https://bitbucket.org/mnellemann/hmci/branches/compare/v1.4.1%0Dv1.4.0
|
||||||
[1.4.0]: https://bitbucket.org/mnellemann/hmci/branches/compare/v1.4.0%0Dv1.3.3
|
[1.4.0]: https://bitbucket.org/mnellemann/hmci/branches/compare/v1.4.0%0Dv1.3.3
|
||||||
[1.3.3]: https://bitbucket.org/mnellemann/hmci/branches/compare/v1.3.3%0Dv1.3.0
|
[1.3.3]: https://bitbucket.org/mnellemann/hmci/branches/compare/v1.3.3%0Dv1.3.0
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
projectId = hmci
|
projectId = hmci
|
||||||
projectGroup = biz.nellemann.hmci
|
projectGroup = biz.nellemann.hmci
|
||||||
projectVersion = 1.4.1
|
projectVersion = 1.4.2
|
||||||
|
|
|
@ -107,7 +107,11 @@ public final class InfluxClient {
|
||||||
|
|
||||||
public void write(List<Measurement> measurements, String name) {
|
public void write(List<Measurement> measurements, String name) {
|
||||||
log.debug("write() - measurement: {} {}", name, measurements.size());
|
log.debug("write() - measurement: {} {}", name, measurements.size());
|
||||||
processMeasurementMap(measurements, name).forEach( (point) -> { influxDB.write(point); });
|
if(!measurements.isEmpty()) {
|
||||||
|
processMeasurementMap(measurements, name).forEach((point) -> {
|
||||||
|
influxDB.write(point);
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -151,6 +151,7 @@ class LogicalPartition extends Resource {
|
||||||
// LPAR Details
|
// LPAR Details
|
||||||
List<Measurement> getDetails(int sample) throws NullPointerException {
|
List<Measurement> getDetails(int sample) throws NullPointerException {
|
||||||
|
|
||||||
|
log.debug("getDetails()");
|
||||||
List<Measurement> list = new ArrayList<>();
|
List<Measurement> list = new ArrayList<>();
|
||||||
|
|
||||||
Map<String, String> tagsMap = new HashMap<>();
|
Map<String, String> tagsMap = new HashMap<>();
|
||||||
|
@ -175,7 +176,7 @@ class LogicalPartition extends Resource {
|
||||||
|
|
||||||
// LPAR Memory
|
// LPAR Memory
|
||||||
List<Measurement> getMemoryMetrics(int sample) throws NullPointerException {
|
List<Measurement> getMemoryMetrics(int sample) throws NullPointerException {
|
||||||
|
log.debug("getMemoryMetrics()");
|
||||||
List<Measurement> list = new ArrayList<>();
|
List<Measurement> list = new ArrayList<>();
|
||||||
|
|
||||||
Map<String, String> tagsMap = new HashMap<>();
|
Map<String, String> tagsMap = new HashMap<>();
|
||||||
|
@ -197,7 +198,7 @@ class LogicalPartition extends Resource {
|
||||||
|
|
||||||
// LPAR Processor
|
// LPAR Processor
|
||||||
List<Measurement> getProcessorMetrics(int sample) throws NullPointerException {
|
List<Measurement> getProcessorMetrics(int sample) throws NullPointerException {
|
||||||
|
log.debug("getProcessorMetrics()");
|
||||||
List<Measurement> list = new ArrayList<>();
|
List<Measurement> list = new ArrayList<>();
|
||||||
|
|
||||||
HashMap<String, String> tagsMap = new HashMap<>();
|
HashMap<String, String> tagsMap = new HashMap<>();
|
||||||
|
@ -231,7 +232,7 @@ class LogicalPartition extends Resource {
|
||||||
|
|
||||||
// LPAR Network - Virtual
|
// LPAR Network - Virtual
|
||||||
List<Measurement> getVirtualEthernetAdapterMetrics(int sample) throws NullPointerException {
|
List<Measurement> getVirtualEthernetAdapterMetrics(int sample) throws NullPointerException {
|
||||||
|
log.debug("getVirtualEthernetAdapterMetrics()");
|
||||||
List<Measurement> list = new ArrayList<>();
|
List<Measurement> list = new ArrayList<>();
|
||||||
|
|
||||||
metric.getSample(sample).lparsUtil.network.virtualEthernetAdapters.forEach(adapter -> {
|
metric.getSample(sample).lparsUtil.network.virtualEthernetAdapters.forEach(adapter -> {
|
||||||
|
@ -272,7 +273,7 @@ class LogicalPartition extends Resource {
|
||||||
|
|
||||||
// LPAR Storage - Virtual Generic
|
// LPAR Storage - Virtual Generic
|
||||||
List<Measurement> getVirtualGenericAdapterMetrics(int sample) throws NullPointerException {
|
List<Measurement> getVirtualGenericAdapterMetrics(int sample) throws NullPointerException {
|
||||||
|
log.debug("getVirtualGenericAdapterMetrics()");
|
||||||
List<Measurement> list = new ArrayList<>();
|
List<Measurement> list = new ArrayList<>();
|
||||||
|
|
||||||
metric.getSample(sample).lparsUtil.storage.genericVirtualAdapters.forEach(adapter -> {
|
metric.getSample(sample).lparsUtil.storage.genericVirtualAdapters.forEach(adapter -> {
|
||||||
|
@ -303,7 +304,7 @@ class LogicalPartition extends Resource {
|
||||||
|
|
||||||
// LPAR Storage - Virtual FC
|
// LPAR Storage - Virtual FC
|
||||||
List<Measurement> getVirtualFibreChannelAdapterMetrics(int sample) throws NullPointerException {
|
List<Measurement> getVirtualFibreChannelAdapterMetrics(int sample) throws NullPointerException {
|
||||||
|
log.debug("getVirtualFibreChannelAdapterMetrics()");
|
||||||
List<Measurement> list = new ArrayList<>();
|
List<Measurement> list = new ArrayList<>();
|
||||||
|
|
||||||
metric.getSample(sample).lparsUtil.storage.virtualFiberChannelAdapters.forEach(adapter -> {
|
metric.getSample(sample).lparsUtil.storage.virtualFiberChannelAdapters.forEach(adapter -> {
|
||||||
|
@ -334,7 +335,7 @@ class LogicalPartition extends Resource {
|
||||||
|
|
||||||
// LPAR Network - SR-IOV Logical Ports
|
// LPAR Network - SR-IOV Logical Ports
|
||||||
List<Measurement> getSriovLogicalPorts(int sample) throws NullPointerException {
|
List<Measurement> getSriovLogicalPorts(int sample) throws NullPointerException {
|
||||||
|
log.debug("getSriovLogicalPorts()");
|
||||||
List<Measurement> list = new ArrayList<>();
|
List<Measurement> list = new ArrayList<>();
|
||||||
|
|
||||||
metric.getSample(sample).lparsUtil.network.sriovLogicalPorts.forEach(port -> {
|
metric.getSample(sample).lparsUtil.network.sriovLogicalPorts.forEach(port -> {
|
||||||
|
@ -345,7 +346,6 @@ class LogicalPartition extends Resource {
|
||||||
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);
|
|
||||||
log.trace("getSriovLogicalPorts() - tags: " + tagsMap);
|
log.trace("getSriovLogicalPorts() - tags: " + tagsMap);
|
||||||
|
|
||||||
fieldsMap.put("sentBytes", port.sentBytes);
|
fieldsMap.put("sentBytes", port.sentBytes);
|
||||||
|
|
|
@ -291,7 +291,7 @@ class ManagedSystem extends Resource {
|
||||||
|
|
||||||
// System details
|
// System details
|
||||||
List<Measurement> getDetails(int sample) throws NullPointerException {
|
List<Measurement> getDetails(int sample) throws NullPointerException {
|
||||||
|
log.debug("getDetails()");
|
||||||
List<Measurement> list = new ArrayList<>();
|
List<Measurement> list = new ArrayList<>();
|
||||||
Map<String, String> tagsMap = new TreeMap<>();
|
Map<String, String> tagsMap = new TreeMap<>();
|
||||||
Map<String, Object> fieldsMap = new TreeMap<>();
|
Map<String, Object> fieldsMap = new TreeMap<>();
|
||||||
|
@ -321,7 +321,7 @@ class ManagedSystem extends Resource {
|
||||||
|
|
||||||
// System Memory
|
// System Memory
|
||||||
List<Measurement> getMemoryMetrics(int sample) throws NullPointerException {
|
List<Measurement> getMemoryMetrics(int sample) throws NullPointerException {
|
||||||
|
log.debug("getMemoryMetrics()");
|
||||||
List<Measurement> list = new ArrayList<>();
|
List<Measurement> list = new ArrayList<>();
|
||||||
HashMap<String, String> tagsMap = new HashMap<>();
|
HashMap<String, String> tagsMap = new HashMap<>();
|
||||||
Map<String, Object> fieldsMap = new HashMap<>();
|
Map<String, Object> fieldsMap = new HashMap<>();
|
||||||
|
@ -344,7 +344,7 @@ class ManagedSystem extends Resource {
|
||||||
|
|
||||||
// System Processor
|
// System Processor
|
||||||
List<Measurement> getProcessorMetrics(int sample) throws NullPointerException {
|
List<Measurement> getProcessorMetrics(int sample) throws NullPointerException {
|
||||||
|
log.debug("getProcessorMetrics()");
|
||||||
List<Measurement> list = new ArrayList<>();
|
List<Measurement> list = new ArrayList<>();
|
||||||
HashMap<String, String> tagsMap = new HashMap<>();
|
HashMap<String, String> tagsMap = new HashMap<>();
|
||||||
HashMap<String, Object> fieldsMap = new HashMap<>();
|
HashMap<String, Object> fieldsMap = new HashMap<>();
|
||||||
|
@ -365,7 +365,7 @@ class ManagedSystem extends Resource {
|
||||||
|
|
||||||
// Sytem Shared ProcessorPools
|
// Sytem Shared ProcessorPools
|
||||||
List<Measurement> getSharedProcessorPools(int sample) throws NullPointerException {
|
List<Measurement> getSharedProcessorPools(int sample) throws NullPointerException {
|
||||||
|
log.debug("getSharedProcessorPools()");
|
||||||
List<Measurement> list = new ArrayList<>();
|
List<Measurement> list = new ArrayList<>();
|
||||||
metric.getSample(sample).serverUtil.sharedProcessorPool.forEach(sharedProcessorPool -> {
|
metric.getSample(sample).serverUtil.sharedProcessorPool.forEach(sharedProcessorPool -> {
|
||||||
HashMap<String, String> tagsMap = new HashMap<>();
|
HashMap<String, String> tagsMap = new HashMap<>();
|
||||||
|
@ -392,7 +392,7 @@ class ManagedSystem extends Resource {
|
||||||
|
|
||||||
// System Physical ProcessorPool
|
// System Physical ProcessorPool
|
||||||
List<Measurement> getPhysicalProcessorPool(int sample) throws NullPointerException {
|
List<Measurement> getPhysicalProcessorPool(int sample) throws NullPointerException {
|
||||||
|
log.debug("getPhysicalProcessorPool()");
|
||||||
List<Measurement> list = new ArrayList<>();
|
List<Measurement> list = new ArrayList<>();
|
||||||
HashMap<String, String> tagsMap = new HashMap<>();
|
HashMap<String, String> tagsMap = new HashMap<>();
|
||||||
HashMap<String, Object> fieldsMap = new HashMap<>();
|
HashMap<String, Object> fieldsMap = new HashMap<>();
|
||||||
|
@ -420,7 +420,7 @@ class ManagedSystem extends Resource {
|
||||||
|
|
||||||
// VIO Details
|
// VIO Details
|
||||||
List<Measurement> getVioDetails(int sample) throws NullPointerException {
|
List<Measurement> getVioDetails(int sample) throws NullPointerException {
|
||||||
|
log.debug("getVioDetails()");
|
||||||
List<Measurement> list = new ArrayList<>();
|
List<Measurement> list = new ArrayList<>();
|
||||||
metric.getSample(sample).viosUtil.forEach(vio -> {
|
metric.getSample(sample).viosUtil.forEach(vio -> {
|
||||||
|
|
||||||
|
@ -446,7 +446,7 @@ class ManagedSystem extends Resource {
|
||||||
|
|
||||||
// VIO Memory
|
// VIO Memory
|
||||||
List<Measurement> getVioMemoryMetrics(int sample) throws NullPointerException {
|
List<Measurement> getVioMemoryMetrics(int sample) throws NullPointerException {
|
||||||
|
log.debug("getVioMemoryMetrics()");
|
||||||
List<Measurement> list = new ArrayList<>();
|
List<Measurement> list = new ArrayList<>();
|
||||||
metric.getSample(sample).viosUtil.forEach(vio -> {
|
metric.getSample(sample).viosUtil.forEach(vio -> {
|
||||||
|
|
||||||
|
@ -474,7 +474,7 @@ class ManagedSystem extends Resource {
|
||||||
|
|
||||||
// VIO Processor
|
// VIO Processor
|
||||||
List<Measurement> getVioProcessorMetrics(int sample) throws NullPointerException {
|
List<Measurement> getVioProcessorMetrics(int sample) throws NullPointerException {
|
||||||
|
log.debug("getVioProcessorMetrics()");
|
||||||
List<Measurement> list = new ArrayList<>();
|
List<Measurement> list = new ArrayList<>();
|
||||||
metric.getSample(sample).viosUtil.forEach(vio -> {
|
metric.getSample(sample).viosUtil.forEach(vio -> {
|
||||||
|
|
||||||
|
@ -509,7 +509,7 @@ class ManagedSystem extends Resource {
|
||||||
|
|
||||||
// VIOs - Network
|
// VIOs - Network
|
||||||
List<Measurement> getVioNetworkLpars(int sample) throws NullPointerException {
|
List<Measurement> getVioNetworkLpars(int sample) throws NullPointerException {
|
||||||
|
log.debug("getVioNetworkLpars()");
|
||||||
List<Measurement> list = new ArrayList<>();
|
List<Measurement> list = new ArrayList<>();
|
||||||
metric.getSample(sample).viosUtil.forEach(vio -> {
|
metric.getSample(sample).viosUtil.forEach(vio -> {
|
||||||
|
|
||||||
|
@ -532,7 +532,7 @@ class ManagedSystem extends Resource {
|
||||||
|
|
||||||
// VIO Network - Shared
|
// VIO Network - Shared
|
||||||
List<Measurement> getVioNetworkSharedAdapters(int sample) throws NullPointerException {
|
List<Measurement> getVioNetworkSharedAdapters(int sample) throws NullPointerException {
|
||||||
|
log.debug("getVioNetworkSharedAdapters()");
|
||||||
List<Measurement> list = new ArrayList<>();
|
List<Measurement> list = new ArrayList<>();
|
||||||
metric.getSample(sample).viosUtil.forEach(vio -> {
|
metric.getSample(sample).viosUtil.forEach(vio -> {
|
||||||
vio.network.sharedAdapters.forEach(adapter -> {
|
vio.network.sharedAdapters.forEach(adapter -> {
|
||||||
|
@ -565,7 +565,7 @@ class ManagedSystem extends Resource {
|
||||||
|
|
||||||
// VIO Network - Virtual
|
// VIO Network - Virtual
|
||||||
List<Measurement> getVioNetworkVirtualAdapters(int sample) throws NullPointerException {
|
List<Measurement> getVioNetworkVirtualAdapters(int sample) throws NullPointerException {
|
||||||
|
log.debug("getVioNetworkVirtualAdapters()");
|
||||||
List<Measurement> list = new ArrayList<>();
|
List<Measurement> list = new ArrayList<>();
|
||||||
metric.getSample(sample).viosUtil.forEach( vio -> {
|
metric.getSample(sample).viosUtil.forEach( vio -> {
|
||||||
vio.network.virtualEthernetAdapters.forEach( adapter -> {
|
vio.network.virtualEthernetAdapters.forEach( adapter -> {
|
||||||
|
@ -605,7 +605,7 @@ class ManagedSystem extends Resource {
|
||||||
|
|
||||||
// VIO Network - Generic
|
// VIO Network - Generic
|
||||||
List<Measurement> getVioNetworkGenericAdapters(int sample) throws NullPointerException {
|
List<Measurement> getVioNetworkGenericAdapters(int sample) throws NullPointerException {
|
||||||
|
log.debug("getVioNetworkGenericAdapters()");
|
||||||
List<Measurement> list = new ArrayList<>();
|
List<Measurement> list = new ArrayList<>();
|
||||||
metric.getSample(sample).viosUtil.forEach( vio -> {
|
metric.getSample(sample).viosUtil.forEach( vio -> {
|
||||||
vio.network.genericAdapters.forEach( adapter -> {
|
vio.network.genericAdapters.forEach( adapter -> {
|
||||||
|
@ -637,7 +637,7 @@ class ManagedSystem extends Resource {
|
||||||
|
|
||||||
// VIOs - Storage
|
// VIOs - Storage
|
||||||
List<Measurement> getVioStorageLpars(int sample) throws NullPointerException {
|
List<Measurement> getVioStorageLpars(int sample) throws NullPointerException {
|
||||||
|
log.debug("getVioStorageLpars()");
|
||||||
List<Measurement> list = new ArrayList<>();
|
List<Measurement> list = new ArrayList<>();
|
||||||
metric.getSample(sample).viosUtil.forEach(vio -> {
|
metric.getSample(sample).viosUtil.forEach(vio -> {
|
||||||
|
|
||||||
|
@ -660,7 +660,7 @@ class ManagedSystem extends Resource {
|
||||||
|
|
||||||
// VIO Storage FC
|
// VIO Storage FC
|
||||||
List<Measurement> getVioStorageFiberChannelAdapters(int sample) throws NullPointerException {
|
List<Measurement> getVioStorageFiberChannelAdapters(int sample) throws NullPointerException {
|
||||||
|
log.debug("getVioStorageFiberChannelAdapters()");
|
||||||
List<Measurement> list = new ArrayList<>();
|
List<Measurement> list = new ArrayList<>();
|
||||||
metric.getSample(sample).viosUtil.forEach( vio -> {
|
metric.getSample(sample).viosUtil.forEach( vio -> {
|
||||||
log.trace("getVioStorageFiberChannelAdapters() - VIO: " + vio.name);
|
log.trace("getVioStorageFiberChannelAdapters() - VIO: " + vio.name);
|
||||||
|
@ -694,8 +694,9 @@ class ManagedSystem extends Resource {
|
||||||
|
|
||||||
// VIO Storage - Physical
|
// VIO Storage - Physical
|
||||||
List<Measurement> getVioStoragePhysicalAdapters(int sample) throws NullPointerException {
|
List<Measurement> getVioStoragePhysicalAdapters(int sample) throws NullPointerException {
|
||||||
|
log.debug("getVioStoragePhysicalAdapters()");
|
||||||
List<Measurement> list = new ArrayList<>();
|
List<Measurement> list = new ArrayList<>();
|
||||||
|
|
||||||
metric.getSample(sample).viosUtil.forEach( vio -> {
|
metric.getSample(sample).viosUtil.forEach( vio -> {
|
||||||
log.trace("getVioStoragePhysicalAdapters() - VIO: " + vio.name);
|
log.trace("getVioStoragePhysicalAdapters() - VIO: " + vio.name);
|
||||||
|
|
||||||
|
@ -728,7 +729,7 @@ class ManagedSystem extends Resource {
|
||||||
|
|
||||||
// VIO Storage - Virtual
|
// VIO Storage - Virtual
|
||||||
List<Measurement> getVioStorageVirtualAdapters(int sample) throws NullPointerException {
|
List<Measurement> getVioStorageVirtualAdapters(int sample) throws NullPointerException {
|
||||||
|
log.debug("getVioStorageVirtualAdapters()");
|
||||||
List<Measurement> list = new ArrayList<>();
|
List<Measurement> list = new ArrayList<>();
|
||||||
metric.getSample(sample).viosUtil.forEach( (vio) -> {
|
metric.getSample(sample).viosUtil.forEach( (vio) -> {
|
||||||
vio.storage.genericVirtualAdapters.forEach( (adapter) -> {
|
vio.storage.genericVirtualAdapters.forEach( (adapter) -> {
|
||||||
|
|
|
@ -114,7 +114,7 @@ public abstract class Resource {
|
||||||
processed++;
|
processed++;
|
||||||
sampleHistory.add(timestamp); // Add to processed history
|
sampleHistory.add(timestamp); // Add to processed history
|
||||||
} catch (NullPointerException e) {
|
} catch (NullPointerException e) {
|
||||||
log.warn("process() - error: {}", e.getMessage());
|
log.warn("process() - error", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,8 @@
|
||||||
package biz.nellemann.hmci.dto.json;
|
package biz.nellemann.hmci.dto.json;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
|
|
||||||
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public final class EnergyUtil {
|
public final class EnergyUtil {
|
||||||
|
|
||||||
public PowerUtil powerUtil = new PowerUtil();
|
public PowerUtil powerUtil = new PowerUtil();
|
||||||
|
|
|
@ -1,10 +1,13 @@
|
||||||
package biz.nellemann.hmci.dto.json;
|
package biz.nellemann.hmci.dto.json;
|
||||||
|
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Storage adapter
|
* Storage adapter
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public final class FiberChannelAdapter {
|
public final class FiberChannelAdapter {
|
||||||
|
|
||||||
public String id;
|
public String id;
|
||||||
|
|
|
@ -1,6 +1,9 @@
|
||||||
package biz.nellemann.hmci.dto.json;
|
package biz.nellemann.hmci.dto.json;
|
||||||
|
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
|
|
||||||
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public final class GenericAdapter {
|
public final class GenericAdapter {
|
||||||
|
|
||||||
public String id;
|
public String id;
|
||||||
|
|
|
@ -1,10 +1,13 @@
|
||||||
package biz.nellemann.hmci.dto.json;
|
package biz.nellemann.hmci.dto.json;
|
||||||
|
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
|
|
||||||
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public final class GenericPhysicalAdapters {
|
public final class GenericPhysicalAdapters {
|
||||||
|
|
||||||
public String id;
|
public String id;
|
||||||
public String type;
|
public String type = "";
|
||||||
public String physicalLocation;
|
public String physicalLocation;
|
||||||
public double numOfReads;
|
public double numOfReads;
|
||||||
public double numOfWrites;
|
public double numOfWrites;
|
||||||
|
|
|
@ -1,12 +1,13 @@
|
||||||
package biz.nellemann.hmci.dto.json;
|
package biz.nellemann.hmci.dto.json;
|
||||||
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Storage adapter
|
* Storage adapter
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public final class GenericVirtualAdapter {
|
public final class GenericVirtualAdapter {
|
||||||
|
|
||||||
public String id = "";
|
public String id = "";
|
||||||
|
|
|
@ -1,6 +1,9 @@
|
||||||
package biz.nellemann.hmci.dto.json;
|
package biz.nellemann.hmci.dto.json;
|
||||||
|
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
|
|
||||||
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public final class LparProcessor {
|
public final class LparProcessor {
|
||||||
|
|
||||||
public Integer poolId = 0;
|
public Integer poolId = 0;
|
||||||
|
|
|
@ -1,9 +1,12 @@
|
||||||
package biz.nellemann.hmci.dto.json;
|
package biz.nellemann.hmci.dto.json;
|
||||||
|
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public final class Network {
|
public final class Network {
|
||||||
|
|
||||||
public List<String> clientLpars = new ArrayList<>();
|
public List<String> clientLpars = new ArrayList<>();
|
||||||
|
|
|
@ -1,6 +1,9 @@
|
||||||
package biz.nellemann.hmci.dto.json;
|
package biz.nellemann.hmci.dto.json;
|
||||||
|
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
|
|
||||||
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public final class PhysicalProcessorPool {
|
public final class PhysicalProcessorPool {
|
||||||
|
|
||||||
public double assignedProcUnits = 0.0;
|
public double assignedProcUnits = 0.0;
|
||||||
|
|
|
@ -1,5 +1,8 @@
|
||||||
package biz.nellemann.hmci.dto.json;
|
package biz.nellemann.hmci.dto.json;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
|
|
||||||
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public final class PowerUtil {
|
public final class PowerUtil {
|
||||||
|
|
||||||
public Number powerReading = 0.0;
|
public Number powerReading = 0.0;
|
||||||
|
|
|
@ -1,5 +1,8 @@
|
||||||
package biz.nellemann.hmci.dto.json;
|
package biz.nellemann.hmci.dto.json;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
|
|
||||||
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public class ProcessedMetrics {
|
public class ProcessedMetrics {
|
||||||
|
|
||||||
public SystemUtil systemUtil;
|
public SystemUtil systemUtil;
|
||||||
|
|
|
@ -1,7 +1,10 @@
|
||||||
package biz.nellemann.hmci.dto.json;
|
package biz.nellemann.hmci.dto.json;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public final class SRIOVAdapter {
|
public final class SRIOVAdapter {
|
||||||
|
|
||||||
public String drcIndex = "";
|
public String drcIndex = "";
|
||||||
|
|
|
@ -1,5 +1,8 @@
|
||||||
package biz.nellemann.hmci.dto.json;
|
package biz.nellemann.hmci.dto.json;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
|
|
||||||
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public class SRIOVLogicalPort {
|
public class SRIOVLogicalPort {
|
||||||
|
|
||||||
public String drcIndex;
|
public String drcIndex;
|
||||||
|
|
|
@ -1,5 +1,8 @@
|
||||||
package biz.nellemann.hmci.dto.json;
|
package biz.nellemann.hmci.dto.json;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
|
|
||||||
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public final class SRIOVPhysicalPort {
|
public final class SRIOVPhysicalPort {
|
||||||
|
|
||||||
public String id;
|
public String id;
|
||||||
|
|
|
@ -1,10 +1,12 @@
|
||||||
package biz.nellemann.hmci.dto.json;
|
package biz.nellemann.hmci.dto.json;
|
||||||
|
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public final class SampleInfo {
|
public final class SampleInfo {
|
||||||
|
|
||||||
@JsonProperty("timeStamp")
|
@JsonProperty("timeStamp")
|
||||||
|
|
|
@ -1,5 +1,8 @@
|
||||||
package biz.nellemann.hmci.dto.json;
|
package biz.nellemann.hmci.dto.json;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
|
|
||||||
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public final class ServerMemory {
|
public final class ServerMemory {
|
||||||
|
|
||||||
public double totalMem = 0.0;
|
public double totalMem = 0.0;
|
||||||
|
|
|
@ -1,5 +1,8 @@
|
||||||
package biz.nellemann.hmci.dto.json;
|
package biz.nellemann.hmci.dto.json;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
|
|
||||||
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public final class ServerProcessor {
|
public final class ServerProcessor {
|
||||||
|
|
||||||
public Double totalProcUnits = 0.0;
|
public Double totalProcUnits = 0.0;
|
||||||
|
|
|
@ -1,9 +1,12 @@
|
||||||
package biz.nellemann.hmci.dto.json;
|
package biz.nellemann.hmci.dto.json;
|
||||||
|
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public final class ServerUtil {
|
public final class ServerUtil {
|
||||||
|
|
||||||
public final ServerProcessor processor = new ServerProcessor();
|
public final ServerProcessor processor = new ServerProcessor();
|
||||||
|
|
|
@ -1,12 +1,15 @@
|
||||||
package biz.nellemann.hmci.dto.json;
|
package biz.nellemann.hmci.dto.json;
|
||||||
|
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Network adapter
|
* Network adapter
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public final class SharedAdapter {
|
public final class SharedAdapter {
|
||||||
|
|
||||||
public String id;
|
public String id;
|
||||||
|
|
|
@ -1,6 +1,9 @@
|
||||||
package biz.nellemann.hmci.dto.json;
|
package biz.nellemann.hmci.dto.json;
|
||||||
|
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
|
|
||||||
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public final class SharedProcessorPool {
|
public final class SharedProcessorPool {
|
||||||
|
|
||||||
public int id;
|
public int id;
|
||||||
|
|
|
@ -1,9 +1,12 @@
|
||||||
package biz.nellemann.hmci.dto.json;
|
package biz.nellemann.hmci.dto.json;
|
||||||
|
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public final class Storage {
|
public final class Storage {
|
||||||
|
|
||||||
public List<String> clientLpars = new ArrayList<>();
|
public List<String> clientLpars = new ArrayList<>();
|
||||||
|
|
|
@ -1,9 +1,11 @@
|
||||||
package biz.nellemann.hmci.dto.json;
|
package biz.nellemann.hmci.dto.json;
|
||||||
|
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
import com.fasterxml.jackson.annotation.JsonUnwrapped;
|
import com.fasterxml.jackson.annotation.JsonUnwrapped;
|
||||||
|
|
||||||
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public final class SystemFirmware {
|
public final class SystemFirmware {
|
||||||
|
|
||||||
@JsonUnwrapped
|
@JsonUnwrapped
|
||||||
|
|
|
@ -1,9 +1,11 @@
|
||||||
package biz.nellemann.hmci.dto.json;
|
package biz.nellemann.hmci.dto.json;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
import com.fasterxml.jackson.annotation.JsonUnwrapped;
|
import com.fasterxml.jackson.annotation.JsonUnwrapped;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public final class SystemUtil {
|
public final class SystemUtil {
|
||||||
|
|
||||||
@JsonProperty("utilInfo")
|
@JsonProperty("utilInfo")
|
||||||
|
|
|
@ -1,5 +1,8 @@
|
||||||
package biz.nellemann.hmci.dto.json;
|
package biz.nellemann.hmci.dto.json;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
|
|
||||||
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public final class Temperature {
|
public final class Temperature {
|
||||||
|
|
||||||
public String entityId = "";
|
public String entityId = "";
|
||||||
|
|
|
@ -1,8 +1,11 @@
|
||||||
package biz.nellemann.hmci.dto.json;
|
package biz.nellemann.hmci.dto.json;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public final class ThermalUtil {
|
public final class ThermalUtil {
|
||||||
|
|
||||||
public List<Temperature> inletTemperatures = new ArrayList<>();
|
public List<Temperature> inletTemperatures = new ArrayList<>();
|
||||||
|
|
|
@ -2,7 +2,7 @@ package biz.nellemann.hmci.dto.json;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
|
|
||||||
@JsonIgnoreProperties({ "metricArrayOrder" })
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public final class UtilInfo {
|
public final class UtilInfo {
|
||||||
|
|
||||||
public String version = "";
|
public String version = "";
|
||||||
|
|
|
@ -1,12 +1,13 @@
|
||||||
package biz.nellemann.hmci.dto.json;
|
package biz.nellemann.hmci.dto.json;
|
||||||
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonAlias;
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public final class UtilSample {
|
public final class UtilSample {
|
||||||
|
|
||||||
public String sampleType = "";
|
public String sampleType = "";
|
||||||
|
|
|
@ -1,5 +1,8 @@
|
||||||
package biz.nellemann.hmci.dto.json;
|
package biz.nellemann.hmci.dto.json;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
|
|
||||||
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public final class ViosMemory {
|
public final class ViosMemory {
|
||||||
public double assignedMem;
|
public double assignedMem;
|
||||||
public double utilizedMem;
|
public double utilizedMem;
|
||||||
|
|
|
@ -1,5 +1,8 @@
|
||||||
package biz.nellemann.hmci.dto.json;
|
package biz.nellemann.hmci.dto.json;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
|
|
||||||
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public final class ViosUtil {
|
public final class ViosUtil {
|
||||||
|
|
||||||
public int id;
|
public int id;
|
||||||
|
|
|
@ -1,10 +1,13 @@
|
||||||
package biz.nellemann.hmci.dto.json;
|
package biz.nellemann.hmci.dto.json;
|
||||||
|
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Network adapter SEA
|
* Network adapter SEA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public final class VirtualEthernetAdapter {
|
public final class VirtualEthernetAdapter {
|
||||||
|
|
||||||
public String physicalLocation = "";
|
public String physicalLocation = "";
|
||||||
|
|
|
@ -1,12 +1,16 @@
|
||||||
package biz.nellemann.hmci.dto.json;
|
package biz.nellemann.hmci.dto.json;
|
||||||
|
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Storage adapter - NPIV ?
|
* Storage adapter - NPIV ?
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
public final class VirtualFiberChannelAdapter {
|
public final class VirtualFiberChannelAdapter {
|
||||||
|
|
||||||
|
public String id = "";
|
||||||
public String wwpn = "";
|
public String wwpn = "";
|
||||||
public String wwpn2 = "";
|
public String wwpn2 = "";
|
||||||
public String physicalLocation = "";
|
public String physicalLocation = "";
|
||||||
|
|
Loading…
Reference in a new issue