From 7f2a2a9f354b83e7dbe4072c6ab1074138091090 Mon Sep 17 00:00:00 2001 From: Gabriel Cuba Date: Fri, 2 Jun 2023 19:27:43 -0500 Subject: [PATCH] Adapt prometheus template to use EE dedicated namespace Change-Id: I6b436202f5d1862acd132eebfa36abfabe9379cc Signed-off-by: Gabriel Cuba --- osm_lcm/ns.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/osm_lcm/ns.py b/osm_lcm/ns.py index 999aee6..7a73326 100644 --- a/osm_lcm/ns.py +++ b/osm_lcm/ns.py @@ -7713,10 +7713,11 @@ class NsLcm(LcmBase): f"Timeout waiting KDU with name={kdu_name} and index={kdu_index} to be intantiated" ) - # TODO get_service if ee_id is not None: - _, _, service = ee_id.partition(".") # remove prefix "namespace." - host_name = "{}-{}".format(service, ee_config_descriptor["metric-service"]) + _, namespace, helm_id = get_ee_id_parts( + ee_id + ) # get namespace and EE gRPC service name + host_name = f'{helm_id}-{ee_config_descriptor["metric-service"]}.{namespace}.svc' # svc_name.namespace.svc host_port = "80" vnfr_id = vnfr_id.replace("-", "") variables = { -- 2.17.1