From 777d449633c2f1a91c0300c239eaac44eac22978 Mon Sep 17 00:00:00 2001 From: avi robusta Date: Sun, 2 Jul 2023 21:02:14 +0300 Subject: fixed memory metric --- robusta_krr/core/integrations/prometheus/metrics/base_metric.py | 4 ++-- robusta_krr/core/integrations/prometheus/metrics/memory_metric.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/robusta_krr/core/integrations/prometheus/metrics/base_metric.py b/robusta_krr/core/integrations/prometheus/metrics/base_metric.py index e62f9ac..9be4692 100644 --- a/robusta_krr/core/integrations/prometheus/metrics/base_metric.py +++ b/robusta_krr/core/integrations/prometheus/metrics/base_metric.py @@ -133,8 +133,8 @@ class BaseMetricLoader(Configurable, abc.ABC): Returns: ResourceHistoryData: An instance of the ResourceHistoryData class representing the loaded metrics. """ - - query = self.get_query(object, self._step_to_string(period)) + resolution = f'{self._step_to_string(period)}:{self._step_to_string(step)}' + query = self.get_query(object, resolution) query_type = self.get_query_type() end_time = datetime.datetime.now().astimezone() metric = Metric( diff --git a/robusta_krr/core/integrations/prometheus/metrics/memory_metric.py b/robusta_krr/core/integrations/prometheus/metrics/memory_metric.py index 8f4e286..af0bdda 100644 --- a/robusta_krr/core/integrations/prometheus/metrics/memory_metric.py +++ b/robusta_krr/core/integrations/prometheus/metrics/memory_metric.py @@ -16,7 +16,7 @@ class MemoryMetricLoader(BaseFilteredMetricLoader): f'pod=~"{pods_selector}", ' f'container="{object.container}"' f"{cluster_label}" - "}) by (container, pod, job)" + "}) by (container, pod, job, id)" ) def get_query_type(self) -> QueryType: @@ -38,7 +38,7 @@ class MemoryMetricLoader(BaseFilteredMetricLoader): f'container="{object.container}"' f'{cluster_label}}}' f'{resolution_formatted}' - f')) by (container, pod, job)' + f')) by (container, pod, job, id)' ) def get_query_type(self) -> QueryType: -- cgit v1.2.3