]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
monitoring/grafana: remove explicit str casting
authorPere Diaz Bou <pdiazbou@redhat.com>
Mon, 3 Jan 2022 08:32:51 +0000 (09:32 +0100)
committerPere Diaz Bou <pdiazbou@redhat.com>
Tue, 18 Jan 2022 12:24:12 +0000 (13:24 +0100)
Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>
monitoring/grafana/dashboards/tests/util.py

index 98b083d2345fd30a665c3fb8ab2da8c0a9355c3f..526f7a73752eedcf5405ba84a0e718dc7556df19 100644 (file)
@@ -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