From: emaclee Date: Tue, 25 Feb 2025 07:37:52 +0000 (+0000) Subject: Change metric name for LCM state gauge X-Git-Tag: 3.6.1~6 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F92%2F140292%2F2;p=cps.git Change metric name for LCM state gauge - change gauge name from cmHandlesByState to cps_ncmp_inventory_cm_handles_by_state Issue-id: CPS-2662 Change-Id: I97a036b155b638cd6ed94a739e3dffb7b6f00172 Signed-off-by: emaclee --- diff --git a/cps-application/src/main/java/org/onap/cps/config/MicroMeterConfig.java b/cps-application/src/main/java/org/onap/cps/config/MicroMeterConfig.java index b85f391b8e..6782669db2 100644 --- a/cps-application/src/main/java/org/onap/cps/config/MicroMeterConfig.java +++ b/cps-application/src/main/java/org/onap/cps/config/MicroMeterConfig.java @@ -37,7 +37,7 @@ import org.springframework.context.annotation.Configuration; public class MicroMeterConfig { private static final String STATE_TAG = "state"; - private static final String CM_HANDLE_STATE_GAUGE = "cmHandlesByState"; + private static final String CM_HANDLE_STATE_GAUGE = "cps_ncmp_inventory_cm_handles_by_state"; final IMap cmHandlesByState; @Bean diff --git a/cps-application/src/test/groovy/org/onap/cps/config/MicroMeterConfigSpec.groovy b/cps-application/src/test/groovy/org/onap/cps/config/MicroMeterConfigSpec.groovy index b9302ccd72..faef32b04b 100644 --- a/cps-application/src/test/groovy/org/onap/cps/config/MicroMeterConfigSpec.groovy +++ b/cps-application/src/test/groovy/org/onap/cps/config/MicroMeterConfigSpec.groovy @@ -53,7 +53,7 @@ class MicroMeterConfigSpec extends Specification { objectUnderTest.deletedCmHandles(simpleMeterRegistry) then: 'each state has the correct value when queried' ['ADVISED', 'READY', 'LOCKED', 'DELETING', 'DELETED'].each { state -> - def gaugeValue = simpleMeterRegistry.get('cmHandlesByState').tag('state',state).gauge().value() + def gaugeValue = simpleMeterRegistry.get(objectUnderTest.CM_HANDLE_STATE_GAUGE).tag('state',state).gauge().value() assert gaugeValue == 1 } } diff --git a/docker-compose/config/grafana/inventory-dashboard.json b/docker-compose/config/grafana/inventory-dashboard.json index 959995fa69..d4046b8b08 100644 --- a/docker-compose/config/grafana/inventory-dashboard.json +++ b/docker-compose/config/grafana/inventory-dashboard.json @@ -105,7 +105,7 @@ { "disableTextWrap": false, "editorMode": "builder", - "expr": "cmHandlesByState{instance=\"$Instance\", job=\"$Job\"}", + "expr": "cps_ncmp_inventory_cm_handles_by_state{instance=\"$Instance\", job=\"$Job\"}", "fullMetaSearch": false, "includeNullMetadata": true, "legendFormat": "__auto",