From: Pere Diaz Bou <pdiazbou@redhat.com>
Date: Mon, 3 Jan 2022 08:32:51 +0000 (+0100)
Subject: monitoring/grafana: remove explicit str casting
X-Git-Tag: v18.0.0~1545^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1e4d85d04fdd97d0e6613dab65089817dd09d2e6;p=ceph.git

monitoring/grafana: remove explicit str casting

Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>
---

diff --git a/monitoring/grafana/dashboards/tests/util.py b/monitoring/grafana/dashboards/tests/util.py
index 98b083d2345f..526f7a73752e 100644
--- a/monitoring/grafana/dashboards/tests/util.py
+++ b/monitoring/grafana/dashboards/tests/util.py
@@ -92,7 +92,12 @@ def replace_grafana_expr_variables(expr: str, variable: str, value: Any) -> str:
     >>> replace_grafana_expr_variables('metric{name~="no_dollar|$other|$osd"}', \
         'no_dollar', 'replacement')
     'metric{name~="no_dollar|$other|$osd"}'
+
+    It shouldn't replace the next char after the variable (positive lookahead test).
+    >>> replace_grafana_expr_variables('metric{name~="$osd"}', \
+        'osd', 'replacement')
+    'metric{name~="replacement"}'
     """
     regex = fr'\${variable}(?=\W)'
-    new_expr = re.sub(regex, fr'{str(value)}', expr)
+    new_expr = re.sub(regex, fr'{value}', expr)
     return new_expr