From: Pere Diaz Bou Date: Thu, 2 Dec 2021 14:15:53 +0000 (+0100) Subject: monitoring/grafana: improve grafana unit tests variable substitution X-Git-Tag: v17.1.0~200^2~2 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=5ebdb746e8c051b316584e42ef7d3f0e7c4e64f5;p=ceph-ci.git monitoring/grafana: improve grafana unit tests variable substitution Signed-off-by: Pere Diaz Bou --- diff --git a/monitoring/grafana/dashboards/tests/__init__.py b/monitoring/grafana/dashboards/tests/__init__.py index 204a5f0d721..d758afabf52 100644 --- a/monitoring/grafana/dashboards/tests/__init__.py +++ b/monitoring/grafana/dashboards/tests/__init__.py @@ -171,7 +171,8 @@ class PromqlTest: for variable, value in self.variables.items(): expr = self.promql_expr_test.expr - new_expr = re.sub(r'\${0}'.format(variable), str(value), expr) + regex = fr'\${variable}(?=\W)' + new_expr = re.sub(regex, fr'{str(value)}', expr) self.set_expression(new_expr) test_as_dict = asdict(self.test_file)