diff --git a/CHANGELOG.md b/CHANGELOG.md index 3c4d063..33e60b8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,11 +2,14 @@ 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. - 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). - 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. @@ -28,6 +31,7 @@ All notable changes to this project will be documented in this file. ## [1.2.7] - 2022-02-24 - 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.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 diff --git a/gradle.properties b/gradle.properties index c374b2d..a0a5155 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ projectId = hmci projectGroup = biz.nellemann.hmci -projectVersion = 1.4.1 +projectVersion = 1.4.2 diff --git a/src/main/java/biz/nellemann/hmci/InfluxClient.java b/src/main/java/biz/nellemann/hmci/InfluxClient.java index 8076b30..fb0f9ee 100644 --- a/src/main/java/biz/nellemann/hmci/InfluxClient.java +++ b/src/main/java/biz/nellemann/hmci/InfluxClient.java @@ -107,7 +107,11 @@ public final class InfluxClient { public void write(List measurements, String name) { 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); + }); + } } diff --git a/src/main/java/biz/nellemann/hmci/LogicalPartition.java b/src/main/java/biz/nellemann/hmci/LogicalPartition.java index 71b40b1..fc2cedb 100644 --- a/src/main/java/biz/nellemann/hmci/LogicalPartition.java +++ b/src/main/java/biz/nellemann/hmci/LogicalPartition.java @@ -151,6 +151,7 @@ class LogicalPartition extends Resource { // LPAR Details List getDetails(int sample) throws NullPointerException { + log.debug("getDetails()"); List list = new ArrayList<>(); Map tagsMap = new HashMap<>(); @@ -175,7 +176,7 @@ class LogicalPartition extends Resource { // LPAR Memory List getMemoryMetrics(int sample) throws NullPointerException { - + log.debug("getMemoryMetrics()"); List list = new ArrayList<>(); Map tagsMap = new HashMap<>(); @@ -197,7 +198,7 @@ class LogicalPartition extends Resource { // LPAR Processor List getProcessorMetrics(int sample) throws NullPointerException { - + log.debug("getProcessorMetrics()"); List list = new ArrayList<>(); HashMap tagsMap = new HashMap<>(); @@ -231,7 +232,7 @@ class LogicalPartition extends Resource { // LPAR Network - Virtual List getVirtualEthernetAdapterMetrics(int sample) throws NullPointerException { - + log.debug("getVirtualEthernetAdapterMetrics()"); List list = new ArrayList<>(); metric.getSample(sample).lparsUtil.network.virtualEthernetAdapters.forEach(adapter -> { @@ -272,7 +273,7 @@ class LogicalPartition extends Resource { // LPAR Storage - Virtual Generic List getVirtualGenericAdapterMetrics(int sample) throws NullPointerException { - + log.debug("getVirtualGenericAdapterMetrics()"); List list = new ArrayList<>(); metric.getSample(sample).lparsUtil.storage.genericVirtualAdapters.forEach(adapter -> { @@ -303,7 +304,7 @@ class LogicalPartition extends Resource { // LPAR Storage - Virtual FC List getVirtualFibreChannelAdapterMetrics(int sample) throws NullPointerException { - + log.debug("getVirtualFibreChannelAdapterMetrics()"); List list = new ArrayList<>(); metric.getSample(sample).lparsUtil.storage.virtualFiberChannelAdapters.forEach(adapter -> { @@ -334,7 +335,7 @@ class LogicalPartition extends Resource { // LPAR Network - SR-IOV Logical Ports List getSriovLogicalPorts(int sample) throws NullPointerException { - + log.debug("getSriovLogicalPorts()"); List list = new ArrayList<>(); metric.getSample(sample).lparsUtil.network.sriovLogicalPorts.forEach(port -> { @@ -345,7 +346,6 @@ class LogicalPartition extends Resource { tagsMap.put("servername", managedSystem.entry.getName()); tagsMap.put("lparname", entry.getName()); tagsMap.put("location", port.physicalLocation); - tagsMap.put("type", port.configurationType); log.trace("getSriovLogicalPorts() - tags: " + tagsMap); fieldsMap.put("sentBytes", port.sentBytes); diff --git a/src/main/java/biz/nellemann/hmci/ManagedSystem.java b/src/main/java/biz/nellemann/hmci/ManagedSystem.java index 237145e..e071807 100644 --- a/src/main/java/biz/nellemann/hmci/ManagedSystem.java +++ b/src/main/java/biz/nellemann/hmci/ManagedSystem.java @@ -291,7 +291,7 @@ class ManagedSystem extends Resource { // System details List getDetails(int sample) throws NullPointerException { - + log.debug("getDetails()"); List list = new ArrayList<>(); Map tagsMap = new TreeMap<>(); Map fieldsMap = new TreeMap<>(); @@ -321,7 +321,7 @@ class ManagedSystem extends Resource { // System Memory List getMemoryMetrics(int sample) throws NullPointerException { - + log.debug("getMemoryMetrics()"); List list = new ArrayList<>(); HashMap tagsMap = new HashMap<>(); Map fieldsMap = new HashMap<>(); @@ -344,7 +344,7 @@ class ManagedSystem extends Resource { // System Processor List getProcessorMetrics(int sample) throws NullPointerException { - + log.debug("getProcessorMetrics()"); List list = new ArrayList<>(); HashMap tagsMap = new HashMap<>(); HashMap fieldsMap = new HashMap<>(); @@ -365,7 +365,7 @@ class ManagedSystem extends Resource { // Sytem Shared ProcessorPools List getSharedProcessorPools(int sample) throws NullPointerException { - + log.debug("getSharedProcessorPools()"); List list = new ArrayList<>(); metric.getSample(sample).serverUtil.sharedProcessorPool.forEach(sharedProcessorPool -> { HashMap tagsMap = new HashMap<>(); @@ -392,7 +392,7 @@ class ManagedSystem extends Resource { // System Physical ProcessorPool List getPhysicalProcessorPool(int sample) throws NullPointerException { - + log.debug("getPhysicalProcessorPool()"); List list = new ArrayList<>(); HashMap tagsMap = new HashMap<>(); HashMap fieldsMap = new HashMap<>(); @@ -420,7 +420,7 @@ class ManagedSystem extends Resource { // VIO Details List getVioDetails(int sample) throws NullPointerException { - + log.debug("getVioDetails()"); List list = new ArrayList<>(); metric.getSample(sample).viosUtil.forEach(vio -> { @@ -446,7 +446,7 @@ class ManagedSystem extends Resource { // VIO Memory List getVioMemoryMetrics(int sample) throws NullPointerException { - + log.debug("getVioMemoryMetrics()"); List list = new ArrayList<>(); metric.getSample(sample).viosUtil.forEach(vio -> { @@ -474,7 +474,7 @@ class ManagedSystem extends Resource { // VIO Processor List getVioProcessorMetrics(int sample) throws NullPointerException { - + log.debug("getVioProcessorMetrics()"); List list = new ArrayList<>(); metric.getSample(sample).viosUtil.forEach(vio -> { @@ -509,7 +509,7 @@ class ManagedSystem extends Resource { // VIOs - Network List getVioNetworkLpars(int sample) throws NullPointerException { - + log.debug("getVioNetworkLpars()"); List list = new ArrayList<>(); metric.getSample(sample).viosUtil.forEach(vio -> { @@ -532,7 +532,7 @@ class ManagedSystem extends Resource { // VIO Network - Shared List getVioNetworkSharedAdapters(int sample) throws NullPointerException { - + log.debug("getVioNetworkSharedAdapters()"); List list = new ArrayList<>(); metric.getSample(sample).viosUtil.forEach(vio -> { vio.network.sharedAdapters.forEach(adapter -> { @@ -565,7 +565,7 @@ class ManagedSystem extends Resource { // VIO Network - Virtual List getVioNetworkVirtualAdapters(int sample) throws NullPointerException { - + log.debug("getVioNetworkVirtualAdapters()"); List list = new ArrayList<>(); metric.getSample(sample).viosUtil.forEach( vio -> { vio.network.virtualEthernetAdapters.forEach( adapter -> { @@ -605,7 +605,7 @@ class ManagedSystem extends Resource { // VIO Network - Generic List getVioNetworkGenericAdapters(int sample) throws NullPointerException { - + log.debug("getVioNetworkGenericAdapters()"); List list = new ArrayList<>(); metric.getSample(sample).viosUtil.forEach( vio -> { vio.network.genericAdapters.forEach( adapter -> { @@ -637,7 +637,7 @@ class ManagedSystem extends Resource { // VIOs - Storage List getVioStorageLpars(int sample) throws NullPointerException { - + log.debug("getVioStorageLpars()"); List list = new ArrayList<>(); metric.getSample(sample).viosUtil.forEach(vio -> { @@ -660,7 +660,7 @@ class ManagedSystem extends Resource { // VIO Storage FC List getVioStorageFiberChannelAdapters(int sample) throws NullPointerException { - + log.debug("getVioStorageFiberChannelAdapters()"); List list = new ArrayList<>(); metric.getSample(sample).viosUtil.forEach( vio -> { log.trace("getVioStorageFiberChannelAdapters() - VIO: " + vio.name); @@ -694,8 +694,9 @@ class ManagedSystem extends Resource { // VIO Storage - Physical List getVioStoragePhysicalAdapters(int sample) throws NullPointerException { - + log.debug("getVioStoragePhysicalAdapters()"); List list = new ArrayList<>(); + metric.getSample(sample).viosUtil.forEach( vio -> { log.trace("getVioStoragePhysicalAdapters() - VIO: " + vio.name); @@ -728,7 +729,7 @@ class ManagedSystem extends Resource { // VIO Storage - Virtual List getVioStorageVirtualAdapters(int sample) throws NullPointerException { - + log.debug("getVioStorageVirtualAdapters()"); List list = new ArrayList<>(); metric.getSample(sample).viosUtil.forEach( (vio) -> { vio.storage.genericVirtualAdapters.forEach( (adapter) -> { diff --git a/src/main/java/biz/nellemann/hmci/Resource.java b/src/main/java/biz/nellemann/hmci/Resource.java index c7fb7bd..33c4d03 100644 --- a/src/main/java/biz/nellemann/hmci/Resource.java +++ b/src/main/java/biz/nellemann/hmci/Resource.java @@ -114,7 +114,7 @@ public abstract class Resource { processed++; sampleHistory.add(timestamp); // Add to processed history } catch (NullPointerException e) { - log.warn("process() - error: {}", e.getMessage()); + log.warn("process() - error", e); } } diff --git a/src/main/java/biz/nellemann/hmci/dto/json/EnergyUtil.java b/src/main/java/biz/nellemann/hmci/dto/json/EnergyUtil.java index 89ba619..ff35a45 100644 --- a/src/main/java/biz/nellemann/hmci/dto/json/EnergyUtil.java +++ b/src/main/java/biz/nellemann/hmci/dto/json/EnergyUtil.java @@ -1,5 +1,8 @@ package biz.nellemann.hmci.dto.json; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +@JsonIgnoreProperties(ignoreUnknown = true) public final class EnergyUtil { public PowerUtil powerUtil = new PowerUtil(); diff --git a/src/main/java/biz/nellemann/hmci/dto/json/FiberChannelAdapter.java b/src/main/java/biz/nellemann/hmci/dto/json/FiberChannelAdapter.java index 225e98d..01a8214 100644 --- a/src/main/java/biz/nellemann/hmci/dto/json/FiberChannelAdapter.java +++ b/src/main/java/biz/nellemann/hmci/dto/json/FiberChannelAdapter.java @@ -1,10 +1,13 @@ package biz.nellemann.hmci.dto.json; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + /** * Storage adapter */ +@JsonIgnoreProperties(ignoreUnknown = true) public final class FiberChannelAdapter { public String id; diff --git a/src/main/java/biz/nellemann/hmci/dto/json/GenericAdapter.java b/src/main/java/biz/nellemann/hmci/dto/json/GenericAdapter.java index eaf0015..14980da 100644 --- a/src/main/java/biz/nellemann/hmci/dto/json/GenericAdapter.java +++ b/src/main/java/biz/nellemann/hmci/dto/json/GenericAdapter.java @@ -1,6 +1,9 @@ package biz.nellemann.hmci.dto.json; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +@JsonIgnoreProperties(ignoreUnknown = true) public final class GenericAdapter { public String id; diff --git a/src/main/java/biz/nellemann/hmci/dto/json/GenericPhysicalAdapters.java b/src/main/java/biz/nellemann/hmci/dto/json/GenericPhysicalAdapters.java index 4d50741..ce7d928 100644 --- a/src/main/java/biz/nellemann/hmci/dto/json/GenericPhysicalAdapters.java +++ b/src/main/java/biz/nellemann/hmci/dto/json/GenericPhysicalAdapters.java @@ -1,10 +1,13 @@ package biz.nellemann.hmci.dto.json; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +@JsonIgnoreProperties(ignoreUnknown = true) public final class GenericPhysicalAdapters { public String id; - public String type; + public String type = ""; public String physicalLocation; public double numOfReads; public double numOfWrites; diff --git a/src/main/java/biz/nellemann/hmci/dto/json/GenericVirtualAdapter.java b/src/main/java/biz/nellemann/hmci/dto/json/GenericVirtualAdapter.java index c0dafae..b18aa16 100644 --- a/src/main/java/biz/nellemann/hmci/dto/json/GenericVirtualAdapter.java +++ b/src/main/java/biz/nellemann/hmci/dto/json/GenericVirtualAdapter.java @@ -1,12 +1,13 @@ package biz.nellemann.hmci.dto.json; -import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; /** * Storage adapter */ +@JsonIgnoreProperties(ignoreUnknown = true) public final class GenericVirtualAdapter { public String id = ""; diff --git a/src/main/java/biz/nellemann/hmci/dto/json/LparProcessor.java b/src/main/java/biz/nellemann/hmci/dto/json/LparProcessor.java index d5e0515..7c508b2 100644 --- a/src/main/java/biz/nellemann/hmci/dto/json/LparProcessor.java +++ b/src/main/java/biz/nellemann/hmci/dto/json/LparProcessor.java @@ -1,6 +1,9 @@ package biz.nellemann.hmci.dto.json; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +@JsonIgnoreProperties(ignoreUnknown = true) public final class LparProcessor { public Integer poolId = 0; diff --git a/src/main/java/biz/nellemann/hmci/dto/json/Network.java b/src/main/java/biz/nellemann/hmci/dto/json/Network.java index b8595bc..686b5ac 100644 --- a/src/main/java/biz/nellemann/hmci/dto/json/Network.java +++ b/src/main/java/biz/nellemann/hmci/dto/json/Network.java @@ -1,9 +1,12 @@ package biz.nellemann.hmci.dto.json; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + import java.util.ArrayList; import java.util.List; +@JsonIgnoreProperties(ignoreUnknown = true) public final class Network { public List clientLpars = new ArrayList<>(); diff --git a/src/main/java/biz/nellemann/hmci/dto/json/PhysicalProcessorPool.java b/src/main/java/biz/nellemann/hmci/dto/json/PhysicalProcessorPool.java index 3785fd1..75a281b 100644 --- a/src/main/java/biz/nellemann/hmci/dto/json/PhysicalProcessorPool.java +++ b/src/main/java/biz/nellemann/hmci/dto/json/PhysicalProcessorPool.java @@ -1,6 +1,9 @@ package biz.nellemann.hmci.dto.json; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +@JsonIgnoreProperties(ignoreUnknown = true) public final class PhysicalProcessorPool { public double assignedProcUnits = 0.0; diff --git a/src/main/java/biz/nellemann/hmci/dto/json/PowerUtil.java b/src/main/java/biz/nellemann/hmci/dto/json/PowerUtil.java index 8c4b58f..ab028eb 100644 --- a/src/main/java/biz/nellemann/hmci/dto/json/PowerUtil.java +++ b/src/main/java/biz/nellemann/hmci/dto/json/PowerUtil.java @@ -1,5 +1,8 @@ package biz.nellemann.hmci.dto.json; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +@JsonIgnoreProperties(ignoreUnknown = true) public final class PowerUtil { public Number powerReading = 0.0; diff --git a/src/main/java/biz/nellemann/hmci/dto/json/ProcessedMetrics.java b/src/main/java/biz/nellemann/hmci/dto/json/ProcessedMetrics.java index 1fc6fd9..8738515 100644 --- a/src/main/java/biz/nellemann/hmci/dto/json/ProcessedMetrics.java +++ b/src/main/java/biz/nellemann/hmci/dto/json/ProcessedMetrics.java @@ -1,5 +1,8 @@ package biz.nellemann.hmci.dto.json; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +@JsonIgnoreProperties(ignoreUnknown = true) public class ProcessedMetrics { public SystemUtil systemUtil; diff --git a/src/main/java/biz/nellemann/hmci/dto/json/SRIOVAdapter.java b/src/main/java/biz/nellemann/hmci/dto/json/SRIOVAdapter.java index c41cace..358a0d0 100644 --- a/src/main/java/biz/nellemann/hmci/dto/json/SRIOVAdapter.java +++ b/src/main/java/biz/nellemann/hmci/dto/json/SRIOVAdapter.java @@ -1,7 +1,10 @@ package biz.nellemann.hmci.dto.json; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + import java.util.List; +@JsonIgnoreProperties(ignoreUnknown = true) public final class SRIOVAdapter { public String drcIndex = ""; diff --git a/src/main/java/biz/nellemann/hmci/dto/json/SRIOVLogicalPort.java b/src/main/java/biz/nellemann/hmci/dto/json/SRIOVLogicalPort.java index 0c63f8c..acbb855 100644 --- a/src/main/java/biz/nellemann/hmci/dto/json/SRIOVLogicalPort.java +++ b/src/main/java/biz/nellemann/hmci/dto/json/SRIOVLogicalPort.java @@ -1,5 +1,8 @@ package biz.nellemann.hmci.dto.json; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +@JsonIgnoreProperties(ignoreUnknown = true) public class SRIOVLogicalPort { public String drcIndex; diff --git a/src/main/java/biz/nellemann/hmci/dto/json/SRIOVPhysicalPort.java b/src/main/java/biz/nellemann/hmci/dto/json/SRIOVPhysicalPort.java index d31fabd..9312716 100644 --- a/src/main/java/biz/nellemann/hmci/dto/json/SRIOVPhysicalPort.java +++ b/src/main/java/biz/nellemann/hmci/dto/json/SRIOVPhysicalPort.java @@ -1,5 +1,8 @@ package biz.nellemann.hmci.dto.json; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +@JsonIgnoreProperties(ignoreUnknown = true) public final class SRIOVPhysicalPort { public String id; diff --git a/src/main/java/biz/nellemann/hmci/dto/json/SampleInfo.java b/src/main/java/biz/nellemann/hmci/dto/json/SampleInfo.java index b0c0930..f947812 100644 --- a/src/main/java/biz/nellemann/hmci/dto/json/SampleInfo.java +++ b/src/main/java/biz/nellemann/hmci/dto/json/SampleInfo.java @@ -1,10 +1,12 @@ package biz.nellemann.hmci.dto.json; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; +@JsonIgnoreProperties(ignoreUnknown = true) public final class SampleInfo { @JsonProperty("timeStamp") diff --git a/src/main/java/biz/nellemann/hmci/dto/json/ServerMemory.java b/src/main/java/biz/nellemann/hmci/dto/json/ServerMemory.java index d370508..b4b3178 100644 --- a/src/main/java/biz/nellemann/hmci/dto/json/ServerMemory.java +++ b/src/main/java/biz/nellemann/hmci/dto/json/ServerMemory.java @@ -1,5 +1,8 @@ package biz.nellemann.hmci.dto.json; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +@JsonIgnoreProperties(ignoreUnknown = true) public final class ServerMemory { public double totalMem = 0.0; diff --git a/src/main/java/biz/nellemann/hmci/dto/json/ServerProcessor.java b/src/main/java/biz/nellemann/hmci/dto/json/ServerProcessor.java index bf91dc9..31621e5 100644 --- a/src/main/java/biz/nellemann/hmci/dto/json/ServerProcessor.java +++ b/src/main/java/biz/nellemann/hmci/dto/json/ServerProcessor.java @@ -1,5 +1,8 @@ package biz.nellemann.hmci.dto.json; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +@JsonIgnoreProperties(ignoreUnknown = true) public final class ServerProcessor { public Double totalProcUnits = 0.0; diff --git a/src/main/java/biz/nellemann/hmci/dto/json/ServerUtil.java b/src/main/java/biz/nellemann/hmci/dto/json/ServerUtil.java index b6158de..8fbc093 100644 --- a/src/main/java/biz/nellemann/hmci/dto/json/ServerUtil.java +++ b/src/main/java/biz/nellemann/hmci/dto/json/ServerUtil.java @@ -1,9 +1,12 @@ package biz.nellemann.hmci.dto.json; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + import java.util.ArrayList; import java.util.List; +@JsonIgnoreProperties(ignoreUnknown = true) public final class ServerUtil { public final ServerProcessor processor = new ServerProcessor(); diff --git a/src/main/java/biz/nellemann/hmci/dto/json/SharedAdapter.java b/src/main/java/biz/nellemann/hmci/dto/json/SharedAdapter.java index b1c0f72..65374f3 100644 --- a/src/main/java/biz/nellemann/hmci/dto/json/SharedAdapter.java +++ b/src/main/java/biz/nellemann/hmci/dto/json/SharedAdapter.java @@ -1,12 +1,15 @@ package biz.nellemann.hmci.dto.json; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + import java.util.List; /** * Network adapter */ +@JsonIgnoreProperties(ignoreUnknown = true) public final class SharedAdapter { public String id; diff --git a/src/main/java/biz/nellemann/hmci/dto/json/SharedProcessorPool.java b/src/main/java/biz/nellemann/hmci/dto/json/SharedProcessorPool.java index d383b32..cec0fef 100644 --- a/src/main/java/biz/nellemann/hmci/dto/json/SharedProcessorPool.java +++ b/src/main/java/biz/nellemann/hmci/dto/json/SharedProcessorPool.java @@ -1,6 +1,9 @@ package biz.nellemann.hmci.dto.json; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +@JsonIgnoreProperties(ignoreUnknown = true) public final class SharedProcessorPool { public int id; diff --git a/src/main/java/biz/nellemann/hmci/dto/json/Storage.java b/src/main/java/biz/nellemann/hmci/dto/json/Storage.java index 4a3355e..dd37e1d 100644 --- a/src/main/java/biz/nellemann/hmci/dto/json/Storage.java +++ b/src/main/java/biz/nellemann/hmci/dto/json/Storage.java @@ -1,9 +1,12 @@ package biz.nellemann.hmci.dto.json; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + import java.util.ArrayList; import java.util.List; +@JsonIgnoreProperties(ignoreUnknown = true) public final class Storage { public List clientLpars = new ArrayList<>(); diff --git a/src/main/java/biz/nellemann/hmci/dto/json/SystemFirmware.java b/src/main/java/biz/nellemann/hmci/dto/json/SystemFirmware.java index f34885f..98305ed 100644 --- a/src/main/java/biz/nellemann/hmci/dto/json/SystemFirmware.java +++ b/src/main/java/biz/nellemann/hmci/dto/json/SystemFirmware.java @@ -1,9 +1,11 @@ package biz.nellemann.hmci.dto.json; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonUnwrapped; +@JsonIgnoreProperties(ignoreUnknown = true) public final class SystemFirmware { @JsonUnwrapped diff --git a/src/main/java/biz/nellemann/hmci/dto/json/SystemUtil.java b/src/main/java/biz/nellemann/hmci/dto/json/SystemUtil.java index 7a16012..c5cd499 100644 --- a/src/main/java/biz/nellemann/hmci/dto/json/SystemUtil.java +++ b/src/main/java/biz/nellemann/hmci/dto/json/SystemUtil.java @@ -1,9 +1,11 @@ package biz.nellemann.hmci.dto.json; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonUnwrapped; import java.util.List; +@JsonIgnoreProperties(ignoreUnknown = true) public final class SystemUtil { @JsonProperty("utilInfo") diff --git a/src/main/java/biz/nellemann/hmci/dto/json/Temperature.java b/src/main/java/biz/nellemann/hmci/dto/json/Temperature.java index 5a0c594..3d02182 100644 --- a/src/main/java/biz/nellemann/hmci/dto/json/Temperature.java +++ b/src/main/java/biz/nellemann/hmci/dto/json/Temperature.java @@ -1,5 +1,8 @@ package biz.nellemann.hmci.dto.json; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +@JsonIgnoreProperties(ignoreUnknown = true) public final class Temperature { public String entityId = ""; diff --git a/src/main/java/biz/nellemann/hmci/dto/json/ThermalUtil.java b/src/main/java/biz/nellemann/hmci/dto/json/ThermalUtil.java index 1b22748..c3e15be 100644 --- a/src/main/java/biz/nellemann/hmci/dto/json/ThermalUtil.java +++ b/src/main/java/biz/nellemann/hmci/dto/json/ThermalUtil.java @@ -1,8 +1,11 @@ package biz.nellemann.hmci.dto.json; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + import java.util.ArrayList; import java.util.List; +@JsonIgnoreProperties(ignoreUnknown = true) public final class ThermalUtil { public List inletTemperatures = new ArrayList<>(); diff --git a/src/main/java/biz/nellemann/hmci/dto/json/UtilInfo.java b/src/main/java/biz/nellemann/hmci/dto/json/UtilInfo.java index 4143cb3..2b8f71f 100644 --- a/src/main/java/biz/nellemann/hmci/dto/json/UtilInfo.java +++ b/src/main/java/biz/nellemann/hmci/dto/json/UtilInfo.java @@ -2,7 +2,7 @@ package biz.nellemann.hmci.dto.json; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -@JsonIgnoreProperties({ "metricArrayOrder" }) +@JsonIgnoreProperties(ignoreUnknown = true) public final class UtilInfo { public String version = ""; diff --git a/src/main/java/biz/nellemann/hmci/dto/json/UtilSample.java b/src/main/java/biz/nellemann/hmci/dto/json/UtilSample.java index eed2127..7070daa 100644 --- a/src/main/java/biz/nellemann/hmci/dto/json/UtilSample.java +++ b/src/main/java/biz/nellemann/hmci/dto/json/UtilSample.java @@ -1,12 +1,13 @@ 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 java.util.ArrayList; import java.util.List; +@JsonIgnoreProperties(ignoreUnknown = true) public final class UtilSample { public String sampleType = ""; diff --git a/src/main/java/biz/nellemann/hmci/dto/json/ViosMemory.java b/src/main/java/biz/nellemann/hmci/dto/json/ViosMemory.java index 5b3145d..716b328 100644 --- a/src/main/java/biz/nellemann/hmci/dto/json/ViosMemory.java +++ b/src/main/java/biz/nellemann/hmci/dto/json/ViosMemory.java @@ -1,5 +1,8 @@ package biz.nellemann.hmci.dto.json; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +@JsonIgnoreProperties(ignoreUnknown = true) public final class ViosMemory { public double assignedMem; public double utilizedMem; diff --git a/src/main/java/biz/nellemann/hmci/dto/json/ViosUtil.java b/src/main/java/biz/nellemann/hmci/dto/json/ViosUtil.java index ed7a1ff..2e7c935 100644 --- a/src/main/java/biz/nellemann/hmci/dto/json/ViosUtil.java +++ b/src/main/java/biz/nellemann/hmci/dto/json/ViosUtil.java @@ -1,5 +1,8 @@ package biz.nellemann.hmci.dto.json; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +@JsonIgnoreProperties(ignoreUnknown = true) public final class ViosUtil { public int id; diff --git a/src/main/java/biz/nellemann/hmci/dto/json/VirtualEthernetAdapter.java b/src/main/java/biz/nellemann/hmci/dto/json/VirtualEthernetAdapter.java index c90f9a6..32301b1 100644 --- a/src/main/java/biz/nellemann/hmci/dto/json/VirtualEthernetAdapter.java +++ b/src/main/java/biz/nellemann/hmci/dto/json/VirtualEthernetAdapter.java @@ -1,10 +1,13 @@ package biz.nellemann.hmci.dto.json; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + /** * Network adapter SEA */ +@JsonIgnoreProperties(ignoreUnknown = true) public final class VirtualEthernetAdapter { public String physicalLocation = ""; diff --git a/src/main/java/biz/nellemann/hmci/dto/json/VirtualFiberChannelAdapter.java b/src/main/java/biz/nellemann/hmci/dto/json/VirtualFiberChannelAdapter.java index dca9565..a8170bf 100644 --- a/src/main/java/biz/nellemann/hmci/dto/json/VirtualFiberChannelAdapter.java +++ b/src/main/java/biz/nellemann/hmci/dto/json/VirtualFiberChannelAdapter.java @@ -1,12 +1,16 @@ package biz.nellemann.hmci.dto.json; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + /** * Storage adapter - NPIV ? */ +@JsonIgnoreProperties(ignoreUnknown = true) public final class VirtualFiberChannelAdapter { + public String id = ""; public String wwpn = ""; public String wwpn2 = ""; public String physicalLocation = "";