diff --git a/fmatch/matcher.py b/fmatch/matcher.py index 0c5f77a..131afab 100644 --- a/fmatch/matcher.py +++ b/fmatch/matcher.py @@ -191,7 +191,7 @@ def getResults(self, uuid: str, uuids: list, index_str: str, metrics: dict): if isinstance(v1,str): v1 = f'"{v1}"' metric_string += f" AND NOT ({k1}: {v1})" - elif isinstance(v,str) and not k in ['metric_of_interest']: + elif isinstance(v,str) and not k in ['metric','metric_of_interest']: if v != "*": v = f'"{v}"' metric_string += f" AND {k}: {v}" @@ -258,7 +258,7 @@ def get_agg_metric_query(self, uuids, index, metrics): if isinstance(v1,str): v1 = f'"{v1}"' metric_string += f" AND NOT ({k1}: {v1})" - elif isinstance(v,str) and not k in ['metric_of_interest']: + elif isinstance(v,str) and not k in ['metric', 'metric_of_interest']: if v != "*": v = f'"{v}"' metric_string += f" AND {k}: {v}"