Merge pull request #420 from sentrysoftware/feature/issue-368-km-modu…

…le-issues-with-the-vm-class Issue #368: KM module: issues with the VM class
sentrysoftware · Sep 20, 2024 · 2b1b94b · 2b1b94b
2 parents 2b62fad + 6750adb
commit 2b1b94b
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 17 deletions.
diff --git a/...e/src/main/java/org/sentrysoftware/metricshub/engine/strategy/utils/MappingProcessor.java b/...e/src/main/java/org/sentrysoftware/metricshub/engine/strategy/utils/MappingProcessor.java
@@ -270,7 +270,7 @@ private void processKeyValue(final String key, final String value, final Map<Str
 		} else if (isLookupFunction(value)) {
 			result.put(key, lookup(value, key));
 		} else if (isComputePowerShareRatioFunction(value)) {
-			result.put(String.format("%s.raw_power_share", key), computePowerShareRatio(value, key));
+			result.put(String.format("__%s.raw_power_share", key), computePowerShareRatio(value, key));
 		} else if (isLegacyPowerSupplyUtilization(value)) {
 			computationFunctions.put(key, this::legacyPowerSupplyUtilization);
 		} else if (isFakeCounterFunction(value)) {

diff --git a/...c/test/java/org/sentrysoftware/metricshub/engine/strategy/utils/MappingProcessorTest.java b/...c/test/java/org/sentrysoftware/metricshub/engine/strategy/utils/MappingProcessorTest.java
@@ -24,7 +24,7 @@
 
 class MappingProcessorTest {
 
-	private static final String HW_VM_POWER_RATIO = "__hw.vm.power_ratio";
+	private static final String HW_VM_POWER_RATIO = "hw.vm.power_ratio";
 	private static final String HW_VM_POWER_RATIO_RAW_POWER_SHARE = "__hw.vm.power_ratio.raw_power_share";
 
 	@Test

diff --git a/metricshub-hardware/src/it/resources/os/SuperConnectorOsIT/expected/expected.json b/metricshub-hardware/src/it/resources/os/SuperConnectorOsIT/expected/expected.json
@@ -64207,8 +64207,8 @@
     "is_endpoint" : false
   }, {
     "metrics" : {
-      "hw.vm.power_ratio.raw_power_share" : {
-        "name" : "hw.vm.power_ratio.raw_power_share",
+      "__hw.vm.power_ratio.raw_power_share" : {
+        "name" : "__hw.vm.power_ratio.raw_power_share",
         "collectTime" : 1715961673910,
         "previousCollectTime" : null,
         "attributes" : { },
@@ -64268,8 +64268,8 @@
     "is_endpoint" : false
   }, {
     "metrics" : {
-      "hw.vm.power_ratio.raw_power_share" : {
-        "name" : "hw.vm.power_ratio.raw_power_share",
+      "__hw.vm.power_ratio.raw_power_share" : {
+        "name" : "__hw.vm.power_ratio.raw_power_share",
         "collectTime" : 1715961673910,
         "previousCollectTime" : null,
         "attributes" : { },
@@ -64329,8 +64329,8 @@
     "is_endpoint" : false
   }, {
     "metrics" : {
-      "hw.vm.power_ratio.raw_power_share" : {
-        "name" : "hw.vm.power_ratio.raw_power_share",
+      "__hw.vm.power_ratio.raw_power_share" : {
+        "name" : "__hw.vm.power_ratio.raw_power_share",
         "collectTime" : 1715961673910,
         "previousCollectTime" : null,
         "attributes" : { },

diff --git a/...java/org/sentrysoftware/metricshub/hardware/sustainability/VmPowerAndEnergyEstimator.java b/...java/org/sentrysoftware/metricshub/hardware/sustainability/VmPowerAndEnergyEstimator.java
@@ -26,7 +26,6 @@
 import static org.sentrysoftware.metricshub.hardware.util.HwConstants.HW_HOST_ESTIMATED_POWER;
 import static org.sentrysoftware.metricshub.hardware.util.HwConstants.HW_HOST_MEASURED_POWER;
 import static org.sentrysoftware.metricshub.hardware.util.HwConstants.HW_POWER_VM_METRIC;
-import static org.sentrysoftware.metricshub.hardware.util.HwConstants.HW_VM_POWER_SHARE_METRIC;
 import static org.sentrysoftware.metricshub.hardware.util.HwConstants.POWER_SOURCE_ID_ATTRIBUTE;
 
 import java.math.RoundingMode;
@@ -116,7 +115,7 @@ protected Double doPowerEstimation() {
 		final MetricFactory metricFactory = new MetricFactory(telemetryManager.getHostname());
 		metricFactory.collectNumberMetric(
 			monitor,
-			HW_VM_POWER_SHARE_METRIC,
+			"hw.vm.power_ratio",
 			powerShareRatio,
 			telemetryManager.getStrategyTime()
 		);

diff --git a/...cshub-hardware/src/main/java/org/sentrysoftware/metricshub/hardware/util/HwConstants.java b/...cshub-hardware/src/main/java/org/sentrysoftware/metricshub/hardware/util/HwConstants.java
@@ -59,7 +59,7 @@ public class HwConstants {
 	public static final String HW_POWER_VM_METRIC = "hw.power{hw.type=\"vm\"}";
 	public static final String POWER_SOURCE_ID_ATTRIBUTE = "__power_source_id";
 	public static final String HW_VM_POWER_SHARE_METRIC = "__hw.vm.power_ratio.raw_power_share";
-	public static final String HW_VM_POWER_STATE_METRIC = "hw.vm.power_state";
+	public static final String HW_VM_POWER_STATE_METRIC = "hw.power_state{hw.type=\"vm\"}";
 
 	public static final String HW_ENCLOSURE_POWER = "hw.enclosure.power";
 	public static final String HW_ENCLOSURE_ENERGY = "hw.enclosure.energy";

diff --git a/metricshub-oscommand-extension/src/it/resources/os/SuperConnectorOsIT/expected/expected.json b/metricshub-oscommand-extension/src/it/resources/os/SuperConnectorOsIT/expected/expected.json
@@ -52313,8 +52313,8 @@
     "is_endpoint" : false
   }, {
     "metrics" : {
-      "hw.vm.power_ratio.raw_power_share" : {
-        "name" : "hw.vm.power_ratio.raw_power_share",
+      "__hw.vm.power_ratio.raw_power_share" : {
+        "name" : "__hw.vm.power_ratio.raw_power_share",
         "collectTime" : 1709803030590,
         "previousCollectTime" : null,
         "attributes" : { },
@@ -52359,8 +52359,8 @@
     "is_endpoint" : false
   }, {
     "metrics" : {
-      "hw.vm.power_ratio.raw_power_share" : {
-        "name" : "hw.vm.power_ratio.raw_power_share",
+      "__hw.vm.power_ratio.raw_power_share" : {
+        "name" : "__hw.vm.power_ratio.raw_power_share",
         "collectTime" : 1709803030590,
         "previousCollectTime" : null,
         "attributes" : { },
@@ -52405,8 +52405,8 @@
     "is_endpoint" : false
   }, {
     "metrics" : {
-      "hw.vm.power_ratio.raw_power_share" : {
-        "name" : "hw.vm.power_ratio.raw_power_share",
+      "__hw.vm.power_ratio.raw_power_share" : {
+        "name" : "__hw.vm.power_ratio.raw_power_share",
         "collectTime" : 1709803030590,
         "previousCollectTime" : null,
         "attributes" : { },